From aph at redhat.com Mon Jul 1 00:27:58 2013 From: aph at redhat.com (Andrew Haley) Date: Mon, 01 Jul 2013 08:27:58 +0100 Subject: OpenJDK zero build In-Reply-To: <1372628847.28517.YahooMailNeo@web163902.mail.gq1.yahoo.com> References: <1372628847.28517.YahooMailNeo@web163902.mail.gq1.yahoo.com> Message-ID: <51D12F7E.1080108@redhat.com> On 06/30/2013 10:47 PM, Krishna S wrote: > Given it didn't work out of the box I wonder if building zero > outside of icedtea is even supported? If it is, could someone tell > me the exact set of flags I'd use to get a working build? It's not done much, but it should work. It sounds to me like it needs to be debugged. If you can describe exactly what you tried, please report it as an icedtea bug. I'm assuming this is OpenJDK 7. Andrew. From doko at ubuntu.com Mon Jul 1 05:57:34 2013 From: doko at ubuntu.com (Matthias Klose) Date: Mon, 01 Jul 2013 14:57:34 +0200 Subject: [patch] update the jamvm patch for at least 2.3.10 Message-ID: <51D17CBE.6010209@ubuntu.com> In the 2.3.10 release, the jamvm patch needs an update. Didn't check the other releases. Updated patch attached. Matthias -------------- next part -------------- A non-text attachment was scrubbed... Name: remove-sun.misc.Perf-debug-code.patch Type: text/x-diff Size: 2609 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130701/89bbe670/remove-sun.misc.Perf-debug-code.patch From doko at ubuntu.com Mon Jul 1 05:58:55 2013 From: doko at ubuntu.com (Matthias Klose) Date: Mon, 01 Jul 2013 14:58:55 +0200 Subject: CACAO 1.6.1 released In-Reply-To: References: Message-ID: <51D17D0F.2050003@ubuntu.com> On 06/29/13 18:00, Stefan Ring wrote: > This is a snapshot release. although this is a snapshot, please could you update the icedtea1 and icedtea2 trunks to use this snapshot? thanks, Matthias From xerxes at zafena.se Mon Jul 1 06:22:00 2013 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 01 Jul 2013 15:22:00 +0200 Subject: [patch] update the jamvm patch for at least 2.3.10 In-Reply-To: <51D1821F.50700@zafena.se> References: <51D1821F.50700@zafena.se> Message-ID: <51D18278.2030202@zafena.se> 2013-07-01 14:57, Matthias Klose skrev: > In the 2.3.10 release, the jamvm patch needs an update. Didn't check the other releases. Updated patch attached. > > Matthias > Looks OK, We have one option and that is to update JamVM to match the version used in 2.4.*, http://icedtea.classpath.org/hg/release/icedtea7-2.4/rev/933d082ec889 if we update JamVM then we may drop this remove-sun.misc.Perf-debug-code.patch for the 2.3.10 branch as well. Cheers Xerxes From stefan at complang.tuwien.ac.at Mon Jul 1 09:42:40 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Mon, 1 Jul 2013 18:42:40 +0200 Subject: CACAO 1.6.1 released In-Reply-To: <51D17D0F.2050003@ubuntu.com> References: <51D17D0F.2050003@ubuntu.com> Message-ID: On Mon, Jul 1, 2013 at 2:58 PM, Matthias Klose wrote: > On 06/29/13 18:00, Stefan Ring wrote: >> This is a snapshot release. > > although this is a snapshot, please could you update the icedtea1 and icedtea2 > trunks to use this snapshot? Ok, I'll initiate this. Is there a schedule for the upcoming releases or the creation of the respective release branches? From andrew at icedtea.classpath.org Mon Jul 1 18:28:43 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:28:43 +0000 Subject: /hg/release/icedtea7-forest-2.4: 47 new changesets Message-ID: changeset 5515cbf0798d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5515cbf0798d author: katleman date: Wed Apr 17 12:13:17 2013 -0700 Added tag jdk7u14-b21 for changeset 41686e19d818 changeset 3e3177719b43 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3e3177719b43 author: lana date: Thu Apr 18 14:30:33 2013 -0700 Merge changeset 8c6e2197930c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8c6e2197930c author: katleman date: Wed Apr 24 12:20:34 2013 -0700 Added tag jdk7u14-b22 for changeset 3e3177719b43 changeset aa6d7b485789 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=aa6d7b485789 author: katleman date: Wed May 01 14:50:29 2013 -0700 Added tag jdk7u40-b23 for changeset 8c6e2197930c changeset 20948dc15062 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=20948dc15062 author: lana date: Wed Apr 24 18:21:21 2013 -0700 Merge changeset 5169c92728b5 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5169c92728b5 author: lana date: Mon May 06 09:54:10 2013 -0700 Merge changeset c6440001e144 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c6440001e144 author: katleman date: Wed May 08 16:51:35 2013 -0700 Added tag jdk7u40-b24 for changeset 5169c92728b5 changeset 02ebe49d67ef in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=02ebe49d67ef author: aywang date: Thu May 09 15:45:52 2013 -0700 8014129: makefile changes to allow integration of new features Reviewed-by: tbell, robilad changeset f89fd7e2800c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f89fd7e2800c author: lana date: Fri May 10 10:13:14 2013 -0700 Merge changeset 4ef57f592525 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=4ef57f592525 author: katleman date: Thu May 16 12:13:47 2013 -0700 Added tag jdk7u40-b25 for changeset f89fd7e2800c changeset 751671992393 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=751671992393 author: katleman date: Wed May 22 16:01:45 2013 -0700 Added tag jdk7u40-b26 for changeset 4ef57f592525 changeset ac751f3867ec in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=ac751f3867ec author: katleman date: Wed May 29 13:24:16 2013 -0700 Added tag jdk7u40-b27 for changeset 751671992393 changeset dbe42a627813 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=dbe42a627813 author: katleman date: Wed Jun 05 17:46:37 2013 -0700 Added tag jdk7u40-b28 for changeset ac751f3867ec changeset 31789b6ef58f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=31789b6ef58f author: katleman date: Wed Jun 12 19:58:15 2013 -0700 Added tag jdk7u40-b29 for changeset dbe42a627813 changeset 15f63bdeb041 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=15f63bdeb041 author: katleman date: Tue Mar 12 14:45:04 2013 -0700 Added tag jdk7u25-b01 for changeset df8768f7e1a4 changeset 21289816b9dd in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=21289816b9dd author: katleman date: Tue Mar 19 14:31:12 2013 -0700 Added tag jdk7u25-b02 for changeset 15f63bdeb041 changeset 50bfbd21bf42 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=50bfbd21bf42 author: coffeys date: Thu Mar 21 22:28:45 2013 +0000 Merge changeset a94c9aa356bb in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a94c9aa356bb author: katleman date: Tue Mar 26 14:17:31 2013 -0700 Added tag jdk7u25-b03 for changeset 50bfbd21bf42 changeset d2153eb0d2f5 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d2153eb0d2f5 author: katleman date: Tue Apr 02 12:11:52 2013 -0700 Added tag jdk7u25-b04 for changeset a94c9aa356bb changeset 575cc17424d2 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=575cc17424d2 author: coffeys date: Fri Apr 05 21:33:22 2013 +0100 Merge changeset c254ab44bd14 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c254ab44bd14 author: katleman date: Mon Mar 04 14:17:07 2013 -0800 Added tag jdk7u17-b32 for changeset 941539a9f644 changeset 9e433dafde35 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9e433dafde35 author: asaha date: Mon Apr 08 15:40:23 2013 -0700 Merge changeset 29a789ae14dc in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=29a789ae14dc author: asaha date: Mon Apr 08 16:25:00 2013 -0700 Merge changeset 8a7c657b7536 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8a7c657b7536 author: katleman date: Wed Apr 10 12:42:38 2013 -0700 Added tag jdk7u25-b05 for changeset 29a789ae14dc changeset d45374e7c7ee in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d45374e7c7ee author: katleman date: Tue Apr 16 11:27:51 2013 -0700 Added tag jdk7u25-b06 for changeset 8a7c657b7536 changeset b01002577912 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b01002577912 author: katleman date: Thu Apr 18 11:44:13 2013 -0700 Added tag jdk7u25-b07 for changeset d45374e7c7ee changeset 84285f4e0aa2 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=84285f4e0aa2 author: katleman date: Tue Apr 23 16:19:54 2013 -0700 Added tag jdk7u25-b08 for changeset b01002577912 changeset aae1e27d347b in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=aae1e27d347b author: katleman date: Tue Apr 30 12:24:55 2013 -0700 Added tag jdk7u25-b09 for changeset 84285f4e0aa2 changeset 039f12124903 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=039f12124903 author: katleman date: Tue May 07 12:56:03 2013 -0700 Added tag jdk7u25-b10 for changeset aae1e27d347b changeset 2d0251896005 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2d0251896005 author: katleman date: Wed May 15 13:30:30 2013 -0700 Added tag jdk7u25-b11 for changeset 039f12124903 changeset a06a68b49a5d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a06a68b49a5d author: asaha date: Wed May 15 14:18:47 2013 -0700 Merge changeset 13d3e0c4d526 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=13d3e0c4d526 author: asaha date: Wed May 22 11:56:57 2013 -0700 Merge changeset 3b3e9157b840 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3b3e9157b840 author: asaha date: Wed Jun 12 10:35:57 2013 -0700 Merge changeset 1c141e6fde91 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1c141e6fde91 author: asaha date: Thu Jun 13 17:35:25 2013 -0700 Merge changeset 11147a12bd8c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=11147a12bd8c author: katleman date: Fri Jun 21 11:18:29 2013 -0700 Added tag jdk7u40-b30 for changeset 1c141e6fde91 changeset 37c4268341d7 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=37c4268341d7 author: katleman date: Wed May 22 15:44:42 2013 -0700 Added tag jdk7u25-b12 for changeset 2d0251896005 changeset 9de1fc3635de in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9de1fc3635de author: katleman date: Fri May 24 16:20:21 2013 -0700 Added tag jdk7u25-b13 for changeset 37c4268341d7 changeset 2197dde87712 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2197dde87712 author: katleman date: Tue Jun 04 10:47:26 2013 -0700 Added tag jdk7u25-b14 for changeset 9de1fc3635de changeset 9846c505054f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9846c505054f author: katleman date: Thu Jun 06 11:41:26 2013 -0700 Added tag jdk7u25-b15 for changeset 2197dde87712 changeset 12c2f4ce55d0 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=12c2f4ce55d0 author: katleman date: Tue Jun 11 11:45:08 2013 -0700 Added tag jdk7u25-b30 for changeset 9846c505054f changeset 40fde76d9b89 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=40fde76d9b89 author: katleman date: Wed Jun 12 20:18:12 2013 -0700 Added tag jdk7u25-b16 for changeset 12c2f4ce55d0 changeset faa42104c90a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=faa42104c90a author: katleman date: Fri Jun 14 18:10:14 2013 -0700 Added tag jdk7u25-b32 for changeset 40fde76d9b89 changeset 6093cfab8591 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6093cfab8591 author: asaha date: Fri Jun 21 10:51:32 2013 -0700 Merge changeset 58a2a470aa3b in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=58a2a470aa3b author: asaha date: Fri Jun 21 19:00:10 2013 -0700 Merge changeset e214096589de in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e214096589de author: andrew date: Mon Jul 01 09:06:18 2013 -0500 Merge jdk7u40-b29 changeset ae86c6974e8e in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=ae86c6974e8e author: andrew date: Mon Jul 01 09:22:15 2013 -0500 Merge jdk7u40-b31 changeset 775d248ebc5c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=775d248ebc5c author: andrew date: Tue Jul 02 02:26:31 2013 +0100 Added tag icedtea-2.4.1 for changeset ae86c6974e8e diffstat: .hgtags | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ .jcheck/conf | 2 - make/Defs-internal.gmk | 3 +- make/deploy-rules.gmk | 32 +-------------------------- make/hotspot-rules.gmk | 2 + 5 files changed, 64 insertions(+), 34 deletions(-) diffs (234 lines): diff -r 41686e19d818 -r 775d248ebc5c .hgtags --- a/.hgtags Wed Apr 10 10:29:41 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:31 2013 +0100 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -191,6 +197,7 @@ 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -213,6 +220,8 @@ dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02 3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04 d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05 +81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31 +d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32 d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10 5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11 48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12 @@ -223,8 +232,11 @@ 494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17 dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18 b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30 +337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31 c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20 168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21 +7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32 +61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33 c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03 0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04 e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05 @@ -253,6 +265,7 @@ c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint 745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 @@ -262,10 +275,44 @@ 0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30 +5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31 +e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33 f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03 2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32 0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02 +933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30 +790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31 +941539a9f6441f053e8e7f31064944b2fc08879f jdk7u17-b32 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01 +bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02 +20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03 +d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04 +2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05 +14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06 +0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07 +1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08 +a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09 +602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10 +fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 +450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 +170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12 +50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03 +a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04 +29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05 +8a7c657b7536006633b5e961d93e2173712a64fa jdk7u25-b06 +d45374e7c7eeb4e01d9f239e71e8a8aff453d55a jdk7u25-b07 +b01002577912b89306e88a9973b6f3bc049a2a69 jdk7u25-b08 +84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09 +aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10 +039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11 +2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12 +37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13 +9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14 +2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15 +9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30 +12c2f4ce55d074f0be94781d98cbbbcf8299b666 jdk7u25-b16 +40fde76d9b89f5acc63f4eeeccdc261d9999bf39 jdk7u25-b32 210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16 f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17 9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18 @@ -273,3 +320,15 @@ d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19 f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20 +30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0 +41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21 +3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22 +8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23 +5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24 +f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25 +4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26 +75167199239375d05b68668023c885c2776fd548 jdk7u40-b27 +ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28 +dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29 +1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30 +ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1 diff -r 41686e19d818 -r 775d248ebc5c .jcheck/conf --- a/.jcheck/conf Wed Apr 10 10:29:41 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 41686e19d818 -r 775d248ebc5c make/Defs-internal.gmk --- a/make/Defs-internal.gmk Wed Apr 10 10:29:41 2013 -0700 +++ b/make/Defs-internal.gmk Tue Jul 02 02:26:31 2013 +0100 @@ -322,7 +322,8 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ + STATIC_CXX=$(STATIC_CXX) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) diff -r 41686e19d818 -r 775d248ebc5c make/deploy-rules.gmk --- a/make/deploy-rules.gmk Wed Apr 10 10:29:41 2013 -0700 +++ b/make/deploy-rules.gmk Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, 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 @@ -42,20 +42,6 @@ endif DEPLOY_BUILD_TARGETS = sanity deploy -# Only build 7-Zip LZMA file compression if it is available -# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(EC_TMP), true) - DEPLOY_BUILD_TARGETS += extra-comp-all - endif - endif -endif ifneq ($(JQS), off) ifeq ($(ARCH_DATA_MODEL), 32) @@ -65,22 +51,6 @@ endif endif -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - # Only set up to use UPX compression if it is available - UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(UP_TMP), true) - DEPLOY_BUILD_TARGETS += cmd-comp-all - endif - endif -endif - - - ifndef DEV_ONLY DEPLOY_BUILD_TARGETS += images else diff -r 41686e19d818 -r 775d248ebc5c make/hotspot-rules.gmk --- a/make/hotspot-rules.gmk Wed Apr 10 10:29:41 2013 -0700 +++ b/make/hotspot-rules.gmk Tue Jul 02 02:26:31 2013 +0100 @@ -105,6 +105,8 @@ HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" endif +-include ${JDK_TOPDIR}/make/closed/common/Defs.gmk + hotspot-build:: $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH) From andrew at icedtea.classpath.org Mon Jul 1 18:28:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:28:52 +0000 Subject: /hg/release/icedtea7-forest-2.4/corba: 48 new changesets Message-ID: changeset 1d66cb844403 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1d66cb844403 author: katleman date: Wed Apr 17 12:13:22 2013 -0700 Added tag jdk7u14-b21 for changeset fb590ca4de9a changeset e5d89aa2c1a1 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e5d89aa2c1a1 author: lana date: Thu Apr 18 14:31:09 2013 -0700 Merge changeset d85df1552f87 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d85df1552f87 author: katleman date: Wed Apr 24 12:20:36 2013 -0700 Added tag jdk7u14-b22 for changeset e5d89aa2c1a1 changeset 3c41beaa95f5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3c41beaa95f5 author: katleman date: Wed May 01 14:50:34 2013 -0700 Added tag jdk7u40-b23 for changeset d85df1552f87 changeset 583e454e0813 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=583e454e0813 author: dmeetry date: Mon Apr 29 16:44:32 2013 +0400 4504275: CORBA boolean type unions do not generate compilable code from idlj Summary: JLS doesn't allow boolean type in switch statement, hence substituted by if statement. Reviewed-by: lancea changeset 2f38ced3bea8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2f38ced3bea8 author: dmeetry date: Mon Apr 29 16:51:32 2013 +0400 8011986: [corba] idlj generates read/write union helper methods that throw wrong exception in some cases Reviewed-by: lancea changeset d3ab3b19caa0 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d3ab3b19caa0 author: lana date: Mon May 06 09:54:13 2013 -0700 Merge changeset abfc54516d0b in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=abfc54516d0b author: katleman date: Wed May 08 16:51:42 2013 -0700 Added tag jdk7u40-b24 for changeset d3ab3b19caa0 changeset be9099c54a35 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=be9099c54a35 author: katleman date: Thu May 16 12:13:53 2013 -0700 Added tag jdk7u40-b25 for changeset abfc54516d0b changeset f745eeabb0ea in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f745eeabb0ea author: katleman date: Wed May 22 16:01:47 2013 -0700 Added tag jdk7u40-b26 for changeset be9099c54a35 changeset c8b9201f88f4 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c8b9201f88f4 author: katleman date: Wed May 29 13:24:20 2013 -0700 Added tag jdk7u40-b27 for changeset f745eeabb0ea changeset 1ad0a5a3f7b1 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1ad0a5a3f7b1 author: katleman date: Wed Jun 05 17:46:39 2013 -0700 Added tag jdk7u40-b28 for changeset c8b9201f88f4 changeset b9a72e58773c in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b9a72e58773c author: katleman date: Wed Jun 12 19:58:16 2013 -0700 Added tag jdk7u40-b29 for changeset 1ad0a5a3f7b1 changeset cdbafc5080ee in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=cdbafc5080ee author: katleman date: Tue Mar 12 14:45:06 2013 -0700 Added tag jdk7u25-b01 for changeset 3d0f2d5b1866 changeset 9fcb409310d7 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9fcb409310d7 author: katleman date: Tue Mar 19 14:31:19 2013 -0700 Added tag jdk7u25-b02 for changeset cdbafc5080ee changeset 2057de7ee6b1 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2057de7ee6b1 author: coffeys date: Thu Mar 21 22:29:15 2013 +0000 Merge changeset b180f1282ad2 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b180f1282ad2 author: katleman date: Tue Mar 26 14:17:32 2013 -0700 Added tag jdk7u25-b03 for changeset 2057de7ee6b1 changeset 3ad05f13c4e8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3ad05f13c4e8 author: katleman date: Tue Apr 02 12:11:58 2013 -0700 Added tag jdk7u25-b04 for changeset b180f1282ad2 changeset 262eade94753 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=262eade94753 author: coffeys date: Fri Apr 05 21:33:35 2013 +0100 Merge changeset ffa99209b6e3 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ffa99209b6e3 author: coffeys date: Mon Apr 08 23:12:03 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross changeset a9ded0d825eb in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a9ded0d825eb author: katleman date: Mon Mar 04 14:17:09 2013 -0800 Added tag jdk7u17-b32 for changeset 6401c6b99d2d changeset 2c8f00e59653 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2c8f00e59653 author: asaha date: Mon Apr 08 15:40:58 2013 -0700 Merge changeset d97e6c162735 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d97e6c162735 author: asaha date: Mon Apr 08 16:25:34 2013 -0700 Merge changeset da9301dac56c in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=da9301dac56c author: katleman date: Wed Apr 10 12:42:43 2013 -0700 Added tag jdk7u25-b05 for changeset d97e6c162735 changeset aa2dc8d3bb2c in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=aa2dc8d3bb2c author: katleman date: Tue Apr 16 11:27:52 2013 -0700 Added tag jdk7u25-b06 for changeset da9301dac56c changeset 550d43da7fe2 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=550d43da7fe2 author: katleman date: Thu Apr 18 11:44:14 2013 -0700 Added tag jdk7u25-b07 for changeset aa2dc8d3bb2c changeset e7d599f87ef1 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e7d599f87ef1 author: katleman date: Tue Apr 23 16:20:03 2013 -0700 Added tag jdk7u25-b08 for changeset 550d43da7fe2 changeset 161ec4dd450d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=161ec4dd450d author: coffeys date: Fri Apr 26 18:26:12 2013 +0100 8000642: Better handling of objects for transportation Summary: Also reviewed by alexander.fomin Reviewed-by: alanb, mchung, skoivu changeset c9da98e82bb0 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c9da98e82bb0 author: katleman date: Tue Apr 30 12:25:01 2013 -0700 Added tag jdk7u25-b09 for changeset 161ec4dd450d changeset 109386df5b8e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=109386df5b8e author: katleman date: Tue May 07 12:56:10 2013 -0700 Added tag jdk7u25-b10 for changeset c9da98e82bb0 changeset ef8e6f8305d5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ef8e6f8305d5 author: katleman date: Wed May 15 13:30:36 2013 -0700 Added tag jdk7u25-b11 for changeset 109386df5b8e changeset 6e5480f1679c in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6e5480f1679c author: asaha date: Wed May 15 14:17:56 2013 -0700 Merge changeset bcc7deed397b in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bcc7deed397b author: asaha date: Wed May 22 11:57:17 2013 -0700 Merge changeset 96ab87e8a596 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=96ab87e8a596 author: asaha date: Wed Jun 12 08:57:25 2013 -0700 Merge changeset 651dcadbd977 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=651dcadbd977 author: asaha date: Thu Jun 13 17:35:56 2013 -0700 Merge changeset c5b5886004e6 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c5b5886004e6 author: katleman date: Fri Jun 21 11:18:31 2013 -0700 Added tag jdk7u40-b30 for changeset 651dcadbd977 changeset eca480919c71 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eca480919c71 author: katleman date: Wed May 22 15:44:47 2013 -0700 Added tag jdk7u25-b12 for changeset ef8e6f8305d5 changeset 577c4dd1a6e9 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=577c4dd1a6e9 author: katleman date: Fri May 24 16:20:22 2013 -0700 Added tag jdk7u25-b13 for changeset eca480919c71 changeset 4fde7ac2ecf4 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4fde7ac2ecf4 author: katleman date: Tue Jun 04 10:47:31 2013 -0700 Added tag jdk7u25-b14 for changeset 577c4dd1a6e9 changeset f4bec833a24b in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f4bec833a24b author: katleman date: Thu Jun 06 11:41:28 2013 -0700 Added tag jdk7u25-b15 for changeset 4fde7ac2ecf4 changeset 65d0e39500d5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=65d0e39500d5 author: katleman date: Tue Jun 11 11:45:11 2013 -0700 Added tag jdk7u25-b30 for changeset f4bec833a24b changeset d77153cbe030 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d77153cbe030 author: katleman date: Wed Jun 12 20:18:16 2013 -0700 Added tag jdk7u25-b16 for changeset 65d0e39500d5 changeset 676aa80fc554 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=676aa80fc554 author: katleman date: Fri Jun 14 18:10:15 2013 -0700 Added tag jdk7u25-b32 for changeset d77153cbe030 changeset 6c6a69f1e394 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6c6a69f1e394 author: asaha date: Fri Jun 21 10:51:54 2013 -0700 Merge changeset 3d2b811b8a79 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3d2b811b8a79 author: asaha date: Fri Jun 21 19:00:26 2013 -0700 Merge changeset 2adeac28b7a0 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2adeac28b7a0 author: andrew date: Mon Jul 01 09:06:51 2013 -0500 Merge jdk7u40-b29 changeset 23ae4e0e0cce in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=23ae4e0e0cce author: andrew date: Mon Jul 01 09:21:59 2013 -0500 Merge jdk7u40-b31 changeset fa3662658634 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fa3662658634 author: andrew date: Tue Jul 02 02:26:31 2013 +0100 Added tag icedtea-2.4.1 for changeset 23ae4e0e0cce diffstat: .hgtags | 61 ++++ .jcheck/conf | 2 - make/Makefile | 2 +- make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 3 +- make/common/shared/Platform.gmk | 9 + src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 12 +- src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java | 4 +- src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java | 5 +- src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java | 18 +- src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java | 10 +- src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +- src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java | 7 +- src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 11 +- src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java | 4 +- src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java | 22 +- src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java | 47 --- src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java | 22 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java | 3 +- src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 6 +- src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java | 5 +- src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 6 +- src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java | 8 +- src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java | 5 +- src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java | 55 ++- src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java | 40 ++- src/share/classes/sun/corba/JavaCorbaAccess.java | 3 +- src/share/classes/sun/corba/OutputStreamFactory.java | 149 ++++++++++ 49 files changed, 445 insertions(+), 190 deletions(-) diffs (truncated from 1629 to 500 lines): diff -r fb590ca4de9a -r fa3662658634 .hgtags --- a/.hgtags Wed Apr 10 10:29:44 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:31 2013 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -191,6 +197,7 @@ 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -213,6 +220,8 @@ ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02 268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04 a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05 +b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31 +0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32 ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10 a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11 e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12 @@ -223,8 +232,11 @@ 57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17 f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18 22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30 +2723612f5983e7d65490d7d4a3d8577026448736 jdk7u10-b31 e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20 dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21 +24f8cb8a0a615686f8baba4d746514bae92f064d jdk7u11-b32 +4bfef14df261d69dc32e37d189e12e3fa572a83c jdk7u11-b33 96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03 1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04 5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05 @@ -253,6 +265,7 @@ 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 @@ -262,10 +275,46 @@ 622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30 +3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31 +f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33 e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03 b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32 94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01 e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02 +d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30 +a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31 +6401c6b99d2d43ed4f0e2d38dce496069f6e91f8 jdk7u17-b32 +f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01 +17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02 +bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03 +3e39240d7314e82b3ccff3b2a64413be9c0b6665 jdk7u21-b04 +f5a291dc9d219f68a2d4bcc72c65c014e9ec3b8b jdk7u21-b05 +94f2ebfccc5e057169284bb2c858296b235868ea jdk7u21-b06 +23a57aceeb69e688f8ce8b8361fad3a49cf4ac5f jdk7u21-b07 +ebedf04bfffe289e8bf9661b38f73ca6c0dad17c jdk7u21-b08 +b8f92ad1f0cc86d8571a0e23192e667f0ef8e421 jdk7u21-b09 +b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 +61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 +3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 +fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12 +3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01 +cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02 +2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03 +b180f1282ad221bde0d4d865c879c0fa7f8ef4c8 jdk7u25-b04 +d97e6c162735798fe0c9f1dd582aa1114b6c5447 jdk7u25-b05 +da9301dac56c26846212db33bb20001652b6ce60 jdk7u25-b06 +aa2dc8d3bb2cdd726ec97bc2bf130eec46467f28 jdk7u25-b07 +550d43da7fe2f85bbce88cc94066c589480b1221 jdk7u25-b08 +161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09 +c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10 +109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11 +ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12 +eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 +577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 +4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15 +f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30 +65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16 +d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32 38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16 8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17 862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18 @@ -273,3 +322,15 @@ bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19 54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20 +47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0 +fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21 +e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22 +d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23 +d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24 +abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25 +be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26 +f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27 +c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28 +1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29 +651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30 +23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1 diff -r fb590ca4de9a -r fa3662658634 .jcheck/conf --- a/.jcheck/conf Wed Apr 10 10:29:44 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r fb590ca4de9a -r fa3662658634 make/Makefile --- a/make/Makefile Wed Apr 10 10:29:44 2013 -0700 +++ b/make/Makefile Tue Jul 02 02:26:31 2013 +0100 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r fb590ca4de9a -r fa3662658634 make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed Apr 10 10:29:44 2013 -0700 +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2013, 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 @@ -39,7 +39,6 @@ com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \ com/sun/corba/se/impl/orbutil/ORBConstants.java \ com/sun/corba/se/impl/orbutil/ORBUtility.java \ - com/sun/corba/se/impl/orbutil/ORBClassLoader.java \ com/sun/corba/se/impl/orbutil/RepIdDelegator.java \ com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \ com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \ diff -r fb590ca4de9a -r fa3662658634 make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Wed Apr 10 10:29:44 2013 -0700 +++ b/make/common/shared/Platform.gmk Tue Jul 02 02:26:31 2013 +0100 @@ -153,6 +153,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version mach := $(shell uname -m) + ifneq (,$(wildcard /usr/bin/dpkg-architecture)) + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + endif archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@ -169,6 +172,9 @@ arm*) \ echo arm \ ;; \ + sh*) \ + echo sh \ + ;; \ *) \ echo $(mach) \ ;; \ @@ -196,6 +202,9 @@ else ARCH_DATA_MODEL=64 endif + ifeq ($(ARCH), sh) + ARCH_DATA_MODEL=32 + endif endif endif diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -81,7 +81,6 @@ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; import com.sun.corba.se.impl.orbutil.ORBConstants; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.util.Utility; diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -33,6 +33,8 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.List ; import java.util.ArrayList ; @@ -504,7 +506,13 @@ public org.omg.CORBA.portable.OutputStream create_output_stream() { //debug.log ("create_output_stream"); - return new AnyOutputStream(orb); + final ORB finalorb = this.orb; + return AccessController.doPrivileged(new PrivilegedAction() { + @Override + public AnyOutputStream run() { + return new AnyOutputStream(finalorb); + } + }); } /** diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, 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 @@ -600,7 +600,8 @@ } public static CDROutputStream newOutputStream(ORB orb) { - TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb); + TypeCodeOutputStream tcos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb); //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos + // " with no parent"); return tcos; diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, 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 @@ -66,7 +66,7 @@ * * @author Ram Jeyaraman */ -public class IDLJavaSerializationOutputStream extends CDROutputStreamBase { +final class IDLJavaSerializationOutputStream extends CDROutputStreamBase { private ORB orb; private byte encodingVersion; diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, 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 @@ -196,7 +196,8 @@ } public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) { - TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian()); + TypeCodeOutputStream encap = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian()); encap.setEnclosingOutputStream(this); encap.makeEncapsulation(); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this); @@ -211,7 +212,8 @@ public static TypeCodeOutputStream wrapOutputStream(OutputStream os) { boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false); - TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian); + TypeCodeOutputStream tos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian); tos.setEnclosingOutputStream(os); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os); return tos; diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, 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 @@ -155,7 +155,8 @@ // be versioned. This can be handled once this work is complete. // Create output stream with default endianness. - EncapsOutputStream cdrOut = new EncapsOutputStream( + EncapsOutputStream cdrOut = + sun.corba.OutputStreamFactory.newEncapsOutputStream( (com.sun.corba.se.spi.orb.ORB)orb, giopVersion ); // This is an encapsulation, so put out the endian: diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, 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 @@ -77,7 +77,6 @@ import com.sun.corba.se.impl.logging.ORBUtilSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; import com.sun.corba.se.impl.corba.RequestImpl; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBConstants; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.orbutil.StackImpl; diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, 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 @@ -86,13 +86,14 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream; import com.sun.corba.se.impl.orbutil.ORBUtility; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.util.RepositoryId; import com.sun.corba.se.impl.logging.InterceptorsSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; +import sun.corba.SharedSecrets; + /** * Implementation of the RequestInfo interface as specified in * orbos/99-12-02 section 5.4.1. @@ -452,7 +453,8 @@ // Find the read method on the helper class: String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); Class[] readParams = new Class[1]; readParams[0] = org.omg.CORBA.portable.InputStream.class; Method readMethod = helperClass.getMethod( "read", readParams ); @@ -512,7 +514,8 @@ Class exceptionClass = userException.getClass(); String className = exceptionClass.getName(); String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); // Find insert( Any, class ) method Class[] insertMethodParams = new Class[2]; @@ -656,7 +659,8 @@ // Convert the "core" service context to an // "IOP" ServiceContext by writing it to a // CDROutputStream and reading it back. - EncapsOutputStream out = new EncapsOutputStream(myORB); + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); context.write( out, GIOPVersion.V1_2 ); InputStream inputStream = out.create_input_stream(); @@ -692,8 +696,8 @@ { int id = 0 ; // Convert IOP.service_context to core.ServiceContext: - EncapsOutputStream outputStream = new EncapsOutputStream( - myORB ); + EncapsOutputStream outputStream = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); InputStream inputStream = null; UnknownServiceContext coreServiceContext = null; ServiceContextHelper.write( outputStream, service_context ); diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Jul 02 02:26:31 2013 +0100 @@ -300,11 +300,11 @@ resetStream(); } - public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { return orbStream; } @@ -327,11 +327,11 @@ return (javax.rmi.CORBA.ValueHandler) vhandler; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed Apr 10 10:29:44 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Tue Jul 02 02:26:31 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, 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 @@ -124,19 +124,19 @@ } } - public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { return orbStream; } From andrew at icedtea.classpath.org Mon Jul 1 18:29:09 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:29:09 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxp: 54 new changesets Message-ID: changeset 20fa997bd3e6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=20fa997bd3e6 author: katleman date: Wed Apr 17 12:13:37 2013 -0700 Added tag jdk7u14-b21 for changeset d1c8bb1cbc91 changeset d1c6afebdfe2 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d1c6afebdfe2 author: lana date: Thu Apr 18 14:33:44 2013 -0700 Merge changeset 0e4c549d3635 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0e4c549d3635 author: katleman date: Wed Apr 24 12:21:07 2013 -0700 Added tag jdk7u14-b22 for changeset d1c6afebdfe2 changeset d17acb2ee133 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d17acb2ee133 author: katleman date: Wed May 01 14:51:21 2013 -0700 Added tag jdk7u40-b23 for changeset 0e4c549d3635 changeset 2b5900f0bc6a in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2b5900f0bc6a author: katleman date: Wed May 08 16:52:07 2013 -0700 Added tag jdk7u40-b24 for changeset d17acb2ee133 changeset 52bcce690998 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=52bcce690998 author: joehw date: Mon May 13 12:25:23 2013 -0700 8011653: Upgrade to JAXP 1.5 Summary: backport jdk8 changes into 7u40 Reviewed-by: alanb, lancea, dfuchs changeset cd764ada36b5 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=cd764ada36b5 author: katleman date: Thu May 16 12:14:49 2013 -0700 Added tag jdk7u40-b25 for changeset 52bcce690998 changeset 7626b3fbc822 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7626b3fbc822 author: katleman date: Wed May 22 16:01:55 2013 -0700 Added tag jdk7u40-b26 for changeset cd764ada36b5 changeset c7596f69febb in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c7596f69febb author: katleman date: Wed May 29 13:24:29 2013 -0700 Added tag jdk7u40-b27 for changeset 7626b3fbc822 changeset bb6ff7d1deb7 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=bb6ff7d1deb7 author: joehw date: Tue May 21 09:22:51 2013 -0700 8012683: Remove unused, obsolete ObjectFactory classes Reviewed-by: lancea changeset 3e1a31ba199f in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3e1a31ba199f author: joehw date: Tue May 21 12:07:33 2013 -0700 8014891: Redundant setting of external access properties in setFeatures Reviewed-by: lancea changeset 1e8581c8e1e7 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1e8581c8e1e7 author: lana date: Thu May 23 17:15:42 2013 -0700 Merge changeset d6d20248f406 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d6d20248f406 author: dfuchs date: Fri May 31 16:30:41 2013 +0200 8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently Summary: Encodings.java sometimes creates EncodingInfo objects whose java names are not recognized by the Charset API. This patch fixes that issue. Reviewed-by: joehw, alanb changeset 9186b6efd2b2 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9186b6efd2b2 author: lana date: Fri May 31 15:42:06 2013 -0700 Merge changeset 740942c76fb6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=740942c76fb6 author: katleman date: Wed Jun 05 17:46:49 2013 -0700 Added tag jdk7u40-b28 for changeset 9186b6efd2b2 changeset 888c2d81d14a in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=888c2d81d14a author: katleman date: Wed Jun 12 19:58:25 2013 -0700 Added tag jdk7u40-b29 for changeset 740942c76fb6 changeset fd1d63d3617b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=fd1d63d3617b author: dfuchs date: Mon Jun 03 11:29:15 2013 +0200 8013900: More warnings compiling jaxp. Summary: Some internal implementation classes in Jaxp were redefining equals() without redefining hashCode(). This patch adds hashCode() methods that are consistent with equals(). Reviewed-by: chegar, joehw changeset 0d522000b92c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0d522000b92c author: lana date: Thu Jun 06 19:09:54 2013 -0700 Merge changeset 8c0300415567 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8c0300415567 author: joehw date: Fri Jun 07 10:01:27 2013 -0700 8015016: Improve JAXP 1.5 error message Reviewed-by: lancea changeset e0d70a8119e8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e0d70a8119e8 author: joehw date: Tue Jun 11 14:22:30 2013 -0700 8016153: Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized. Reviewed-by: lancea, dfuchs changeset 6a38df28198e in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=6a38df28198e author: lana date: Sun Jun 16 22:17:14 2013 -0700 Merge changeset f9c1fe7cd119 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f9c1fe7cd119 author: katleman date: Tue Mar 12 14:45:18 2013 -0700 Added tag jdk7u25-b01 for changeset 5704dc942da6 changeset 266b10e923fd in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=266b10e923fd author: katleman date: Tue Mar 19 14:31:36 2013 -0700 Added tag jdk7u25-b02 for changeset f9c1fe7cd119 changeset fe858d7d6a13 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=fe858d7d6a13 author: coffeys date: Thu Mar 21 22:31:46 2013 +0000 Merge changeset 1a2822a1d6a4 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1a2822a1d6a4 author: katleman date: Tue Mar 26 14:17:46 2013 -0700 Added tag jdk7u25-b03 for changeset fe858d7d6a13 changeset 1cdde0662f8f in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1cdde0662f8f author: katleman date: Tue Apr 02 12:12:16 2013 -0700 Added tag jdk7u25-b04 for changeset 1a2822a1d6a4 changeset 3bf3ca303701 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3bf3ca303701 author: coffeys date: Fri Apr 05 21:34:19 2013 +0100 Merge changeset 8d7874ee1a16 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8d7874ee1a16 author: katleman date: Mon Mar 04 14:17:21 2013 -0800 Added tag jdk7u17-b32 for changeset f7d8d2c003a1 changeset 754b3678b732 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=754b3678b732 author: asaha date: Mon Apr 08 15:56:42 2013 -0700 Merge changeset e927605d1678 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e927605d1678 author: asaha date: Mon Apr 08 16:30:47 2013 -0700 Merge changeset 8dfb4db227e7 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8dfb4db227e7 author: katleman date: Wed Apr 10 12:42:59 2013 -0700 Added tag jdk7u25-b05 for changeset e927605d1678 changeset ad2732999848 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ad2732999848 author: katleman date: Tue Apr 16 11:28:07 2013 -0700 Added tag jdk7u25-b06 for changeset 8dfb4db227e7 changeset df9def256970 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=df9def256970 author: katleman date: Thu Apr 18 11:44:25 2013 -0700 Added tag jdk7u25-b07 for changeset ad2732999848 changeset 5952538d55e6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5952538d55e6 author: katleman date: Tue Apr 23 16:21:28 2013 -0700 Added tag jdk7u25-b08 for changeset df9def256970 changeset aa00dd983dd0 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=aa00dd983dd0 author: katleman date: Tue Apr 30 12:25:21 2013 -0700 Added tag jdk7u25-b09 for changeset 5952538d55e6 changeset 0fb6d76bcd2e in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0fb6d76bcd2e author: katleman date: Tue May 07 12:56:27 2013 -0700 Added tag jdk7u25-b10 for changeset aa00dd983dd0 changeset 5e87aee78c91 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5e87aee78c91 author: katleman date: Wed May 15 13:31:00 2013 -0700 Added tag jdk7u25-b11 for changeset 0fb6d76bcd2e changeset c3a4d0a75516 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c3a4d0a75516 author: asaha date: Wed May 15 14:25:39 2013 -0700 Merge changeset b2be2c9aaa7c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b2be2c9aaa7c author: asaha date: Wed Jun 12 08:59:59 2013 -0700 Merge changeset 1d7b56a32177 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1d7b56a32177 author: asaha date: Thu Jun 13 17:37:54 2013 -0700 Merge changeset 09b080236bc1 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=09b080236bc1 author: asaha date: Mon Jun 17 22:26:28 2013 -0700 Merge changeset d9b92749a0f4 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d9b92749a0f4 author: katleman date: Fri Jun 21 11:18:48 2013 -0700 Added tag jdk7u40-b30 for changeset 09b080236bc1 changeset 83b80c094bef in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=83b80c094bef author: katleman date: Wed May 22 15:44:57 2013 -0700 Added tag jdk7u25-b12 for changeset 5e87aee78c91 changeset 68cc0d2a49f0 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=68cc0d2a49f0 author: katleman date: Fri May 24 16:20:34 2013 -0700 Added tag jdk7u25-b13 for changeset 83b80c094bef changeset 503f75b55b34 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=503f75b55b34 author: katleman date: Tue Jun 04 10:47:43 2013 -0700 Added tag jdk7u25-b14 for changeset 68cc0d2a49f0 changeset 8c35f2344bee in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8c35f2344bee author: katleman date: Thu Jun 06 11:41:42 2013 -0700 Added tag jdk7u25-b15 for changeset 503f75b55b34 changeset 9cebeb3118ac in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9cebeb3118ac author: katleman date: Tue Jun 11 11:45:22 2013 -0700 Added tag jdk7u25-b30 for changeset 8c35f2344bee changeset 0d4cfe518086 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0d4cfe518086 author: katleman date: Wed Jun 12 20:18:26 2013 -0700 Added tag jdk7u25-b16 for changeset 9cebeb3118ac changeset 1afb8c1984ac in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1afb8c1984ac author: katleman date: Fri Jun 14 18:10:26 2013 -0700 Added tag jdk7u25-b32 for changeset 0d4cfe518086 changeset f966e927af9b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f966e927af9b author: asaha date: Fri Jun 21 10:52:50 2013 -0700 Merge changeset 5b31380e2e0b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5b31380e2e0b author: asaha date: Fri Jun 21 19:01:06 2013 -0700 Merge changeset 2790f09619a5 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2790f09619a5 author: andrew date: Mon Jul 01 09:06:55 2013 -0500 Merge jdk7u40-b29 changeset 5be6b670d08b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5be6b670d08b author: andrew date: Mon Jul 01 09:21:53 2013 -0500 Merge jdk7u40-b31 changeset 876dd2a45346 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=876dd2a45346 author: andrew date: Tue Jul 02 02:26:32 2013 +0100 Added tag icedtea-2.4.1 for changeset 5be6b670d08b diffstat: .hgtags | 61 + .jcheck/conf | 2 - src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java | 6 +- src/com/sun/org/apache/bcel/internal/generic/BasicType.java | 6 + src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java | 32 +- src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java | 20 +- src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java | 10 +- src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java | 101 +- src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java | 8 +- src/com/sun/org/apache/bcel/internal/generic/Select.java | 22 +- src/com/sun/org/apache/bcel/internal/util/Class2HTML.java | 3 +- src/com/sun/org/apache/bcel/internal/util/ClassPath.java | 20 +- src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java | 3 +- src/com/sun/org/apache/bcel/internal/util/Objects.java | 45 + src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java | 223 + src/com/sun/org/apache/xalan/internal/XalanConstants.java | 106 +- src/com/sun/org/apache/xalan/internal/res/XSLMessages.java | 106 +- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java | 63 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java | 64 - src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java | 64 - src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java | 11 +- src/com/sun/org/apache/xalan/internal/utils/Objects.java | 45 + src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java | 233 +- src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java | 11 +- src/com/sun/org/apache/xalan/internal/xslt/Process.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java | 17 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java | 26 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java | 28 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java | 60 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java | 17 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java | 51 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java | 13 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java | 17 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java | 10 + src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java | 20 + src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java | 6 + src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java | 20 + src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java | 61 +- src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java | 13 + src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java | 8 + src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java | 46 +- src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java | 15 +- src/com/sun/org/apache/xerces/internal/impl/Constants.java | 97 + src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java | 20 +- src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 65 +- src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java | 69 +- src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 145 +- src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java | 4 +- src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java | 1703 +++++---- src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java | 33 +- src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java | 87 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java | 11 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties | 3 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties | 4 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties | 1 + src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java | 5 +- src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java | 32 +- src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java | 12 +- src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java | 12 + src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java | 9 +- src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java | 24 + src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java | 10 +- src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java | 25 + src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java | 3 +- src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java | 22 + src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java | 28 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java | 3 + src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java | 7 + src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java | 27 + src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java | 9 + src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java | 17 + src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java | 63 +- src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/SecurityManager.java | 70 +- src/com/sun/org/apache/xerces/internal/util/URI.java | 24 +- src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java | 13 +- src/com/sun/org/apache/xerces/internal/utils/Objects.java | 45 + src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java | 176 +- src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java | 553 --- src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java | 156 +- src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java | 9 +- src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java | 8 +- src/com/sun/org/apache/xml/internal/dtm/DTMManager.java | 3 +- src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 162 +- src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 67 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java | 66 - src/com/sun/org/apache/xml/internal/res/XMLMessages.java | 65 +- src/com/sun/org/apache/xml/internal/resolver/Catalog.java | 5 +- src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java | 17 +- src/com/sun/org/apache/xml/internal/resolver/Resolver.java | 5 +- src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java | 553 --- src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java | 3 +- src/com/sun/org/apache/xml/internal/serializer/Encodings.java | 370 +- src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java | 5 +- src/com/sun/org/apache/xml/internal/serializer/ToStream.java | 3 +- src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java | 5 +- src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java | 100 +- src/com/sun/org/apache/xml/internal/serializer/utils/URI.java | 25 +- src/com/sun/org/apache/xml/internal/utils/TreeWalker.java | 7 +- src/com/sun/org/apache/xml/internal/utils/URI.java | 22 +- src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java | 37 +- src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java | 141 +- src/com/sun/org/apache/xpath/internal/Arg.java | 9 +- src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java | 7 +- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java | 67 - src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java | 216 +- src/com/sun/xml/internal/stream/StaxXMLInputSource.java | 13 + src/com/sun/xml/internal/stream/XMLEntityStorage.java | 3 +- src/com/sun/xml/internal/stream/writers/WriterUtility.java | 3 +- src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java | 3 +- src/javax/xml/XMLConstants.java | 222 +- src/javax/xml/datatype/FactoryFinder.java | 62 +- src/javax/xml/parsers/DocumentBuilderFactory.java | 25 + src/javax/xml/parsers/FactoryFinder.java | 10 +- src/javax/xml/parsers/SAXParser.java | 23 + src/javax/xml/stream/FactoryFinder.java | 77 +- src/javax/xml/stream/XMLInputFactory.java | 23 +- src/javax/xml/transform/FactoryFinder.java | 11 +- src/javax/xml/transform/TransformerFactory.java | 40 + src/javax/xml/validation/SchemaFactory.java | 40 +- src/javax/xml/validation/SchemaFactoryFinder.java | 43 +- src/javax/xml/validation/Validator.java | 23 +- src/javax/xml/xpath/XPathFactoryFinder.java | 30 +- src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java | 13 +- src/org/xml/sax/helpers/NewInstance.java | 38 +- src/org/xml/sax/helpers/ParserAdapter.java | 5 +- src/org/xml/sax/helpers/ParserFactory.java | 13 +- src/org/xml/sax/helpers/SecuritySupport.java | 108 + src/org/xml/sax/helpers/XMLReaderFactory.java | 62 +- 219 files changed, 4821 insertions(+), 5611 deletions(-) diffs (truncated from 17172 to 500 lines): diff -r d1c8bb1cbc91 -r 876dd2a45346 .hgtags --- a/.hgtags Wed Apr 10 10:30:06 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:32 2013 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -191,6 +197,7 @@ 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -213,6 +220,8 @@ 78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u9-b02 b12a2d557c5e302b614c5f7e25ad6c8a0e138742 jdk7u9-b04 ab4bbb93b3831aca230c62431f7fe02b56793450 jdk7u9-b05 +039b21e98d2b2d0b26a19c325b37ce522bae39de jdk7u9-b31 +d80a8e81fef0bc6e0bdb7891895bda527853add1 jdk7u9-b32 254ed6ae237ee631179819570cf7fb265c6fb3a8 jdk7u10-b10 c1df39bcc9c1bcdfb2a92682650264b3b7771ce8 jdk7u10-b11 00cfd60368048c4969785eb52ec50cf5691c4367 jdk7u10-b12 @@ -223,8 +232,11 @@ 86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17 162a2c6ad8718a63253fa53724f704a4f85731bc jdk7u10-b18 c59eb287de720ae5ce8087f179ec01f4f6525a32 jdk7u10-b30 +ec1e8ead41ee49d2b3f84a26ae0fac88e226692d jdk7u10-b31 853059839d38432f86e345ba951397ede235a374 jdk7u11-b20 453a52320a1b8bd425fdb55e14b64067b536f1e2 jdk7u11-b21 +71353182d3f7c237047c5386d9f31186a5bd1519 jdk7u11-b32 +af8f33c558d05aacdff5b5787be0cbaba9f10e98 jdk7u11-b33 5df9207c4378b7f4b24d70b365714c5ee6318982 jdk7u11-b03 6ee19b9c8313db32e6d8989aa3782830d2b09710 jdk7u11-b04 3312b258392eaeab9c4a20e3deb36d3ae3337efe jdk7u11-b05 @@ -253,6 +265,7 @@ 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint 23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 @@ -262,10 +275,46 @@ 99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01 edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02 14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30 +de6df3c10ebc0f8c704a11ad86c8eea1e1cc1442 jdk7u15-b31 +039c31ff1fe6789859f2f55588218147623a9a9f jdk7u15-b33 a55f67cfe182dc42a86aae836674eb8ba5b79891 jdk7u15-b03 eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u15-b32 8a9867ee429440b657eb5852c4dae5f029356022 jdk7u17-b01 7863a60ae4b4a0c7d762a95e77e589fafa4e50ae jdk7u17-b02 +a5e6594fc1ae20101b5d69632f65078d7a99b76d jdk7u17-b30 +8fb34202383ece5386acecc3a6c1dac68dccbf05 jdk7u17-b31 +f7d8d2c003a10c38beac2f57e77d19303c71d6fc jdk7u17-b32 +0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u21-b01 +99ed1a3d29509fee659aabec4810c896b7234d80 jdk7u21-b02 +38d4d23d167c5a623e6d771a15b1fe2ee771ce38 jdk7u21-b03 +acde12ee462d650d34cc148d9d3649f9a9bbca8a jdk7u21-b04 +56b1ad031df90d20c52941c15ceae0e5a90893b8 jdk7u21-b05 +ab51202418c1c96e01a45893a26829a2d9c7b956 jdk7u21-b06 +3ab71deee4a4477d89530ee9e92a36017a6092fa jdk7u21-b07 +f5ef2e76669bc3179f17dac42a8a407fb6bd4d91 jdk7u21-b08 +65977091d010402ccbed41c96748866a1d50f0c4 jdk7u21-b09 +bf2d62ea518d5e4130e442e07705e7a50b821ad9 jdk7u21-b10 +3e0e331bdfb8f3adfd0cc78118e0ac588e73a2b5 jdk7u21-b11 +980fe893d8fd86d8aee14771167b6e0ac75fa208 jdk7u21-b30 +a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b12 +5704dc942da676677a820d16c9a08fc6cad5b3bb jdk7u25-b01 +f9c1fe7cd1194e785807f07005369631b35b28d8 jdk7u25-b02 +fe858d7d6a13829d0ef0a1f762bd0e769cd24fa1 jdk7u25-b03 +1a2822a1d6a40c6e469f4089f39e41f642a87843 jdk7u25-b04 +e927605d1678c5d94adfc44183160d6c4df05b8b jdk7u25-b05 +8dfb4db227e7795120c072781927ba7d35186559 jdk7u25-b06 +ad2732999848b6e57f564d85e18ddebab6315ac2 jdk7u25-b07 +df9def2569705ebe316b50e673f847d2ec47eccf jdk7u25-b08 +5952538d55e624132f97400332a50b71880c874c jdk7u25-b09 +aa00dd983dd0f5b07269d0648a0325e9b3e0d957 jdk7u25-b10 +0fb6d76bcd2e8d54d0a69e1c3d2a85d84b3e17a4 jdk7u25-b11 +5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12 +83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13 +68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14 +503f75b55b34ae22f43b2992b1e56c96e35a60de jdk7u25-b15 +8c35f2344beeb42e85d718e95813e6fdc2f0a605 jdk7u25-b30 +9cebeb3118aca6e356f80a37ac38088ddcc8fb73 jdk7u25-b16 +0d4cfe518086198516e6729fc28b161f66524a66 jdk7u25-b32 7b47e1a26f7cbb8d8d22ea165f2d7fbbbd354c77 jdk7u14-b16 77ac1ef42b2fd47cc87b9800f63efdd4cf2fa05d jdk7u14-b17 d47975f80a24b55410fa2e2c5f50f3405d83fe73 jdk7u14-b18 @@ -273,3 +322,15 @@ 331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19 c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19 5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20 +7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0 +d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21 +d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22 +0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23 +d17acb2ee133811baa8eae3436a8c191fc433da1 jdk7u40-b24 +52bcce690998b4ad91abddae118847f4358c6110 jdk7u40-b25 +cd764ada36b50e2096ba35b4c27ca8f83b3db964 jdk7u40-b26 +7626b3fbc822fd4efd5ba3b5fc18f2fef5749597 jdk7u40-b27 +9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28 +740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29 +09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30 +5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1 diff -r d1c8bb1cbc91 -r 876dd2a45346 .jcheck/conf --- a/.jcheck/conf Wed Apr 10 10:30:06 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r d1c8bb1cbc91 -r 876dd2a45346 src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java --- a/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Wed Apr 10 10:30:06 2013 -0700 +++ b/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Tue Jul 02 02:26:32 2013 +0100 @@ -63,6 +63,7 @@ import com.sun.org.apache.bcel.internal.util.ClassVector; import com.sun.org.apache.bcel.internal.util.ClassQueue; import com.sun.org.apache.bcel.internal.generic.Type; +import com.sun.org.apache.xalan.internal.utils.SecuritySupport; import java.io.*; import java.util.StringTokenizer; @@ -77,6 +78,7 @@ * class file. Those interested in programatically generating classes * should see the ClassGen class. + * @version $Id: JavaClass.java,v 1.4 2007-07-19 04:34:42 ofung Exp $ * @see com.sun.org.apache.bcel.internal.generic.ClassGen * @author M. Dahm */ @@ -451,9 +453,9 @@ String debug = null, sep = null; try { - debug = System.getProperty("JavaClass.debug"); + debug = SecuritySupport.getSystemProperty("JavaClass.debug"); // Get path separator either / or \ usually - sep = System.getProperty("file.separator"); + sep = SecuritySupport.getSystemProperty("file.separator"); } catch (SecurityException e) { // falls through diff -r d1c8bb1cbc91 -r 876dd2a45346 src/com/sun/org/apache/bcel/internal/generic/BasicType.java --- a/src/com/sun/org/apache/bcel/internal/generic/BasicType.java Wed Apr 10 10:30:06 2013 -0700 +++ b/src/com/sun/org/apache/bcel/internal/generic/BasicType.java Tue Jul 02 02:26:32 2013 +0100 @@ -97,8 +97,14 @@ /** @return true if both type objects refer to the same type */ + @Override public boolean equals(Object type) { return (type instanceof BasicType)? ((BasicType)type).type == this.type : false; } + + @Override + public int hashCode() { + return type; + } } diff -r d1c8bb1cbc91 -r 876dd2a45346 src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java --- a/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java Wed Apr 10 10:30:06 2013 -0700 +++ b/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java Tue Jul 02 02:26:32 2013 +0100 @@ -93,6 +93,7 @@ * Dump instruction as byte code to stream out. * @param out Output stream */ + @Override public void dump(DataOutputStream out) throws IOException { out.writeByte(opcode); @@ -153,6 +154,7 @@ * @param verbose long/short format switch * @return mnemonic for instruction */ + @Override public String toString(boolean verbose) { String s = super.toString(verbose); String t = "null"; @@ -184,6 +186,7 @@ * @param wide wide prefix? * @see InstructionList */ + @Override protected void initFromFile(ByteSequence bytes, boolean wide) throws IOException { length = 3; @@ -204,26 +207,41 @@ * Set branch target * @param target branch target */ - public void setTarget(InstructionHandle target) { - notifyTarget(this.target, target, this); + public final void setTarget(InstructionHandle target) { + notifyTargetChanging(this.target, this); this.target = target; + notifyTargetChanged(this.target, this); } /** - * Used by BranchInstruction, LocalVariableGen, CodeExceptionGen + * Used by BranchInstruction, LocalVariableGen, CodeExceptionGen. + * Must be called before the target is actually changed in the + * InstructionTargeter. */ - static final void notifyTarget(InstructionHandle old_ih, InstructionHandle new_ih, + static void notifyTargetChanging(InstructionHandle old_ih, InstructionTargeter t) { - if(old_ih != null) + if(old_ih != null) { old_ih.removeTargeter(t); - if(new_ih != null) + } + } + + /** + * Used by BranchInstruction, LocalVariableGen, CodeExceptionGen. + * Must be called after the target is actually changed in the + * InstructionTargeter. + */ + static void notifyTargetChanged(InstructionHandle new_ih, + InstructionTargeter t) { + if(new_ih != null) { new_ih.addTargeter(t); + } } /** * @param old_ih old target * @param new_ih new target */ + @Override public void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih) { if(target == old_ih) setTarget(new_ih); @@ -234,6 +252,7 @@ /** * @return true, if ih is target of this instruction */ + @Override public boolean containsTarget(InstructionHandle ih) { return (target == ih); } @@ -241,6 +260,7 @@ /** * Inform target that it's not targeted anymore. */ + @Override void dispose() { setTarget(null); index=-1; diff -r d1c8bb1cbc91 -r 876dd2a45346 src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java --- a/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java Wed Apr 10 10:30:06 2013 -0700 +++ b/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java Tue Jul 02 02:26:32 2013 +0100 @@ -58,7 +58,6 @@ * . */ -import com.sun.org.apache.bcel.internal.Constants; import com.sun.org.apache.bcel.internal.classfile.*; /** @@ -118,31 +117,35 @@ /* Set start of handler * @param start_pc Start of handled region (inclusive) */ - public void setStartPC(InstructionHandle start_pc) { - BranchInstruction.notifyTarget(this.start_pc, start_pc, this); + public final void setStartPC(InstructionHandle start_pc) { + BranchInstruction.notifyTargetChanging(this.start_pc, this); this.start_pc = start_pc; + BranchInstruction.notifyTargetChanged(this.start_pc, this); } /* Set end of handler * @param end_pc End of handled region (inclusive) */ - public void setEndPC(InstructionHandle end_pc) { - BranchInstruction.notifyTarget(this.end_pc, end_pc, this); + public final void setEndPC(InstructionHandle end_pc) { + BranchInstruction.notifyTargetChanging(this.end_pc, this); this.end_pc = end_pc; + BranchInstruction.notifyTargetChanged(this.end_pc, this); } /* Set handler code * @param handler_pc Start of handler */ - public void setHandlerPC(InstructionHandle handler_pc) { - BranchInstruction.notifyTarget(this.handler_pc, handler_pc, this); + public final void setHandlerPC(InstructionHandle handler_pc) { + BranchInstruction.notifyTargetChanging(this.handler_pc, this); this.handler_pc = handler_pc; + BranchInstruction.notifyTargetChanged(this.handler_pc, this); } /** * @param old_ih old target, either start or end * @param new_ih new target */ + @Override public void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih) { boolean targeted = false; @@ -169,6 +172,7 @@ /** * @return true, if ih is target of this handler */ + @Override public boolean containsTarget(InstructionHandle ih) { return (start_pc == ih) || (end_pc == ih) || (handler_pc == ih); } @@ -190,10 +194,12 @@ */ public InstructionHandle getHandlerPC() { return handler_pc; } + @Override public String toString() { return "CodeExceptionGen(" + start_pc + ", " + end_pc + ", " + handler_pc + ")"; } + @Override public Object clone() { try { return super.clone(); diff -r d1c8bb1cbc91 -r 876dd2a45346 src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java --- a/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java Wed Apr 10 10:30:06 2013 -0700 +++ b/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java Tue Jul 02 02:26:32 2013 +0100 @@ -58,7 +58,6 @@ * . */ -import com.sun.org.apache.bcel.internal.Constants; import com.sun.org.apache.bcel.internal.classfile.*; /** @@ -88,6 +87,7 @@ /** * @return true, if ih is target of this line number */ + @Override public boolean containsTarget(InstructionHandle ih) { return this.ih == ih; } @@ -96,6 +96,7 @@ * @param old_ih old target * @param new_ih new target */ + @Override public void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih) { if(old_ih != ih) throw new ClassGenException("Not targeting " + old_ih + ", but " + ih + "}"); @@ -113,12 +114,13 @@ return new LineNumber(ih.getPosition(), src_line); } - public void setInstruction(InstructionHandle ih) { - BranchInstruction.notifyTarget(this.ih, ih, this); - + public final void setInstruction(InstructionHandle ih) { + BranchInstruction.notifyTargetChanging(this.ih, this); this.ih = ih; + BranchInstruction.notifyTargetChanged(this.ih, this); } + @Override public Object clone() { try { return super.clone(); diff -r d1c8bb1cbc91 -r 876dd2a45346 src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java --- a/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java Wed Apr 10 10:30:06 2013 -0700 +++ b/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java Tue Jul 02 02:26:32 2013 +0100 @@ -60,6 +60,7 @@ import com.sun.org.apache.bcel.internal.Constants; import com.sun.org.apache.bcel.internal.classfile.*; +import com.sun.org.apache.bcel.internal.util.Objects; /** * This class represents a local variable within a method. It contains its @@ -75,7 +76,7 @@ implements InstructionTargeter, NamedAndTyped, Cloneable, java.io.Serializable { - private int index; + private final int index; private String name; private Type type; private InstructionHandle start, end; @@ -131,30 +132,96 @@ signature_index, index, cp.getConstantPool()); } - public void setIndex(int index) { this.index = index; } - public int getIndex() { return index; } + public int getIndex() { return index; } + @Override public void setName(String name) { this.name = name; } + @Override public String getName() { return name; } + @Override public void setType(Type type) { this.type = type; } + @Override public Type getType() { return type; } public InstructionHandle getStart() { return start; } public InstructionHandle getEnd() { return end; } - public void setStart(InstructionHandle start) { - BranchInstruction.notifyTarget(this.start, start, this); - this.start = start; + /** + * Remove this from any known HashSet in which it might be registered. + */ + void notifyTargetChanging() { + // hashCode depends on 'index', 'start', and 'end'. + // Therefore before changing any of these values we + // need to unregister 'this' from any HashSet where + // this is registered, and then we need to add it + // back... + + // Unregister 'this' from the HashSet held by 'start'. + BranchInstruction.notifyTargetChanging(this.start, this); + if (this.end != this.start) { + // Since hashCode() is going to change we need to unregister + // 'this' both form 'start' and 'end'. + // Unregister 'this' from the HashSet held by 'end'. + BranchInstruction.notifyTargetChanging(this.end, this); + } } - public void setEnd(InstructionHandle end) { - BranchInstruction.notifyTarget(this.end, end, this); + /** + * Add back 'this' in all HashSet in which it should be registered. + **/ + void notifyTargetChanged() { + // hashCode depends on 'index', 'start', and 'end'. + // Therefore before changing any of these values we + // need to unregister 'this' from any HashSet where + // this is registered, and then we need to add it + // back... + + // Register 'this' in the HashSet held by start. + BranchInstruction.notifyTargetChanged(this.start, this); + if (this.end != this.start) { + // Since hashCode() has changed we need to register + // 'this' again in 'end'. + // Add back 'this' in the HashSet held by 'end'. + BranchInstruction.notifyTargetChanged(this.end, this); + } + } + + public final void setStart(InstructionHandle start) { From andrew at icedtea.classpath.org Mon Jul 1 18:29:25 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:29:25 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxws: 44 new changesets Message-ID: changeset 2d9e6c41dbce in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=2d9e6c41dbce author: katleman date: Wed Apr 17 12:13:38 2013 -0700 Added tag jdk7u14-b21 for changeset 97bbac299eb8 changeset 6e74b3e1773c in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6e74b3e1773c author: lana date: Thu Apr 18 14:34:26 2013 -0700 Merge changeset e9bbdf789d2b in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=e9bbdf789d2b author: katleman date: Wed Apr 24 12:21:10 2013 -0700 Added tag jdk7u14-b22 for changeset 6e74b3e1773c changeset adaf9cf486fa in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=adaf9cf486fa author: katleman date: Wed May 01 14:51:23 2013 -0700 Added tag jdk7u40-b23 for changeset e9bbdf789d2b changeset aafab1efbd4c in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=aafab1efbd4c author: katleman date: Wed May 08 16:52:10 2013 -0700 Added tag jdk7u40-b24 for changeset adaf9cf486fa changeset 6581f9739031 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6581f9739031 author: katleman date: Thu May 16 12:14:54 2013 -0700 Added tag jdk7u40-b25 for changeset aafab1efbd4c changeset 46ebac943288 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=46ebac943288 author: katleman date: Wed May 22 16:01:57 2013 -0700 Added tag jdk7u40-b26 for changeset 6581f9739031 changeset 016957700ac9 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=016957700ac9 author: katleman date: Wed May 29 13:24:30 2013 -0700 Added tag jdk7u40-b27 for changeset 46ebac943288 changeset 15a82c84d9f7 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=15a82c84d9f7 author: katleman date: Wed Jun 05 17:46:51 2013 -0700 Added tag jdk7u40-b28 for changeset 016957700ac9 changeset 83c9aef251a3 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=83c9aef251a3 author: katleman date: Wed Jun 12 19:58:27 2013 -0700 Added tag jdk7u40-b29 for changeset 15a82c84d9f7 changeset 8797b25cbeb3 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=8797b25cbeb3 author: katleman date: Tue Mar 12 14:45:20 2013 -0700 Added tag jdk7u25-b01 for changeset 238b59ffddce changeset 9793150ad1aa in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=9793150ad1aa author: katleman date: Tue Mar 19 14:31:38 2013 -0700 Added tag jdk7u25-b02 for changeset 8797b25cbeb3 changeset e1116df2893f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=e1116df2893f author: mkos date: Thu Mar 21 11:08:05 2013 -0400 8009008: Better manage management-api Summary: Preventing management-api methods from invoking reflection on inappropriate methods; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset 4635a58db6b0 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4635a58db6b0 author: coffeys date: Thu Mar 21 22:31:56 2013 +0000 Merge changeset 57d4548795c3 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=57d4548795c3 author: katleman date: Tue Mar 26 14:17:49 2013 -0700 Added tag jdk7u25-b03 for changeset 4635a58db6b0 changeset c9665cf98a6a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c9665cf98a6a author: katleman date: Tue Apr 02 12:12:18 2013 -0700 Added tag jdk7u25-b04 for changeset 57d4548795c3 changeset 4e9063594b06 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4e9063594b06 author: coffeys date: Fri Apr 05 21:34:27 2013 +0100 Merge changeset 7faaa6a5721a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7faaa6a5721a author: katleman date: Mon Mar 04 14:17:23 2013 -0800 Added tag jdk7u17-b32 for changeset 52810f8d2dc0 changeset 83fc7484a44d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=83fc7484a44d author: asaha date: Mon Apr 08 15:57:19 2013 -0700 Merge changeset 35882693ee35 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=35882693ee35 author: asaha date: Mon Apr 08 16:31:33 2013 -0700 Merge changeset c141079e6096 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c141079e6096 author: katleman date: Wed Apr 10 12:43:00 2013 -0700 Added tag jdk7u25-b05 for changeset 35882693ee35 changeset f8e4e84e2dc4 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=f8e4e84e2dc4 author: katleman date: Tue Apr 16 11:28:09 2013 -0700 Added tag jdk7u25-b06 for changeset c141079e6096 changeset 7ff0c910fb96 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7ff0c910fb96 author: katleman date: Thu Apr 18 11:44:26 2013 -0700 Added tag jdk7u25-b07 for changeset f8e4e84e2dc4 changeset 0cd0d4e7331f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=0cd0d4e7331f author: katleman date: Tue Apr 23 16:21:41 2013 -0700 Added tag jdk7u25-b08 for changeset 7ff0c910fb96 changeset 105cdfd4f408 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=105cdfd4f408 author: katleman date: Tue Apr 30 12:25:23 2013 -0700 Added tag jdk7u25-b09 for changeset 0cd0d4e7331f changeset 6de7fec036ab in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6de7fec036ab author: katleman date: Tue May 07 12:56:32 2013 -0700 Added tag jdk7u25-b10 for changeset 105cdfd4f408 changeset 4c5d242efa0d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4c5d242efa0d author: katleman date: Wed May 15 13:31:02 2013 -0700 Added tag jdk7u25-b11 for changeset 6de7fec036ab changeset 066039ba2d8b in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=066039ba2d8b author: asaha date: Wed May 15 14:26:08 2013 -0700 Merge changeset b41e75cf59ca in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=b41e75cf59ca author: asaha date: Wed May 22 11:58:28 2013 -0700 Merge changeset 17d10951b43d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=17d10951b43d author: asaha date: Wed Jun 12 09:00:24 2013 -0700 Merge changeset 2f8f617ecc4f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=2f8f617ecc4f author: asaha date: Thu Jun 13 17:38:06 2013 -0700 Merge changeset cb5f95263f62 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=cb5f95263f62 author: katleman date: Fri Jun 21 11:18:52 2013 -0700 Added tag jdk7u40-b30 for changeset 2f8f617ecc4f changeset 6b4a16522130 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6b4a16522130 author: katleman date: Wed May 22 15:44:59 2013 -0700 Added tag jdk7u25-b12 for changeset 4c5d242efa0d changeset 03073e4e6d3f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=03073e4e6d3f author: katleman date: Fri May 24 16:20:36 2013 -0700 Added tag jdk7u25-b13 for changeset 6b4a16522130 changeset 4a925430bf71 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4a925430bf71 author: katleman date: Tue Jun 04 10:47:45 2013 -0700 Added tag jdk7u25-b14 for changeset 03073e4e6d3f changeset 3ecf7ddefa03 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=3ecf7ddefa03 author: katleman date: Thu Jun 06 11:41:43 2013 -0700 Added tag jdk7u25-b15 for changeset 4a925430bf71 changeset 1826480d02a3 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1826480d02a3 author: katleman date: Tue Jun 11 11:45:23 2013 -0700 Added tag jdk7u25-b30 for changeset 3ecf7ddefa03 changeset 23392fb9b31a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=23392fb9b31a author: katleman date: Wed Jun 12 20:18:28 2013 -0700 Added tag jdk7u25-b16 for changeset 1826480d02a3 changeset 426602096a61 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=426602096a61 author: katleman date: Fri Jun 14 18:10:27 2013 -0700 Added tag jdk7u25-b32 for changeset 23392fb9b31a changeset 90c6d8080296 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=90c6d8080296 author: asaha date: Fri Jun 21 10:53:14 2013 -0700 Merge changeset f500fd46c18b in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=f500fd46c18b author: asaha date: Fri Jun 21 19:01:22 2013 -0700 Merge changeset 7c8da837cd3f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7c8da837cd3f author: andrew date: Mon Jul 01 09:06:59 2013 -0500 Merge jdk7u40-b29 changeset c0e48fdfb695 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c0e48fdfb695 author: andrew date: Mon Jul 01 09:21:49 2013 -0500 Merge jdk7u40-b31 changeset 434046f9185c in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=434046f9185c author: andrew date: Tue Jul 02 02:26:33 2013 +0100 Added tag icedtea-2.4.1 for changeset c0e48fdfb695 diffstat: .hgtags | 61 +++ .jcheck/conf | 2 - src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java | 6 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java | 6 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java | 6 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java | 6 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java | 6 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java | 15 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java | 5 +- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java | 6 +- src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 + src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java | 13 +- src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java | 24 +- src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java | 144 +++++++++ src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java | 46 ++- src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java | 157 ++++++--- src/share/jaxws_classes/javax/xml/soap/MessageFactory.java | 13 +- src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java | 4 +- src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java | 4 +- src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java | 10 +- 20 files changed, 430 insertions(+), 112 deletions(-) diffs (truncated from 1141 to 500 lines): diff -r 97bbac299eb8 -r 434046f9185c .hgtags --- a/.hgtags Wed Apr 10 10:30:09 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:33 2013 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -191,6 +197,7 @@ f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -213,6 +220,8 @@ 45cf55bc1732e8495425dceb385740c6852c0fc8 jdk7u9-b02 66a2e01550a9e84e907a7f7b96e64ee90a4ec0e4 jdk7u9-b04 f3e42e044584b1b21de29eef1b82974d273c77dc jdk7u9-b05 +5e5703e9d18d66d7388057040d3c36e978488dc5 jdk7u9-b31 +987bb65e7b73ad94fb0edecce80d84ee5f8bda6e jdk7u9-b32 dd8e4098681aa581d0398ad7d2d1e2547517c7e5 jdk7u10-b10 1784290b63bcf021334b0accdb3868fdc4ca854e jdk7u10-b11 fde9a060a04d9f9b54f36d645e91ec9a2b40cb81 jdk7u10-b12 @@ -223,8 +232,11 @@ e63292c59ed8481864302cc3f53b498cbdea3470 jdk7u10-b17 6a372e9b4ae978cdaf0b95277db31827794e2c1f jdk7u10-b18 df3e4c85e26c651d098cddd546916a625fd777cd jdk7u10-b30 +29d469fac9106ce7c2f8656ee125e792908aca98 jdk7u10-b31 846f4e01218ffe37b2dbceaf89c222c0aea43180 jdk7u11-b20 1f06394ca182cb392e472ba7b63b28a40725629d jdk7u11-b21 +ac21be8046e06e5460d041b7e4f8140d635887fb jdk7u11-b32 +41abf18b24e9483de775bf938f8d5e673c08209d jdk7u11-b33 ed609545e38c2e499437292c1541e4d1c2b8b992 jdk7u11-b03 4e1dd1192649575e80d893bcab411077b77c9a0c jdk7u11-b04 0e1eefefc2d0c8f0d0cd9e7fb7d78ae026aa8ba0 jdk7u11-b05 @@ -253,6 +265,7 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 @@ -262,10 +275,46 @@ abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02 ed9f270009f2b8606e9e0f58aeedbed36e13963e jdk7u15-b30 +297240e69d8ffcf85fc68b12af6523f7ea16397e jdk7u15-b31 +4fda3b01c75ecd80dba505f6152c21f3e1db5cce jdk7u15-b33 eaf9b299067069826a5acdc88e15402e5a22cb5d jdk7u15-b03 c7ea4220ad61b125bd7c4b7f112dd9ff18e9be33 jdk7u15-b32 b8496d1dc0058341da1790bc2e7d2dbba6d4f90e jdk7u17-b01 defde3ef03605b1660a246ea85d2e810e3fe4f6e jdk7u17-b02 +ae4272d61bc738e2d9265a68aefdc20ec648f22c jdk7u17-b30 +52c4fbd4f58f336dfdf4f680b7e7d7361ec0c3f8 jdk7u17-b31 +52810f8d2dc09ef2b5e6089435f7050c9f7def11 jdk7u17-b32 +e07c518282bad3b315d8064da5fad222a5e3f7ed jdk7u21-b01 +0c1365d2fefb652aea34775749d68774c171ba1a jdk7u21-b02 +017171d6bc217f26e230503dd38bcf4473f339d2 jdk7u21-b03 +68e8364feffcc98b57d59675994dcb12e170ddf0 jdk7u21-b04 +8c43fd5d8cfef4d97bddc4fee7747f23a3c2bffa jdk7u21-b05 +dab51e98ee7d0f3a30b9e18b0d3591b944346868 jdk7u21-b06 +4a9533495068359d574da1060bc5a8fa6946cbc6 jdk7u21-b07 +ab11cef1dfaaec32281dc3d24a366f6691b51b7a jdk7u21-b08 +53c87e8a2ac494b57f6220bd7e25c7380aa7f418 jdk7u21-b09 +29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10 +fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11 +12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30 +d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12 +238b59ffddce3b1d7d19114006ae3be0e72b5eed jdk7u25-b01 +8797b25cbeb3005336483063cef2377849bc2088 jdk7u25-b02 +4635a58db6b028f78a30c972ac47f9c5577bedfd jdk7u25-b03 +57d4548795c39e19099fc0a760d7887f83b1564f jdk7u25-b04 +35882693ee358e3a8b92d632dafa98e05fe72437 jdk7u25-b05 +c141079e609653ec700d2e71f16be4a5859e9a42 jdk7u25-b06 +f8e4e84e2dc4dcdaa360a7e9a4d2e0268558d84d jdk7u25-b07 +7ff0c910fb96680d0570b3d29492e15ffb5b279b jdk7u25-b08 +0cd0d4e7331f7fc9f9ee77f2275113571bcf67cf jdk7u25-b09 +105cdfd4f40837917d0065e3e58052d2854df7da jdk7u25-b10 +6de7fec036abf91ce962c74f11a6266491df3fd8 jdk7u25-b11 +4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12 +6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13 +03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14 +4a925430bf712d36abb78decda16e04da1b1f6bc jdk7u25-b15 +3ecf7ddefa035bc2c99b03b7a58a0dd0e97089c1 jdk7u25-b30 +1826480d02a3b08eccea90ae56bb4f48e3c6cb29 jdk7u25-b16 +23392fb9b31a6f6892864975601df8f14bdb5e05 jdk7u25-b32 a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16 74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17 c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18 @@ -273,3 +322,15 @@ 82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19 dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20 +426b7a73ab43aca754c19dc21497ae90c147f91a icedtea-2.4.0 +97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21 +6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22 +e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23 +adaf9cf486fab1b14c5af9fc6525565760bb9c11 jdk7u40-b24 +aafab1efbd4ced5e05695aa1887813f9f5de9d5c jdk7u40-b25 +6581f9739031120bb7515d3b09fa3501653d11af jdk7u40-b26 +46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27 +016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28 +15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29 +2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30 +c0e48fdfb6959d4024f49e99321d368810d2d7ef icedtea-2.4.1 diff -r 97bbac299eb8 -r 434046f9185c .jcheck/conf --- a/.jcheck/conf Wed Apr 10 10:30:09 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; @@ -139,6 +138,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + checkMethod(method); + Object result; try { result = method.invoke(this, args); @@ -147,7 +148,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundaryStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -81,6 +80,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -89,7 +90,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -26,7 +26,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.CountStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -103,6 +102,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -111,7 +112,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.RangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -125,6 +124,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -133,7 +134,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -26,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.Statistic; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -133,4 +133,13 @@ protected static boolean isValidString(String str) { return (str!=null && str.length()>0); } + + protected void checkMethod(Method method) { + if (method == null || method.getDeclaringClass() == null + || !Statistic.class.isAssignableFrom(method.getDeclaringClass()) + || Modifier.isStatic(method.getModifiers())) { + throw new RuntimeException("Invalid method on invoke"); + } + } + } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -90,6 +90,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -98,7 +100,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, 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 @@ -28,7 +28,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.TimeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Tue Jul 02 02:26:33 2013 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ String pkg = nav.getPackageName(ci.getClazz()); if(!registries.containsKey(pkg)) { // insert the package's object factory - C c = nav.findClass(pkg + ".ObjectFactory",ci.getClazz()); + C c = loadObjectFactory(ci, pkg); if(c!=null) addRegistry(c,(Locatable)p); } @@ -264,6 +264,15 @@ return r; } + private C loadObjectFactory(ClassInfoImpl ci, String pkg) { + try { + return nav.findClass(pkg + ".ObjectFactory", ci.getClazz()); + } catch (SecurityException ignored) { + // treat SecurityException in same way as ClassNotFoundException in this case + return null; + } + } + /** * Checks the uniqueness of the type name. */ diff -r 97bbac299eb8 -r 434046f9185c src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Wed Apr 10 10:30:09 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Tue Jul 02 02:26:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -28,6 +28,7 @@ import java.nio.ByteBuffer; import java.io.File; import java.io.IOException; +import java.util.logging.Level; import java.util.logging.Logger; /** From andrew at icedtea.classpath.org Mon Jul 1 18:29:32 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:29:32 +0000 Subject: /hg/release/icedtea7-forest-2.4/langtools: 51 new changesets Message-ID: changeset 1308ff6d5320 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1308ff6d5320 author: katleman date: Wed Apr 17 12:13:51 2013 -0700 Added tag jdk7u14-b21 for changeset c31648d7a6ac changeset eb1c9eacea1f in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=eb1c9eacea1f author: lana date: Thu Apr 18 14:42:40 2013 -0700 Merge changeset e84535d2c292 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e84535d2c292 author: katleman date: Wed Apr 24 12:21:43 2013 -0700 Added tag jdk7u14-b22 for changeset eb1c9eacea1f changeset d2b78e3b352d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d2b78e3b352d author: katleman date: Wed May 01 14:52:07 2013 -0700 Added tag jdk7u40-b23 for changeset e84535d2c292 changeset e5635f70fe67 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e5635f70fe67 author: katleman date: Wed May 08 16:52:49 2013 -0700 Added tag jdk7u40-b24 for changeset d2b78e3b352d changeset 5bd6f156bc01 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5bd6f156bc01 author: katleman date: Thu May 16 12:16:08 2013 -0700 Added tag jdk7u40-b25 for changeset e5635f70fe67 changeset 12506bba2b67 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=12506bba2b67 author: katleman date: Wed May 22 16:02:05 2013 -0700 Added tag jdk7u40-b26 for changeset 5bd6f156bc01 changeset cde77969c47e in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=cde77969c47e author: katleman date: Wed May 29 13:24:39 2013 -0700 Added tag jdk7u40-b27 for changeset 12506bba2b67 changeset 7e2c650b86bc in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7e2c650b86bc author: mcimadamore date: Wed May 29 14:49:14 2013 +0100 7160084: javac fails to compile an apparently valid class/interface combination Summary: javac generates wrong syntetized trees for nested enum constants Reviewed-by: jjg changeset 9f2eea2fae59 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9f2eea2fae59 author: lana date: Fri May 31 15:44:01 2013 -0700 Merge changeset bfe3575143fd in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=bfe3575143fd author: katleman date: Wed Jun 05 17:47:02 2013 -0700 Added tag jdk7u40-b28 for changeset 9f2eea2fae59 changeset 71dbd330abf9 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=71dbd330abf9 author: katleman date: Wed Jun 12 19:58:37 2013 -0700 Added tag jdk7u40-b29 for changeset bfe3575143fd changeset 028d81ce5e5b in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=028d81ce5e5b author: vromero date: Sun Jun 02 20:35:27 2013 +0100 7179353: try-with-resources fails to compile with generic exception parameters Reviewed-by: mcimadamore changeset 333f1369d9fe in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=333f1369d9fe author: lana date: Thu Jun 06 19:11:21 2013 -0700 Merge changeset d69d7e2d56ee in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d69d7e2d56ee author: lana date: Sun Jun 16 22:19:59 2013 -0700 Merge changeset 1311e3618232 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1311e3618232 author: katleman date: Tue Mar 12 14:45:32 2013 -0700 Added tag jdk7u25-b01 for changeset 884621bb9042 changeset 18678048fc76 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=18678048fc76 author: katleman date: Tue Mar 19 14:32:03 2013 -0700 Added tag jdk7u25-b02 for changeset 1311e3618232 changeset 8dc40e209a12 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8dc40e209a12 author: coffeys date: Thu Mar 21 22:39:38 2013 +0000 Merge changeset d7f974b867c4 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d7f974b867c4 author: katleman date: Tue Mar 26 14:18:11 2013 -0700 Added tag jdk7u25-b03 for changeset 8dc40e209a12 changeset 1a955ffd506d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1a955ffd506d author: katleman date: Tue Apr 02 12:12:31 2013 -0700 Added tag jdk7u25-b04 for changeset d7f974b867c4 changeset 481a0485b4db in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=481a0485b4db author: coffeys date: Fri Apr 05 21:35:21 2013 +0100 Merge changeset 5fd3518bb375 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5fd3518bb375 author: katleman date: Mon Mar 04 14:17:33 2013 -0800 Added tag jdk7u17-b32 for changeset a91bdaf125d8 changeset 98645465330d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=98645465330d author: asaha date: Mon Apr 08 16:01:09 2013 -0700 Merge changeset e8d01d8ee8f5 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e8d01d8ee8f5 author: asaha date: Mon Apr 08 16:35:49 2013 -0700 Merge changeset 25489e38393b in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=25489e38393b author: katleman date: Wed Apr 10 12:43:17 2013 -0700 Added tag jdk7u25-b05 for changeset e8d01d8ee8f5 changeset 11fd425a3ebe in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=11fd425a3ebe author: katleman date: Tue Apr 16 11:28:18 2013 -0700 Added tag jdk7u25-b06 for changeset 25489e38393b changeset edaa697ef947 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=edaa697ef947 author: katleman date: Thu Apr 18 11:44:35 2013 -0700 Added tag jdk7u25-b07 for changeset 11fd425a3ebe changeset 4dbd21d15a39 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4dbd21d15a39 author: katleman date: Tue Apr 23 16:23:22 2013 -0700 Added tag jdk7u25-b08 for changeset edaa697ef947 changeset 17ee569d0c01 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=17ee569d0c01 author: bpatel date: Fri Apr 26 15:24:12 2013 -0700 8012375: Improve Javadoc framing Reviewed-by: mduigou, jlaskey changeset 41c1b02cd6a8 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=41c1b02cd6a8 author: katleman date: Tue Apr 30 12:25:50 2013 -0700 Added tag jdk7u25-b09 for changeset 17ee569d0c01 changeset 0da9ef0d9fc5 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0da9ef0d9fc5 author: katleman date: Tue May 07 12:57:11 2013 -0700 Added tag jdk7u25-b10 for changeset 41c1b02cd6a8 changeset 28358b2489b2 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=28358b2489b2 author: katleman date: Wed May 15 13:31:33 2013 -0700 Added tag jdk7u25-b11 for changeset 0da9ef0d9fc5 changeset 51f9793a6495 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=51f9793a6495 author: asaha date: Wed May 15 14:28:12 2013 -0700 Merge changeset ab04f1711593 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ab04f1711593 author: asaha date: Wed May 22 11:59:03 2013 -0700 Merge changeset 581244edec38 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=581244edec38 author: asaha date: Wed Jun 12 09:01:14 2013 -0700 Merge changeset 8bf76605342a in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8bf76605342a author: asaha date: Thu Jun 13 17:38:21 2013 -0700 Merge changeset 0586afeb2caa in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0586afeb2caa author: asaha date: Mon Jun 17 22:29:34 2013 -0700 Merge changeset 849b17bc6e9a in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=849b17bc6e9a author: katleman date: Fri Jun 21 11:19:10 2013 -0700 Added tag jdk7u40-b30 for changeset 0586afeb2caa changeset 5ed8c4534800 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5ed8c4534800 author: katleman date: Wed May 22 15:45:12 2013 -0700 Added tag jdk7u25-b12 for changeset 28358b2489b2 changeset c6342ec6a12f in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c6342ec6a12f author: katleman date: Fri May 24 16:20:45 2013 -0700 Added tag jdk7u25-b13 for changeset 5ed8c4534800 changeset e1f27e4e180d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e1f27e4e180d author: katleman date: Tue Jun 04 10:47:59 2013 -0700 Added tag jdk7u25-b14 for changeset c6342ec6a12f changeset 3b8323e24a63 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=3b8323e24a63 author: bpatel date: Wed Jun 05 14:31:54 2013 -0700 8015998: Additional improvement in Javadoc framing Reviewed-by: jjg changeset 5d95c1e7c091 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5d95c1e7c091 author: katleman date: Thu Jun 06 11:41:55 2013 -0700 Added tag jdk7u25-b15 for changeset 3b8323e24a63 changeset 7294a7be7dbd in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7294a7be7dbd author: katleman date: Tue Jun 11 11:45:38 2013 -0700 Added tag jdk7u25-b30 for changeset 5d95c1e7c091 changeset aaf5e30d5549 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=aaf5e30d5549 author: katleman date: Wed Jun 12 20:18:38 2013 -0700 Added tag jdk7u25-b16 for changeset 7294a7be7dbd changeset daf200613bbb in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=daf200613bbb author: katleman date: Fri Jun 14 18:10:38 2013 -0700 Added tag jdk7u25-b32 for changeset aaf5e30d5549 changeset 801dc43b8a8f in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=801dc43b8a8f author: asaha date: Fri Jun 21 10:56:05 2013 -0700 Merge changeset 9c343668b0a9 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9c343668b0a9 author: asaha date: Fri Jun 21 19:03:21 2013 -0700 Merge changeset 046611513433 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=046611513433 author: andrew date: Mon Jul 01 09:06:25 2013 -0500 Merge jdk7u40-b29 changeset 91c95fd8eea8 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=91c95fd8eea8 author: andrew date: Mon Jul 01 09:22:04 2013 -0500 Merge jdk7u40-b31 changeset 6f0543ead290 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6f0543ead290 author: andrew date: Tue Jul 02 02:26:35 2013 +0100 Added tag icedtea-2.4.1 for changeset 91c95fd8eea8 diffstat: .hgtags | 71 ++++++++++ .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 38 +++++- src/share/classes/com/sun/tools/javac/comp/Attr.java | 11 +- src/share/classes/com/sun/tools/javac/comp/Flow.java | 10 +- src/share/classes/com/sun/tools/javac/comp/MemberEnter.java | 6 +- src/share/classes/com/sun/tools/javac/tree/TreeInfo.java | 9 + test/com/sun/javadoc/testJavascript/TestJavascript.java | 42 +++++- test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java | 42 +++++ test/tools/javac/enum/7160084/T7160084a.java | 60 ++++++++ test/tools/javac/enum/7160084/T7160084b.java | 68 +++++++++ 14 files changed, 352 insertions(+), 16 deletions(-) diffs (truncated from 612 to 500 lines): diff -r c31648d7a6ac -r 6f0543ead290 .hgtags --- a/.hgtags Wed Apr 10 10:30:31 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:35 2013 +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 @@ -213,6 +220,8 @@ 0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02 9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04 1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05 +5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31 +acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32 a35ca56cf8d09b92511f0cd71208a2ea05c8a338 jdk7u8-b01 41bc8da868e58f7182d26b2ab9b6f8a4b09894ed jdk7u8-b02 df5cbe436d3460af4667d416877e03400de54524 jdk7u8-b03 @@ -222,9 +231,22 @@ cd18b83736af19afbccce4b7351c5a3c857356ac jdk7u10-b07 3204f355a32d83ffceeed1c0c8a52a2d834ae29f jdk7u10-b08 0b90d3480dbfc16aa3901df249b3cb21bcfa0b32 jdk7u10-b09 +8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10 +01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11 +1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12 +14735b3d8bdffc7892f1db04b6262bdaad2eb9d7 jdk7u10-b13 +f555fcdbd07156ee11b25fb4ac106065bbf496b4 jdk7u10-b14 +dfcd16ac3fbcabed815b8ef4e792716cce0bce21 jdk7u10-b15 +eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u10-b16 +7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17 +4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18 +1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30 87683444edad33cc9f4bbcd9008d98ba34350ded jdk7u12-b01 +db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31 b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20 aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21 +92de02b43596ea1d01c87d56dbc9acc0960a90c3 jdk7u11-b32 +309b5ccd0501d48fa7eed29e45197b4101de4683 jdk7u11-b33 eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03 e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04 17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05 @@ -243,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 @@ -252,10 +275,46 @@ 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30 +2c82a733594aef14f7a91a910c6b7b20e6220078 jdk7u15-b31 +5639dfc55f771823fab02438e5c89c6b18f57d07 jdk7u15-b33 c160d7d1616d099afad0986b7d06aee2d9405e57 jdk7u15-b03 a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32 edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01 2782a1c60faf7585dee0af0ef585aeed3288e521 jdk7u17-b02 +0abc443a68676c7231b274a324d27204c735acac jdk7u17-b30 +1a9b32d36ff86136549f20156cf3e821295228a0 jdk7u17-b31 +a91bdaf125d89b8b2c6ff86c8055aab3b7d2546c jdk7u17-b32 +8a12629ea21378f96666628f472cd9a6936a4933 jdk7u21-b01 +82103a284427a2512fe884d8f232f1a83d46beb6 jdk7u21-b02 +9adfe6a84c3884d5c24f6655e89546a6e0a80129 jdk7u21-b03 +71704143744ee46f105bf1bf3e4b7aecaf9c1003 jdk7u21-b04 +0970c229028499d5348d77712edf42d712538441 jdk7u21-b05 +5e0127eb56c3f70bdf67a5b2c57cf218838371ae jdk7u21-b06 +08034557136e484b3a7c4d0ec9b21e57ea9cd30b jdk7u21-b07 +f3c75c441d5623186e43de0b5a645e12fc360c29 jdk7u21-b08 +b6c7a18b668b85bdc41914b2b354c1928deb659e jdk7u21-b09 +de06078efe709392d7faf44803d54b74599f6bda jdk7u21-b10 +e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11 +ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30 +a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12 +884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01 +1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02 +8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03 +d7f974b867c4cf771ab749871c2ff4d3f869f13f jdk7u25-b04 +e8d01d8ee8f547f97d8670157ddf5a798459b85a jdk7u25-b05 +25489e38393b7c70fb826069d50860fbc409d11d jdk7u25-b06 +11fd425a3ebee6fa02bd684d356300b3619e5e7a jdk7u25-b07 +edaa697ef947de30b940bef0a546590d09c99cd3 jdk7u25-b08 +17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09 +41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10 +0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11 +28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12 +5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13 +c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14 +3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15 +5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30 +7294a7be7dbde9c3789f9fa881baa6b8fcd51674 jdk7u25-b16 +aaf5e30d5549ec5200b991806e62db3e866181a7 jdk7u25-b32 cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16 aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17 577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18 @@ -263,3 +322,15 @@ 5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19 e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19 86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20 +cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0 +c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21 +eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22 +e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23 +d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24 +e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25 +5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26 +12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27 +9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28 +bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29 +0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30 +91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1 diff -r c31648d7a6ac -r 6f0543ead290 .jcheck/conf --- a/.jcheck/conf Wed Apr 10 10:30:31 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r c31648d7a6ac -r 6f0543ead290 make/Makefile --- a/make/Makefile Wed Apr 10 10:30:31 2013 -0700 +++ b/make/Makefile Tue Jul 02 02:26:35 2013 +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 c31648d7a6ac -r 6f0543ead290 make/build.properties --- a/make/build.properties Wed Apr 10 10:30:31 2013 -0700 +++ b/make/build.properties Tue Jul 02 02:26:35 2013 +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 task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r c31648d7a6ac -r 6f0543ead290 make/build.xml --- a/make/build.xml Wed Apr 10 10:30:31 2013 -0700 +++ b/make/build.xml Tue Jul 02 02:26:35 2013 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r c31648d7a6ac -r 6f0543ead290 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 Wed Apr 10 10:30:31 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Tue Jul 02 02:26:35 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -312,8 +312,42 @@ String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " targetPage = targetPage.substring(1);" + DocletConstants.NL + - " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL + " targetPage = \"undefined\";" + DocletConstants.NL + + " function validURL(url) {" + DocletConstants.NL + + " var pos = url.indexOf(\".html\");" + DocletConstants.NL + + " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " var allowNumber = false;" + DocletConstants.NL + + " var allowSep = false;" + DocletConstants.NL + + " var seenDot = false;" + DocletConstants.NL + + " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL + + " var ch = url.charAt(i);" + DocletConstants.NL + + " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL + + " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL + + " ch == '$' ||" + DocletConstants.NL + + " ch == '_') {" + DocletConstants.NL + + " allowNumber = true;" + DocletConstants.NL + + " allowSep = true;" + DocletConstants.NL + + " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + + " || ch == '-') {" + DocletConstants.NL + + " if (!allowNumber)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL + + " if (!allowSep)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " allowNumber = false;" + DocletConstants.NL + + " allowSep = false;" + DocletConstants.NL + + " if (ch == '.')" + DocletConstants.NL + + " seenDot = true;" + DocletConstants.NL + + " if (ch == '/' && seenDot)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else {" + DocletConstants.NL + + " return false;"+ DocletConstants.NL + + " }" + DocletConstants.NL + + " }" + DocletConstants.NL + + " return true;" + DocletConstants.NL + + " }" + DocletConstants.NL + " function loadFrames() {" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " top.classFrame.location = top.targetPage;" + DocletConstants.NL + diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/comp/Attr.java --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed Apr 10 10:30:31 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java Tue Jul 02 02:26:35 2013 +0100 @@ -674,6 +674,13 @@ return t; } + Type attribIdentAsEnumType(Env env, JCIdent id) { + Assert.check((env.enclClass.sym.flags() & ENUM) != 0); + id.type = env.info.scope.owner.type; + id.sym = env.info.scope.owner; + return id.type; + } + public void visitClassDef(JCClassDecl tree) { // Local classes have not been entered yet, so we need to do it now: if ((env.info.scope.owner.kind & (VAR | MTH)) != 0) @@ -1620,7 +1627,9 @@ // Attribute clazz expression and store // symbol + type back into the attributed tree. - Type clazztype = attribType(clazz, env); + Type clazztype = TreeInfo.isEnumInit(env.tree) ? + attribIdentAsEnumType(env, (JCIdent)clazz) : + attribType(clazz, env); Pair mapping = getSyntheticScopeMapping(clazztype); clazztype = chk.checkDiamond(tree, clazztype); chk.validate(clazz, localEnv); diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/comp/Flow.java --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed Apr 10 10:30:31 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Jul 02 02:26:35 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, 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 @@ -340,9 +340,10 @@ */ void markThrown(JCTree tree, Type exc) { if (!chk.isUnchecked(tree.pos(), exc)) { - if (!chk.isHandled(exc, caught)) + if (!chk.isHandled(exc, caught)) { pendingExits.append(new PendingExit(tree, exc)); - thrown = chk.incl(exc, thrown); + } + thrown = chk.incl(exc, thrown); } } @@ -1039,8 +1040,9 @@ names.close, List.nil(), List.nil()); + Type mt = types.memberType(resource.type, closeMethod); if (closeMethod.kind == MTH) { - for (Type t : ((MethodSymbol)closeMethod).getThrownTypes()) { + for (Type t : mt.getThrownTypes()) { markThrown(resource, t); } } diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/comp/MemberEnter.java --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Wed Apr 10 10:30:31 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue Jul 02 02:26:35 2013 +0100 @@ -625,7 +625,11 @@ DeferredLintHandler prevLintHandler = chk.setDeferredLintHandler(deferredLintHandler.setPos(tree.pos())); try { - attr.attribType(tree.vartype, localEnv); + if (TreeInfo.isEnumInit(tree)) { + attr.attribIdentAsEnumType(localEnv, (JCIdent)tree.vartype); + } else { + attr.attribType(tree.vartype, localEnv); + } } finally { chk.setDeferredLintHandler(prevLintHandler); } diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java --- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Wed Apr 10 10:30:31 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Jul 02 02:26:35 2013 +0100 @@ -217,6 +217,15 @@ } } + public static boolean isEnumInit(JCTree tree) { + switch (tree.getTag()) { + case JCTree.VARDEF: + return (((JCVariableDecl)tree).mods.flags & ENUM) != 0; + default: + return false; + } + } + /** Return true if a tree represents the null literal. */ public static boolean isNull(JCTree tree) { if (tree.getTag() != JCTree.LITERAL) diff -r c31648d7a6ac -r 6f0543ead290 test/com/sun/javadoc/testJavascript/TestJavascript.java --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Wed Apr 10 10:30:31 2013 -0700 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Jul 02 02:26:35 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, 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 4665566 4855876 7025314 + * @bug 4665566 4855876 7025314 8012375 8015998 * @summary Verify that the output has the right javascript. * @author jamieh * @library ../lib/ @@ -35,7 +35,7 @@ public class TestJavascript extends JavadocTester { //Test information. - private static final String BUG_ID = "4665566-4855876"; + private static final String BUG_ID = "4665566-4855876-8012375"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -53,8 +53,42 @@ " targetPage = \"\" + window.location.search;" + NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + " targetPage = targetPage.substring(1);" + NL + - " if (targetPage.indexOf(\":\") != -1)" + NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL + " targetPage = \"undefined\";" + NL + + " function validURL(url) {" + NL + + " var pos = url.indexOf(\".html\");" + NL + + " if (pos == -1 || pos != url.length - 5)" + NL + + " return false;" + NL + + " var allowNumber = false;" + NL + + " var allowSep = false;" + NL + + " var seenDot = false;" + NL + + " for (var i = 0; i < url.length - 5; i++) {" + NL + + " var ch = url.charAt(i);" + NL + + " if ('a' <= ch && ch <= 'z' ||" + NL + + " 'A' <= ch && ch <= 'Z' ||" + NL + + " ch == '$' ||" + NL + + " ch == '_') {" + NL + + " allowNumber = true;" + NL + + " allowSep = true;" + NL + + " } else if ('0' <= ch && ch <= '9'" + NL + + " || ch == '-') {" + NL + + " if (!allowNumber)" + NL + + " return false;" + NL + + " } else if (ch == '/' || ch == '.') {" + NL + + " if (!allowSep)" + NL + + " return false;" + NL + + " allowNumber = false;" + NL + + " allowSep = false;" + NL + + " if (ch == '.')" + NL + + " seenDot = true;" + NL + + " if (ch == '/' && seenDot)" + NL + + " return false;" + NL + + " } else {" + NL + + " return false;" + NL + + " }" + NL + + " }" + NL + + " return true;" + NL + + " }" + NL + " function loadFrames() {" + NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + " top.classFrame.location = top.targetPage;" + NL + diff -r c31648d7a6ac -r 6f0543ead290 test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java Tue Jul 02 02:26:35 2013 +0100 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2013, 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. + * + * 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. + */ + +/* + * @test + * @bug 7179353 + * @summary try-with-resources fails to compile with generic exception parameters + * @compile GenericsAndTWRCompileErrorTest.java + */ + +public class GenericsAndTWRCompileErrorTest { + + public static class Resource implements AutoCloseable { + public void close() throws E { } + } + + public void test() throws E { + try (Resource r = new Resource()) { + + } + } +} diff -r c31648d7a6ac -r 6f0543ead290 test/tools/javac/enum/7160084/T7160084a.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/enum/7160084/T7160084a.java Tue Jul 02 02:26:35 2013 +0100 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2012, 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. + * + * 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 From andrew at icedtea.classpath.org Mon Jul 1 18:29:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:29:52 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: 184 new changesets Message-ID: changeset 00144225e0dd in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=00144225e0dd author: katleman date: Wed Apr 17 12:13:28 2013 -0700 Added tag jdk7u14-b21 for changeset 3e88170d8be2 changeset 6e999fc47427 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6e999fc47427 author: lana date: Thu Apr 18 14:32:18 2013 -0700 Merge changeset 70a60475632f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=70a60475632f author: amurillo date: Thu Apr 11 22:52:40 2013 -0700 8011947: new hotspot build - hs24-b41 Reviewed-by: jcoomes changeset 2eae59f5418c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2eae59f5418c author: egahlin date: Tue Apr 09 05:08:12 2013 +0200 8008391: Incorrect metadata for event based tracing Reviewed-by: stefank, sla changeset 1ed2314952c8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1ed2314952c8 author: zgu date: Fri Apr 12 11:26:55 2013 -0400 8011161: NMT: Memory leak when encountering out of memory error while initializing memory snapshot Summary: Fix memory leaks when NMT fails to initialize snapshot and worker thread Reviewed-by: dcubed, ccheung, rdurbin changeset 0c00fe85302b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0c00fe85302b author: zgu date: Sun Apr 14 14:16:12 2013 -0400 Merge changeset ad278ee734e4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ad278ee734e4 author: kevinw date: Sun Apr 14 22:26:06 2013 +0100 8010514: G1: Concurrent mode failure tracing event Reviewed-by: jwilhelm, johnc changeset 24b1584443e9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=24b1584443e9 author: zgu date: Sun Apr 14 18:08:22 2013 -0400 8010151: nsk/regression/b6653214 fails "assert(snapshot != NULL) failed: Worker should not be started" Summary: Fixed a racing condition when shutting down NMT while worker thread is being started, also fixed a few mis-declared volatile pointers. Reviewed-by: dholmes, dlong changeset 87f5d2977493 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=87f5d2977493 author: zgu date: Sun Apr 14 19:57:37 2013 -0400 Merge changeset 3cb217881b6c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3cb217881b6c author: egahlin date: Tue Apr 02 19:17:14 2013 +0200 8007150: Event based tracing is missing truncated field in stack trace content type Reviewed-by: stefank, sla, mgronlun changeset 7baf47cf4bed in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7baf47cf4bed author: ehelin date: Mon Apr 15 08:14:12 2013 +0200 8012102: CollectedHeap::ensure_parsability is not always called during heap inspection Reviewed-by: mgerdin, stefank changeset 17ff5d08f85b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=17ff5d08f85b author: ehelin date: Mon Apr 15 08:17:40 2013 -0700 Merge changeset f438a35cc903 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f438a35cc903 author: rbackman date: Mon Apr 15 11:38:46 2013 +0200 8012210: Make TracingTime available when INCLUDE_TRACE = 0 Reviewed-by: dholmes, sla changeset 78538cd4794c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=78538cd4794c author: jwilhelm date: Wed Apr 17 13:16:25 2013 +0200 8008916: G1: Evacuation failed tracing event Summary: Evacuation failed event for G1 Reviewed-by: johnc, brutisso, ehelin changeset be693a09e7f5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=be693a09e7f5 author: sla date: Fri Feb 08 12:48:24 2013 +0100 8006423: SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67) Summary: Do not rely on mach thread port names to identify threads from SA Reviewed-by: dholmes, minqi, rbackman changeset 4135583e60cc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4135583e60cc author: nloodin date: Thu Apr 04 13:49:12 2013 +0200 8012212: Want to link against kstat on solaris x86 as well as sparc Reviewed-by: brutisso, mgronlun changeset 9dccaeb8e966 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9dccaeb8e966 author: nloodin date: Thu Apr 18 15:18:50 2013 +0200 Merge changeset 04f81958a8e2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=04f81958a8e2 author: mgronlun date: Thu Apr 18 17:46:34 2013 +0200 8012182: Add information about class loading and unloading to event based tracing framework Reviewed-by: coleenp, dholmes, sspitsyn Contributed-by: calvin.cheung at oracle.com changeset 0e9dba751d8b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0e9dba751d8b author: mgronlun date: Thu Apr 18 18:06:21 2013 +0200 Merge changeset d90c913b8103 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d90c913b8103 author: amurillo date: Thu Apr 18 13:42:00 2013 -0700 Merge changeset c11b058d4170 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c11b058d4170 author: amurillo date: Thu Apr 18 13:42:01 2013 -0700 Added tag hs24-b41 for changeset d90c913b8103 changeset aa9a5e33e823 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aa9a5e33e823 author: amurillo date: Tue Apr 23 13:58:02 2013 -0700 Merge changeset e0f1aa072185 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e0f1aa072185 author: katleman date: Wed Apr 24 12:20:45 2013 -0700 Added tag jdk7u14-b22 for changeset aa9a5e33e823 changeset edd1619a3ae4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=edd1619a3ae4 author: amurillo date: Thu Apr 18 13:50:58 2013 -0700 8012558: new hotspot build - hs24-b42 Reviewed-by: jcoomes changeset 23701768db61 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=23701768db61 author: brutisso date: Thu Apr 18 06:50:35 2013 +0200 8012455: Missing time and date stamps for PrintGCApplicationConcurrentTime and PrintGCApplicationStoppedTime Summary: also reviewed by: kirk at kodewerk.com, brandon at twitter.com Reviewed-by: tschatzl, stefank, johnc changeset 7cfae19d0f1c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7cfae19d0f1c author: brutisso date: Fri Apr 19 07:25:33 2013 +0200 Merge changeset d81b052ce793 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d81b052ce793 author: mgronlun date: Mon Apr 22 10:49:22 2013 +0200 8012714: Assign the unique traceid directly to the Klass upon creation Reviewed-by: sla, dholmes changeset d0459a316814 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d0459a316814 author: rbackman date: Wed Apr 10 09:58:10 2013 +0200 8011882: Replace spin loops as back off when suspending Reviewed-by: dholmes, sla changeset 25e2d699bc5a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=25e2d699bc5a author: jwilhelm date: Tue Apr 23 16:58:12 2013 +0200 8010090: GC ID has the wrong type Summary: Change the GC ID from ULONG to UINT. Also reviewed by yunda.mly at taobao.com Reviewed-by: neliasso, stefank changeset 48bd376971b2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=48bd376971b2 author: ctornqvi date: Tue Apr 23 17:39:33 2013 +0200 8008454: test/runtime/NMT/PrintNMTStatistics is broken Summary: Added @run tag so that it actually runs the test, also fixed broken command line and incorrect parsing. Also reviewed by gerard.ziemski at oracle.com Reviewed-by: mgerdin, zgu changeset 4f296b8b3147 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4f296b8b3147 author: ctornqvi date: Tue Apr 23 19:40:10 2013 +0200 Merge changeset f25c212012a1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f25c212012a1 author: ctornqvi date: Tue Apr 23 23:37:07 2013 +0200 8009125: Add NMT tests for Virtual Memory operations Summary: Tests added for Reserve/Commit/Uncommit/Unreserve operations Reviewed-by: zgu, mgerdin changeset 948a0f918ef4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=948a0f918ef4 author: brutisso date: Wed Jan 16 12:46:27 2013 +0100 8006242: G1: WorkerDataArray::verify() too strict for double calculations Summary: Also reviewed by vitalyd at gmail.com. Reviewed-by: johnc, mgerdin changeset f33ff5092994 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f33ff5092994 author: johnc date: Fri Feb 01 13:17:04 2013 -0800 8006894: G1: Number of marking threads missing from PrintFlagsFinal output Summary: Set ConcGCThreads to the calculated number of marking threads. Reviewed-by: jmasa, ysr changeset 5e7504597502 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5e7504597502 author: johnc date: Fri Feb 22 11:01:01 2013 -0800 8007221: G1: concurrent phase durations do not state the time units ("secs") Summary: Add timer units to concurrent marking phases where the units were missing. Reviewed-by: jmasa, ysr changeset 28d063f12798 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=28d063f12798 author: johnc date: Tue Apr 23 17:19:47 2013 -0700 Merge changeset d59ed8d47aed in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d59ed8d47aed author: kvn date: Wed Apr 03 11:12:57 2013 -0700 8011102: Clear AVX registers after return from JNI call Summary: Execute vzeroupper instruction after JNI call and on exits in jit compiled code which use 256bit vectors. Reviewed-by: roland changeset 73ec23a2d1a6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=73ec23a2d1a6 author: rasbold date: Wed Apr 03 15:00:55 2013 -0700 8010437: guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset Summary: Fix shorten_branches() to accurately count an initial nop that may be inserted in a block that starts with a safepoint. Reviewed-by: kvn changeset ab200d01a0db in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ab200d01a0db author: neliasso date: Thu Apr 04 09:18:47 2013 +0200 8006008: Memory leak in hotspot/src/share/vm/adlc/archDesc.cpp Reviewed-by: roland, kvn Contributed-by: niclas.adlertz at oracle.com changeset dba7425a1e21 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dba7425a1e21 author: neliasso date: Thu Apr 04 09:30:06 2013 +0200 8006014: Memory leak in hotspot/src/share/vm/adlc/dfa.cpp Reviewed-by: kvn, roland Contributed-by: niclas.adlertz at oracle.com changeset 9bd654867fe1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9bd654867fe1 author: neliasso date: Fri Apr 05 11:09:43 2013 +0200 8006016: Memory leak at hotspot/src/share/vm/adlc/output_c.cpp Reviewed-by: kvn, roland Contributed-by: niclas.adlertz at oracle.com changeset 719fd17b822c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=719fd17b822c author: bharadwaj date: Mon Apr 08 07:40:08 2013 -0700 8010913: compiler/6863420 often exceeds timeout Summary: add longer timeout for jtreg, add internal timeout thread to prevent spurious timeouts Reviewed-by: twisti, kvn Contributed-by: drchase changeset c0c1cf79ebd1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c0c1cf79ebd1 author: kmo date: Thu Apr 11 07:12:09 2013 -0700 8011952: Missing ResourceMarks in TraceMethodHandles Summary: add missing ResourceMark under TraceMethodHandles in LinkResolver Reviewed-by: dholmes changeset 9761ff0af648 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9761ff0af648 author: drchase date: Fri Apr 12 19:14:47 2013 -0700 6443505: Ideal() function for CmpLTMask Summary: Repair wrong code generation, added new matching rule Reviewed-by: kvn, twisti changeset d22109dfc23e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d22109dfc23e author: roland date: Tue Apr 16 17:06:39 2013 +0200 8011901: Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas Summary: instruct xaddL_no_res shouldn't allow 64 bit constants. Reviewed-by: kvn changeset 8cce6cd64aac in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8cce6cd64aac author: hseigel date: Wed Apr 24 13:32:01 2013 -0400 8009928: PSR:PERF Increase default string table size Summary: Increase default string table size to 60013 for 64-bit platforms. Reviewed-by: coleenp, dholmes changeset ab40cf42161d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ab40cf42161d author: hseigel date: Wed Apr 24 13:59:54 2013 -0400 Merge changeset 482ff4e18ca3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=482ff4e18ca3 author: amurillo date: Thu Apr 25 08:49:05 2013 -0700 Merge changeset 34a398422e59 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=34a398422e59 author: amurillo date: Thu Apr 25 08:49:06 2013 -0700 Added tag hs24-b42 for changeset 482ff4e18ca3 changeset 0599c2274c79 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0599c2274c79 author: katleman date: Wed May 01 14:50:51 2013 -0700 Added tag jdk7u40-b23 for changeset 34a398422e59 changeset 2cf0bc894c52 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2cf0bc894c52 author: amurillo date: Tue Apr 23 13:52:55 2013 -0700 Merge changeset 1ff1748e332f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1ff1748e332f author: lana date: Wed Apr 24 18:27:17 2013 -0700 Merge changeset 4048835037c9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4048835037c9 author: amurillo date: Tue Apr 30 14:44:47 2013 -0700 Merge changeset b2290f206d67 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b2290f206d67 author: lana date: Mon May 06 09:55:35 2013 -0700 Merge changeset 5a8de8ed7e83 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5a8de8ed7e83 author: amurillo date: Thu Apr 25 08:59:18 2013 -0700 8013226: new hotspot build - hs24-b43 Reviewed-by: jcoomes changeset c4b5ad1ab409 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c4b5ad1ab409 author: johnc date: Mon Apr 22 16:29:47 2013 -0700 8007036: G1: Too many old regions added to last mixed GC Summary: Stop adding old regions to collection set when the remaining reclaimable bytes reaches, or goes below, G1HeapWastePercent. Changes were also reviewed by Vitaly Davidovich . Reviewed-by: brutisso, tschatzl, jmasa changeset dc53b30aa2e1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dc53b30aa2e1 author: johnc date: Thu Apr 25 20:36:50 2013 -0700 Merge changeset 753f6a1ba497 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=753f6a1ba497 author: tamao date: Wed Mar 20 12:27:03 2013 -0700 7196080: assert(max_heap >= InitialHeapSize) in arguments.cpp Summary: Remove the related assertions becasue they do not hold here. Reviewed-by: jmasa, tschatzl Contributed-by: tamao changeset 18687839e9e8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=18687839e9e8 author: drchase date: Fri Apr 26 12:00:00 2013 -0700 8010770: Zero: back port of 8000780 to HS24 broke JSR 292 Reviewed-by: kvn, twisti changeset 2a0c45364baa in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2a0c45364baa author: twisti date: Fri Apr 26 17:13:16 2013 -0700 Merge changeset 12494ffb721b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=12494ffb721b author: rbackman date: Wed Apr 17 11:29:20 2013 +0200 8013117: Thread-local trace_buffer has wrong type and name Reviewed-by: dholmes, sla changeset 2efcfec8a6dc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2efcfec8a6dc author: amurillo date: Thu May 02 09:56:32 2013 -0700 Merge changeset 944e87027dc7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=944e87027dc7 author: amurillo date: Thu May 02 09:56:33 2013 -0700 Added tag hs24-b43 for changeset 2efcfec8a6dc changeset a36051465050 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a36051465050 author: jcoomes date: Tue May 07 22:16:13 2013 -0700 Merge changeset e085458ffacf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e085458ffacf author: katleman date: Wed May 08 16:51:54 2013 -0700 Added tag jdk7u40-b24 for changeset a36051465050 changeset 32bd17a37dbb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=32bd17a37dbb author: amurillo date: Thu May 02 10:10:26 2013 -0700 8013799: new hotspot build - hs24-b44 Reviewed-by: jcoomes changeset 839bc4071e51 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=839bc4071e51 author: tamao date: Thu May 02 10:11:16 2013 -0700 6761744: Hotspot crashes if process size limit is exceeded Summary: Check overflow of total_reserved: object heap + perm gen (+ miscellaneous data structures) before reserving heap space, and VM aborts with appropriate message if overflowed. Reviewed-by: brutisso, johnc, tschatzl Contributed-by: tamao changeset 0285b77cb121 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0285b77cb121 author: johnc date: Thu May 02 19:48:57 2013 -0700 Merge changeset d6242467ff21 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d6242467ff21 author: johnc date: Mon May 06 10:29:38 2013 -0700 8005032: G1: Cleanup serial reference processing closures in concurrent marking Summary: Reuse the parallel reference processing oop closures during serial reference processing. Reviewed-by: brutisso, tschatzl changeset 627cf9e9ea31 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=627cf9e9ea31 author: johnc date: Mon May 06 10:29:49 2013 -0700 8009536: G1: Apache Lucene hang during reference processing Summary: In CMTask::do_marking_step(), Skip offering termination and entering the first and second synchronization barriers if called from a serial context, i.e. the VM thread. Reviewed-by: brutisso, tschatzl changeset 0ba44b7d8f02 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0ba44b7d8f02 author: ehelin date: Tue May 07 11:58:01 2013 +0200 8011425: NPE in TestObjectCountAfterGCEvent.java on Linux32 Reviewed-by: stefank, brutisso changeset 0682fce0ecfb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0682fce0ecfb author: zgu date: Mon May 06 15:25:49 2013 -0400 8011218: Kitchensink hanged, likely NMT is to blame Summary: Made NMT query safepoint aware. Reviewed-by: dholmes, coleenp changeset 7641cf42feb0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7641cf42feb0 author: zgu date: Tue May 07 10:38:50 2013 -0400 8013214: BigApps fails due to 'fatal error: Illegal threadstate encountered: 6' Summary: Grab and drop SR_lock to get the thread to honor the safepoint protocol Reviewed-by: dcubed, coleenp changeset 127c4f0798b4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=127c4f0798b4 author: zgu date: Tue May 07 08:05:20 2013 -0700 Merge changeset 0d3d60dfa1ab in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0d3d60dfa1ab author: zgu date: Tue May 07 08:16:15 2013 -0700 Merge changeset ea5503c5095e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ea5503c5095e author: johnc date: Tue Mar 19 00:57:39 2013 -0700 8009940: G1: assert(_finger == _heap_end) failed, concurrentMark.cpp:809 Summary: Skip reference processing if the global marking stack overflows during remark. Refactor and rename set_phase(); move code that sets the concurrency level into its own routine. Do not call set_phase() from within parallel reference processing; use the concurrency level routine instead. The marking state should only set reset by CMTask[0] during the concurrent phase of the marking cycle; if an overflow occurs at any stage during the remark, the marking state will be reset after reference processing. Reviewed-by: brutisso, jmasa, tschatzl changeset 76599c6f6f43 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=76599c6f6f43 author: johnc date: Tue Mar 19 09:38:37 2013 -0700 8008301: G1: guarantee(satb_mq_set.completed_buffers_num() == 0) failure Summary: If the marking stack overflows while the marking tasks are draining the SATB buffers, remark will exit with some SATB buffers left unprocessed. Relax the guarantee to allow for overflow. Reviewed-by: jmasa, brutisso changeset 44247af929fb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=44247af929fb author: johnc date: Fri Mar 29 13:49:37 2013 -0700 8010463: G1: Crashes with -UseTLAB and heap verification Summary: Some parts of the G1 heap can only be walked during a safepoint. Skip verifying these parts of the heap when verifying during JVM startup. Reviewed-by: brutisso, tschatzl changeset c375b802ab3d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c375b802ab3d author: johnc date: Tue May 07 12:23:47 2013 -0700 Merge changeset 38f92c5bc54d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=38f92c5bc54d author: johnc date: Wed Apr 10 10:57:34 2013 -0700 8010780: G1: Eden occupancy/capacity output wrong after a full GC Summary: Move the calculation and recording of eden capacity to the start of a GC and print a detailed heap transition for full GCs. Reviewed-by: tschatzl, jmasa, brutisso changeset 7ba81e455f0f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7ba81e455f0f author: johnc date: Wed Apr 17 10:57:02 2013 -0700 8012335: G1: Fix bug with compressed oops in template interpreter on x86 and sparc. Summary: In do_oop_store the uncompressed value of the oop being stored needs to be preserved and passed to g1_write_barrier_post. This is necessary for the heap region cross check to work correctly. Reviewed-by: coleenp, johnc Contributed-by: Martin Doerr changeset 8e59680f4573 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8e59680f4573 author: johnc date: Wed Apr 24 14:48:43 2013 -0700 8012715: G1: GraphKit accesses PtrQueue::_index as int but is size_t Summary: In graphKit INT operations were generated to access PtrQueue::_index which has type size_t. This is 64 bit on 64-bit machines. No problems occur on little endian machines as long as the index fits into 32 bit, but on big endian machines the upper part is read, which is zero. This leads to unnecessary branches to the slow path in the runtime. Reviewed-by: twisti, johnc Contributed-by: Martin Doerr changeset 7eabf05bddea in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7eabf05bddea author: amurillo date: Thu May 09 06:12:11 2013 -0700 Merge changeset f8075a623349 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f8075a623349 author: amurillo date: Thu May 09 06:12:12 2013 -0700 Added tag hs24-b44 for changeset 7eabf05bddea changeset 6955417355e3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6955417355e3 author: aywang date: Thu May 09 15:41:08 2013 -0700 8014129: makefile changes to allow integration of new features Reviewed-by: tbell, robilad changeset b6796efaadca in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b6796efaadca author: lana date: Fri May 10 10:14:14 2013 -0700 Merge changeset a8a071629df4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a8a071629df4 author: amurillo date: Tue May 14 15:18:14 2013 -0700 Merge changeset 7c93562242eb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7c93562242eb author: katleman date: Thu May 16 12:14:12 2013 -0700 Added tag jdk7u40-b25 for changeset a8a071629df4 changeset c8ebb78f7fce in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c8ebb78f7fce author: kevinw date: Thu Apr 18 17:02:20 2013 +0100 7109087: gc/7072527/TestFullGCCount.java fails when GC is set in command-line Reviewed-by: mgerdin changeset 41757aca677e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=41757aca677e author: kevinw date: Thu May 09 14:45:36 2013 +0100 Merge changeset f6fd93a613f7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f6fd93a613f7 author: kevinw date: Thu May 09 17:59:11 2013 +0200 Merge changeset 6af72a80f8d8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6af72a80f8d8 author: amurillo date: Thu May 09 06:26:08 2013 -0700 8014278: new hotspot build - hs24-b45 Reviewed-by: jcoomes changeset 78039199d8e5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=78039199d8e5 author: amurillo date: Thu May 09 10:52:51 2013 -0700 Merge changeset 0816789a8270 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0816789a8270 author: zgu date: Fri May 10 16:46:18 2013 -0400 8013120: NMT: Kitchensink crashes with assert(next_region == NULL || !next_region->is_committed_region()) failed: Sanity check Summary: Fixed NMT to deal with releasing virtual memory region when there are still committed regions within it Reviewed-by: acorn, coleenp changeset 091c3bd3fcdd in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=091c3bd3fcdd author: mgronlun date: Tue May 14 13:32:35 2013 +0200 8014411: Decrease lock order rank for event tracing locks Reviewed-by: sla, dholmes changeset feb41fc13635 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=feb41fc13635 author: rbackman date: Tue May 14 09:11:21 2013 +0200 8014478: EnableTracing: output from multiple threads may be mixed together Reviewed-by: dholmes, rbackman Contributed-by: yunda.mly at taobao.com changeset 1c631ba2a408 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1c631ba2a408 author: collins date: Wed Feb 27 20:36:14 2013 -0800 7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option Summary: Small changes to hotspot tests to remove "-server" and replace with ${TESTVMOPTS} Reviewed-by: kvn changeset 4071984ef4ea in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4071984ef4ea author: collins date: Wed Mar 27 09:49:51 2013 -0700 8009152: A number of jtreg tests need review/improvement Summary: Added a new test_env.txt file to capture common shell variable. Added concept of COMPILEJAVA for use when TESTJAVA is a JRE. If COMPILEJAVA not set then TESTJAVA will be the default with assumption it is a JDK. Reviewed-by: kvn, brutisso, coleenp changeset 725d82a60081 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=725d82a60081 author: collins date: Wed May 15 08:37:36 2013 -0700 Merge changeset f2ce8a7ee5a0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f2ce8a7ee5a0 author: poonam date: Wed May 15 10:12:25 2013 -0700 8014189: JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis() Summary: Add NULL checks and asserts for Type::make_ptr() returned value. Reviewed-by: kvn changeset ec4e3a5cc748 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ec4e3a5cc748 author: poonam date: Wed May 15 12:38:01 2013 -0700 Merge changeset 275bd93474dc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=275bd93474dc author: roland date: Thu Apr 04 09:33:24 2013 +0200 8010399: Test8009761.java "Failed: init recursive calls: 5498. After deopt 5494". Summary: test from 8009761 shouldn't be run with -Xcomp Reviewed-by: kvn changeset 24560c7be569 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=24560c7be569 author: roland date: Fri May 03 09:32:50 2013 +0200 8012037: Test8009761.java "Failed: init recursive calls: 7224. After deopt 58824" Summary: test shouldn't be run with a modified CompileThreshold Reviewed-by: kvn changeset d1032a8d2096 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d1032a8d2096 author: twisti date: Mon May 06 13:53:13 2013 -0700 7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact Reviewed-by: jrose, kvn changeset 12e522165e15 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=12e522165e15 author: twisti date: Wed May 15 19:46:51 2013 -0400 Merge changeset 69fecd3e0689 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=69fecd3e0689 author: amurillo date: Thu May 16 16:09:32 2013 -0700 Merge changeset 43fd44b89792 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=43fd44b89792 author: amurillo date: Thu May 16 16:09:33 2013 -0700 Added tag hs24-b45 for changeset 69fecd3e0689 changeset af383e67806b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=af383e67806b author: katleman date: Wed May 22 16:01:50 2013 -0700 Added tag jdk7u40-b26 for changeset 43fd44b89792 changeset 3a049c5a3407 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3a049c5a3407 author: amurillo date: Thu May 16 16:18:38 2013 -0700 8014759: new hotspot build - hs24-b46 Reviewed-by: jcoomes changeset aa01d1f5fcd9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aa01d1f5fcd9 author: aeriksso date: Fri May 17 17:24:20 2013 +0200 7176220: 'Full GC' events miss date stamp information occasionally Summary: Move date stamp logic into GCTraceTime Reviewed-by: johnc, brutisso, jmasa changeset c78ea7137c06 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c78ea7137c06 author: ehelin date: Fri May 17 15:28:11 2013 +0200 8011891: The vm/gc/heap/heap_summary_after_gc event for CMS contains old data Reviewed-by: brutisso, stefank changeset 3e38b7096830 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3e38b7096830 author: ehelin date: Mon May 20 14:18:40 2013 +0200 Merge changeset 244e30c23098 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=244e30c23098 author: ehelin date: Mon May 20 16:49:54 2013 +0200 8013934: Garbage collection event for CMS has wrong cause for System.gc() Reviewed-by: brutisso, jwilhelm changeset 87978e19157c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=87978e19157c author: amurillo date: Mon May 20 23:14:39 2013 -0700 8014941: make jdk7u40 the default jprt release for hs24 Reviewed-by: dholmes, collins changeset 41f1dfc8331b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=41f1dfc8331b author: brutisso date: Tue May 21 08:50:20 2013 +0200 7066063: CMS: "Conservation Principle" assert failed Summary: Add call to coalBirth() in CompactibleFreeListSpace::reset() Reviewed-by: ysr, jmasa changeset 97eb1ea6bae8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=97eb1ea6bae8 author: ehelin date: Tue May 21 20:29:00 2013 +0200 8011891: The vm/gc/heap/heap_summary_after_gc event for CMS contains old data Reviewed-by: brutisso, stefank changeset cea88a661227 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cea88a661227 author: ehelin date: Tue May 21 20:46:58 2013 +0200 Merge changeset dffc616548d2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dffc616548d2 author: brutisso date: Wed May 22 07:30:15 2013 +0200 7197666: java -d64 -version core dumps in a box with lots of memory Summary: Allow task queues to be mmapped instead of malloced on Solaris Reviewed-by: coleenp, jmasa, johnc, tschatzl changeset 044681b8bab0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=044681b8bab0 author: ehelin date: Thu May 23 08:14:09 2013 +0200 8012086: The object count event should only send events for instances occupying more than 0.5% of the heap Reviewed-by: brutisso, jwilhelm changeset f2a9de120e2d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f2a9de120e2d author: jcoomes date: Thu May 23 03:08:19 2013 -0700 8014611: reserve_and_align() assumptions are invalid on windows Summary: also reviewed by ron.durbin at oracle.com, thomas.schatzl at oracle.com Reviewed-by: dcubed, brutisso changeset e50c5a1869b1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e50c5a1869b1 author: amurillo date: Thu May 23 13:57:41 2013 -0700 Merge changeset f2614c006bb7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f2614c006bb7 author: amurillo date: Thu May 23 13:57:42 2013 -0700 Added tag hs24-b46 for changeset e50c5a1869b1 changeset ba0b94f82e71 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ba0b94f82e71 author: katleman date: Wed May 29 13:24:23 2013 -0700 Added tag jdk7u40-b27 for changeset f2614c006bb7 changeset 5e3f9a6c1930 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5e3f9a6c1930 author: amurillo date: Thu May 23 14:04:32 2013 -0700 8015304: new hotspot build - hs24-b47 Reviewed-by: jcoomes changeset f1faa475b37d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f1faa475b37d author: ehelin date: Tue May 28 11:27:19 2013 +0200 6843375: Debuggee VM crashes performing mark-sweep-compact Reviewed-by: stefank, jmasa changeset 851f1e0cef3c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=851f1e0cef3c author: vladidan date: Tue Apr 30 17:36:01 2013 -0400 8013398: Adjust number of stack guard pages on systems with large memory page size Summary: Auto adjust number of stack guard pages on systems with large memory page size Reviewed-by: bobv, coleenp changeset e9cab25ca15e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e9cab25ca15e author: vladidan date: Wed May 29 16:12:56 2013 -0400 Merge changeset 1a7a04b4e45f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1a7a04b4e45f author: kvn date: Wed May 22 09:02:43 2013 -0700 8014811: loopTransform.cpp assert(cmp_end->in(2) == limit) failed Summary: Stop current iteration of loop opts if partial_peel() failed and it created node clones outside processed loop. Reviewed-by: roland changeset 6250a3d948df in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6250a3d948df author: kvn date: Wed May 22 18:25:43 2013 -0700 8010927: Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy Summary: Changed gen_write_ref_array_post_barrier() code on x64 to pass start address and number of copied oop elements. In generate_checkcast_copy() skip post barrier code if no elements are copied. Reviewed-by: roland changeset d2e053ead2e6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d2e053ead2e6 author: jcoomes date: Fri May 31 08:00:19 2013 -0700 6725714: par compact - add a table to speed up bitmap searches Reviewed-by: jmasa, tschatzl changeset 64aaeeee0a10 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=64aaeeee0a10 author: amurillo date: Fri May 31 14:14:30 2013 -0700 Merge changeset 6206774b5959 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6206774b5959 author: amurillo date: Fri May 31 14:14:31 2013 -0700 Added tag hs24-b47 for changeset 64aaeeee0a10 changeset 439a2cb6fcc9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=439a2cb6fcc9 author: katleman date: Wed Jun 05 17:46:43 2013 -0700 Added tag jdk7u40-b28 for changeset 6206774b5959 changeset e341c460dcbf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e341c460dcbf author: johnc date: Fri May 31 12:18:33 2013 -0700 7176479: G1: JVM crashes on T5-8 system with 1.5 TB heap Summary: Refactor G1's hot card cache and card counts table into their own files. Simplify the card counts table, including removing the encoding of the card index in each entry. The card counts table now has a 1:1 correspondence with the cards spanned by heap. Space for the card counts table is reserved from virtual memory (rather than C heap) during JVM startup and is committed/expanded when the heap is expanded. Changes were also reviewed-by Vitaly Davidovich. Reviewed-by: jmasa changeset cd6a08cb2b86 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cd6a08cb2b86 author: johnc date: Fri May 31 19:34:21 2013 -0700 Merge changeset d32b6216bb0e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d32b6216bb0e author: amurillo date: Fri May 31 14:20:13 2013 -0700 8015689: new hotspot build - hs24-b48 Reviewed-by: jcoomes changeset d942f92789f4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d942f92789f4 author: amurillo date: Sat Jun 01 00:36:52 2013 -0700 Merge changeset 010c022d6094 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=010c022d6094 author: bpittore date: Mon Jun 03 10:53:09 2013 -0400 8014669: arch specific flags not passed to some link commands Summary: EXTRA_CFLAGS does not propagate to saproc and jsig makefiles Reviewed-by: dholmes, tbell, collins changeset 02d2b7ba71ad in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=02d2b7ba71ad author: johnc date: Wed May 15 22:35:36 2013 -0700 8014408: G1: crashes with assert assert(prev_committed_card_num == _committed_max_card_num) failed Summary: Mismatch in the card number calculation between next and previous committed sizes of the card counts table. Reviewed-by: jmasa, tschatzl changeset d1c1d2ffc2c5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d1c1d2ffc2c5 author: hseigel date: Thu Jun 06 08:54:53 2013 -0400 8009302: Mac OS X: JVM crash on infinite recursion on Appkit Thread Summary: Use SA_ONSTACK flag to ensure signal gets delivered properly. Reviewed-by: dholmes, coleenp Contributed-by: gerard.ziemski at oracle.com changeset 58e723f20009 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=58e723f20009 author: amurillo date: Thu Jun 06 11:14:01 2013 -0700 Merge changeset d74376b0f20b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d74376b0f20b author: amurillo date: Thu Jun 06 11:14:02 2013 -0700 Added tag hs24-b48 for changeset 58e723f20009 changeset aa8623d58971 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aa8623d58971 author: katleman date: Wed Jun 12 19:58:20 2013 -0700 Added tag jdk7u40-b29 for changeset d74376b0f20b changeset 84d31cb59402 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=84d31cb59402 author: amurillo date: Thu Jun 06 11:34:46 2013 -0700 8016077: new hotspot build - hs24-b49 Reviewed-by: jcoomes changeset 79d6da9207c8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=79d6da9207c8 author: tamao date: Thu Jun 06 10:15:11 2013 -0700 7186737: Unable to allocate bit maps or card tables for parallel gc for the requested heap Summary: Print helpful error message when VM aborts due to inability of allocating bit maps or card tables Reviewed-by: jmasa, stefank Contributed-by: tamao changeset 643da9d13379 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=643da9d13379 author: zgu date: Mon Jun 10 10:45:19 2013 -0400 8013917: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites Summary: Simple fix when memory allocation site is gone, NMT should report 0 memory size, instead old memory size. Reviewed-by: dcubed, ctornqvi changeset a1a295252814 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a1a295252814 author: dcubed date: Tue Jun 11 07:59:30 2013 -0700 8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint Summary: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory(). Add os::commit_memory_or_exit(). Also tidy up some NMT accounting and some mmap() return value checking. Reviewed-by: zgu, stefank, dholmes, dsamersoff changeset 5064f1a8b6ee in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5064f1a8b6ee author: morris date: Tue Jun 11 16:36:17 2013 -0700 8016187: assert(nbits == 32 || (-(1 << nbits-1) <= x && x < ( 1 << nbits-1))) failed: value out of range Summary: Forced SPARC Assembler eden_alloate to use long branch to slow case Reviewed-by: kvn changeset a55abcd09aeb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a55abcd09aeb author: ehelin date: Wed Jun 05 09:44:03 2013 +0200 8015972: Refactor the sending of the object count after GC event Reviewed-by: mgerdin, brutisso changeset a4c642ecf2db in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a4c642ecf2db author: ehelin date: Wed Jun 12 15:21:41 2013 +0200 8015683: object_count_after_gc should have the same timestamp for all events Reviewed-by: brutisso, stefank changeset 7e3960aabb6c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7e3960aabb6c author: ctornqvi date: Wed Jun 12 18:23:30 2013 +0200 8016065: Write regression test for 7167142 Summary: Regression tests written for both test cases (.hotspotrc and .hotspot_compiler). Also reviewed by mikhailo.seledtsov at oracle.com Reviewed-by: zgu, coleenp changeset 520dc34d4114 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=520dc34d4114 author: ctornqvi date: Wed Jun 12 22:37:00 2013 +0200 Merge changeset 6424d602021e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6424d602021e author: ehelin date: Wed Jun 12 15:50:14 2013 +0200 8016170: GC id variable in gcTrace.cpp should use typedef GCId Reviewed-by: johnc, jwilhelm, jmasa changeset 2d9b536bb027 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2d9b536bb027 author: zgu date: Wed Jun 12 20:35:29 2013 -0400 8013651: NMT: reserve/release sequence id's in incorrect order due to race Summary: Fixed NMT race condition for realloc, uncommit and release Reviewed-by: coleenp, ccheung changeset 730eb43a23d8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=730eb43a23d8 author: zgu date: Thu Jun 13 04:13:42 2013 -0700 Merge changeset b43a5b3a4249 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b43a5b3a4249 author: zgu date: Thu Jun 13 04:33:56 2013 -0700 Merge changeset 88e43f47a8da in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=88e43f47a8da author: amurillo date: Thu Jun 13 10:26:22 2013 -0700 Merge changeset 241ab36a8b84 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=241ab36a8b84 author: amurillo date: Thu Jun 13 10:26:23 2013 -0700 Added tag hs24-b49 for changeset 88e43f47a8da changeset 0344da726f70 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0344da726f70 author: mullan date: Mon Jun 10 10:56:18 2013 -0700 8001330: Improve on checking order 8011896: Add check for invalid offset for new AccessControlContext isAuthorized field Reviewed-by: acorn, hawtin changeset ed3ac73a70ab in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ed3ac73a70ab author: hseigel date: Mon Jun 10 11:04:50 2013 -0700 7158805: Better rewriting of nested subroutine calls Reviewed-by: mschoene, coleenp changeset a5da0a17dfee in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a5da0a17dfee author: asaha date: Thu Jun 13 17:36:37 2013 -0700 Merge changeset 278de9dd7354 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=278de9dd7354 author: asaha date: Tue Jun 18 09:42:14 2013 -0700 Merge changeset cf93da767489 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cf93da767489 author: asaha date: Tue Jun 18 09:37:27 2013 -0700 Merge changeset 24f785f94d2f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=24f785f94d2f author: asaha date: Tue Jun 18 09:46:36 2013 -0700 Merge changeset ae4adc1492d1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ae4adc1492d1 author: katleman date: Fri Jun 21 11:18:38 2013 -0700 Added tag jdk7u40-b30 for changeset 24f785f94d2f changeset 9ba4f38e3000 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9ba4f38e3000 author: amurillo date: Thu Jun 13 11:10:02 2013 -0700 8016566: new hotspot build - hs24-b50 Reviewed-by: jcoomes changeset f65b000853c7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f65b000853c7 author: brutisso date: Fri Jun 14 08:02:20 2013 +0200 8012265: VM often crashes on solaris with a lot of memory Summary: Increase HeapBaseMinAddress for G1 from 256m to 1g on Solaris x86 Reviewed-by: mgerdin, coleenp, kvn changeset a51e6c9c3210 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a51e6c9c3210 author: brutisso date: Tue Jun 18 22:45:32 2013 +0200 8016556: G1: Use ArrayAllocator for BitMaps Reviewed-by: tschatzl, dholmes, coleenp, johnc changeset 9aba4a729302 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9aba4a729302 author: zgu date: Fri Jun 14 09:18:42 2013 -0400 8011968: Kitchensink crashed with SIGSEGV in MemBaseline::baseline Summary: Simple fix to add NULL pointer check that can cause segv Reviewed-by: coleenp, ctornqvi changeset b964a67d19df in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b964a67d19df author: dholmes date: Thu Jun 20 17:23:52 2013 -0700 8014326: [OSX] All libjvm symbols are exported Summary: Add support for a MacOS X compatible form of the libjvm mapfile. Reviewed-by: dcubed, rdurbin, coleenp changeset 1aa21f922568 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1aa21f922568 author: kvn date: Thu Jun 20 19:19:06 2013 -0700 8007028: java/util/NavigableMap/LockStep hit assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr Summary: do not allow switch on EliminateAutoBox in hs24. Reviewed-by: twisti changeset fde31393d1ce in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fde31393d1ce author: adlertz date: Mon Jun 03 12:39:33 2013 -0700 8005956: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block Summary: Disable re-materialization of reaching definitions (which have live inputs) for phi nodes when spilling. Reviewed-by: twisti, kvn changeset cf6a8e400e0f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cf6a8e400e0f author: kvn date: Thu Jun 20 23:26:12 2013 -0700 Merge changeset 011c19ff2552 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=011c19ff2552 author: minqi date: Thu Jan 31 17:43:01 2013 -0800 8000973: SA on windows thread inspection is broken Summary: After bug 7161732, On Windows SA could not find correct address of thread_id of OSThread since _thread_id moved to end of the class . The presupposition of the address is following thread handle no longer stands. Fix by adding thread_id field to OSThread and getting the address directly from OSThread. Reviewed-by: nloodin, sspitsyn Contributed-by: yumin.qi at oracle.com changeset 0464a0d982b3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0464a0d982b3 author: kevinw date: Fri Jun 21 12:56:37 2013 +0100 Merge changeset 0b260439fc78 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0b260439fc78 author: kevinw date: Fri Jun 21 15:17:01 2013 +0200 Merge changeset 1c45f52dad23 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1c45f52dad23 author: mgronlun date: Fri Jun 21 18:51:31 2013 +0200 8016735: Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check Reviewed-by: sla, dholmes changeset 7217cb314c66 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7217cb314c66 author: twisti date: Fri Jun 21 12:18:42 2013 -0700 8003268: SharedRuntime::generate_native_wrapper doesn't save all registers across runtime tracing calls for JNI critical native methods Reviewed-by: kvn changeset d229f7a57af7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d229f7a57af7 author: twisti date: Fri Jun 21 12:58:54 2013 -0700 Merge changeset 41118cf72ace in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=41118cf72ace author: amurillo date: Fri Jun 21 18:46:07 2013 -0700 Merge changeset 645b68762a36 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=645b68762a36 author: amurillo date: Fri Jun 21 18:46:08 2013 -0700 Added tag hs24-b50 for changeset 41118cf72ace changeset 92ed51cbcb25 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=92ed51cbcb25 author: andrew date: Mon Jul 01 09:07:06 2013 -0500 Merge jdk7u40-b29 changeset 5f53e7717116 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5f53e7717116 author: andrew date: Mon Jul 01 09:21:44 2013 -0500 Merge jdk7u40-b31 changeset 1ba6a7cfc687 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1ba6a7cfc687 author: andrew date: Tue Jul 02 02:26:36 2013 +0100 Added tag icedtea-2.4.1 for changeset 5f53e7717116 diffstat: .hgtags | 52 + .jcheck/conf | 2 - agent/src/os/bsd/MacosxDebuggerLocal.m | 104 +- agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/libproc.h | 29 +- agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java | 2 +- agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java | 19 +- agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java | 18 +- agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java | 18 +- agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java | 18 +- agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java | 9 +- agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java | 13 +- agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java | 14 +- agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java | 14 +- make/bsd/makefiles/build_vm_def.sh | 4 +- make/bsd/makefiles/gcc.make | 6 +- make/bsd/makefiles/mapfile-vers-debug | 487 ++++---- make/bsd/makefiles/mapfile-vers-product | 479 +++---- make/hotspot_version | 2 +- make/jprt.properties | 46 +- make/linux/makefiles/adlc.make | 2 + make/linux/makefiles/buildtree.make | 2 + make/linux/makefiles/defs.make | 52 +- make/linux/makefiles/gcc.make | 30 +- make/linux/makefiles/jsig.make | 8 +- make/linux/makefiles/rules.make | 10 - make/linux/makefiles/saproc.make | 7 +- make/linux/makefiles/vm.make | 61 +- make/linux/makefiles/zero.make | 4 + make/linux/platform_zero.in | 2 +- make/solaris/makefiles/adlc.make | 6 +- make/solaris/makefiles/dtrace.make | 16 + make/solaris/makefiles/gcc.make | 4 +- make/solaris/makefiles/jsig.make | 4 + make/solaris/makefiles/rules.make | 10 - make/solaris/makefiles/saproc.make | 4 + make/solaris/makefiles/vm.make | 14 +- make/windows/makefiles/compile.make | 2 +- make/windows/makefiles/defs.make | 2 +- make/windows/makefiles/vm.make | 8 + src/cpu/sparc/vm/assembler_sparc.cpp | 3 +- src/cpu/sparc/vm/sparc.ad | 25 +- src/cpu/sparc/vm/templateTable_sparc.cpp | 9 +- src/cpu/x86/vm/assembler_x86.cpp | 40 +- src/cpu/x86/vm/assembler_x86.hpp | 3 + src/cpu/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/x86/vm/cppInterpreter_x86.cpp | 21 +- src/cpu/x86/vm/sharedRuntime_x86_32.cpp | 3 + src/cpu/x86/vm/sharedRuntime_x86_64.cpp | 59 +- src/cpu/x86/vm/stubGenerator_x86_32.cpp | 23 +- src/cpu/x86/vm/stubGenerator_x86_64.cpp | 104 +- src/cpu/x86/vm/templateInterpreter_x86_32.cpp | 18 +- src/cpu/x86/vm/templateInterpreter_x86_64.cpp | 11 +- src/cpu/x86/vm/templateTable_x86_64.cpp | 9 +- src/cpu/x86/vm/x86_32.ad | 223 ++- src/cpu/x86/vm/x86_64.ad | 132 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +- src/os/bsd/vm/osThread_bsd.hpp | 9 + src/os/bsd/vm/os_bsd.cpp | 246 +++- src/os/bsd/vm/os_bsd.hpp | 4 +- src/os/bsd/vm/perfMemory_bsd.cpp | 10 +- src/os/linux/vm/os_linux.cpp | 298 ++++- src/os/linux/vm/os_linux.hpp | 11 +- src/os/linux/vm/perfMemory_linux.cpp | 10 +- src/os/posix/vm/os_posix.cpp | 4 + src/os/solaris/vm/osThread_solaris.cpp | 57 +- src/os/solaris/vm/os_solaris.cpp | 272 +++- src/os/solaris/vm/os_solaris.hpp | 8 +- src/os/solaris/vm/perfMemory_solaris.cpp | 10 +- src/os/windows/vm/os_windows.cpp | 77 +- src/os/windows/vm/perfMemory_windows.cpp | 13 +- src/os_cpu/bsd_x86/vm/bsd_x86_64.ad | 18 - src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp | 5 +- src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +- src/os_cpu/linux_x86/vm/linux_x86_64.ad | 18 - src/os_cpu/solaris_x86/vm/solaris_x86_64.ad | 29 - src/os_cpu/windows_x86/vm/windows_x86_64.ad | 27 +- src/share/vm/adlc/archDesc.cpp | 1 + src/share/vm/adlc/dfa.cpp | 41 +- src/share/vm/adlc/output_c.cpp | 102 +- src/share/vm/adlc/output_h.cpp | 18 +- src/share/vm/asm/codeBuffer.hpp | 2 +- src/share/vm/ci/ciTypeFlow.cpp | 2 +- src/share/vm/classfile/javaClasses.cpp | 30 + src/share/vm/classfile/javaClasses.hpp | 11 +- src/share/vm/classfile/systemDictionary.cpp | 89 +- src/share/vm/classfile/systemDictionary.hpp | 15 + src/share/vm/classfile/vmSymbols.hpp | 2 + src/share/vm/compiler/methodLiveness.cpp | 12 +- src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 1 + src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 32 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp | 11 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp | 4 +- src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp | 2 +- src/share/vm/gc_implementation/g1/collectionSetChooser.cpp | 37 - src/share/vm/gc_implementation/g1/collectionSetChooser.hpp | 11 +- src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp | 436 +------- src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp | 171 +-- src/share/vm/gc_implementation/g1/concurrentMark.cpp | 504 +++++--- src/share/vm/gc_implementation/g1/concurrentMark.hpp | 17 +- src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp | 6 +- src/share/vm/gc_implementation/g1/g1CardCounts.cpp | 215 +++ src/share/vm/gc_implementation/g1/g1CardCounts.hpp | 134 ++ src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 565 +++++---- src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp | 20 +- src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 128 +- src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp | 42 +- src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp | 66 +- src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp | 15 +- src/share/vm/gc_implementation/g1/g1HotCardCache.cpp | 148 ++ src/share/vm/gc_implementation/g1/g1HotCardCache.hpp | 128 ++ src/share/vm/gc_implementation/g1/g1RemSet.cpp | 261 +-- src/share/vm/gc_implementation/g1/g1RemSet.hpp | 22 +- src/share/vm/gc_implementation/g1/g1_globals.hpp | 12 +- src/share/vm/gc_implementation/g1/vm_operations_g1.cpp | 1 - src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp | 10 +- src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 6 +- src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp | 4 + src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 7 +- src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp | 1 - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 226 +++- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp | 159 ++- src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 1 - src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp | 12 +- src/share/vm/gc_implementation/shared/copyFailedInfo.hpp | 36 +- src/share/vm/gc_implementation/shared/gcTrace.cpp | 76 +- src/share/vm/gc_implementation/shared/gcTrace.hpp | 14 +- src/share/vm/gc_implementation/shared/gcTraceSend.cpp | 33 +- src/share/vm/gc_implementation/shared/gcTraceTime.cpp | 6 +- src/share/vm/gc_implementation/shared/objectCountEventSender.cpp | 51 + src/share/vm/gc_implementation/shared/objectCountEventSender.hpp | 39 + src/share/vm/gc_implementation/shared/vmGCOperations.cpp | 9 +- src/share/vm/gc_interface/collectedHeap.cpp | 23 + src/share/vm/gc_interface/collectedHeap.hpp | 12 + src/share/vm/interpreter/bytecodeInterpreter.cpp | 24 +- src/share/vm/interpreter/linkResolver.cpp | 8 +- src/share/vm/memory/allocation.cpp | 41 +- src/share/vm/memory/allocation.hpp | 90 +- src/share/vm/memory/allocation.inline.hpp | 55 +- src/share/vm/memory/cardTableModRefBS.cpp | 17 +- src/share/vm/memory/collectorPolicy.cpp | 2 +- src/share/vm/memory/genCollectedHeap.cpp | 28 +- src/share/vm/memory/heapInspection.cpp | 33 +- src/share/vm/memory/heapInspection.hpp | 17 +- src/share/vm/memory/resourceArea.cpp | 15 +- src/share/vm/memory/resourceArea.hpp | 6 +- src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +- src/share/vm/memory/universe.cpp | 32 +- src/share/vm/memory/universe.hpp | 4 +- src/share/vm/oops/generateOopMap.cpp | 21 +- src/share/vm/oops/klass.cpp | 2 +- src/share/vm/oops/methodOop.cpp | 4 +- src/share/vm/opto/cfgnode.cpp | 9 +- src/share/vm/opto/escape.cpp | 24 +- src/share/vm/opto/graphKit.cpp | 42 +- src/share/vm/opto/lcm.cpp | 4 +- src/share/vm/opto/library_call.cpp | 5 +- src/share/vm/opto/loopnode.hpp | 2 +- src/share/vm/opto/loopopts.cpp | 16 +- src/share/vm/opto/machnode.cpp | 2 +- src/share/vm/opto/macro.cpp | 2 +- src/share/vm/opto/node.cpp | 15 + src/share/vm/opto/node.hpp | 2 + src/share/vm/opto/output.cpp | 38 +- src/share/vm/opto/reg_split.cpp | 11 +- src/share/vm/opto/subnode.cpp | 7 +- src/share/vm/prims/jni.cpp | 2 +- src/share/vm/prims/jvm.cpp | 84 +- src/share/vm/prims/jvmtiEnv.cpp | 3 + src/share/vm/prims/jvmtiImpl.cpp | 28 +- src/share/vm/prims/jvmtiImpl.hpp | 77 +- src/share/vm/prims/methodHandles.cpp | 58 +- src/share/vm/prims/nativeLookup.cpp | 5 +- src/share/vm/prims/whitebox.cpp | 67 +- src/share/vm/runtime/arguments.cpp | 34 +- src/share/vm/runtime/arguments.hpp | 2 + src/share/vm/runtime/globals.cpp | 6 - src/share/vm/runtime/globals.hpp | 19 +- src/share/vm/runtime/init.cpp | 9 - src/share/vm/runtime/mutexLocker.cpp | 6 +- src/share/vm/runtime/objectMonitor.cpp | 2 +- src/share/vm/runtime/os.cpp | 63 +- src/share/vm/runtime/os.hpp | 32 +- src/share/vm/runtime/sharedRuntime.cpp | 28 +- src/share/vm/runtime/thread.cpp | 12 +- src/share/vm/runtime/thread.hpp | 9 +- src/share/vm/runtime/virtualspace.cpp | 73 +- src/share/vm/runtime/virtualspace.hpp | 15 + src/share/vm/services/memBaseline.cpp | 37 +- src/share/vm/services/memBaseline.hpp | 5 +- src/share/vm/services/memPtr.hpp | 11 +- src/share/vm/services/memRecorder.cpp | 12 +- src/share/vm/services/memRecorder.hpp | 2 +- src/share/vm/services/memReporter.cpp | 15 +- src/share/vm/services/memSnapshot.cpp | 23 +- src/share/vm/services/memTrackWorker.cpp | 11 +- src/share/vm/services/memTrackWorker.hpp | 4 +- src/share/vm/services/memTracker.cpp | 371 ++++- src/share/vm/services/memTracker.hpp | 178 ++- src/share/vm/services/runtimeService.cpp | 4 + src/share/vm/shark/sharkCompiler.cpp | 4 +- src/share/vm/trace/noTraceBackend.hpp | 48 + src/share/vm/trace/trace.dtd | 3 - src/share/vm/trace/trace.xml | 86 +- src/share/vm/trace/traceBackend.hpp | 21 +- src/share/vm/trace/traceEvent.hpp | 2 +- src/share/vm/trace/traceEventClasses.xsl | 22 +- src/share/vm/trace/traceEventIds.xsl | 2 +- src/share/vm/trace/traceMacros.hpp | 3 +- src/share/vm/trace/traceStream.hpp | 38 +- src/share/vm/trace/traceTypes.xsl | 2 +- src/share/vm/trace/tracetypes.xml | 1 + src/share/vm/utilities/bitMap.cpp | 10 +- src/share/vm/utilities/bitMap.hpp | 5 +- src/share/vm/utilities/ostream.cpp | 2 +- src/share/vm/utilities/taskqueue.hpp | 3 +- src/share/vm/utilities/vmError.cpp | 10 +- test/TEST.ROOT | 2 +- test/compiler/5091921/Test6890943.sh | 24 +- test/compiler/5091921/Test7005594.sh | 23 +- test/compiler/6431242/Test.java | 2 +- test/compiler/6443505/Test6443505.java | 107 + test/compiler/6589834/Test_ia32.java | 2 +- test/compiler/6636138/Test1.java | 2 +- test/compiler/6636138/Test2.java | 2 +- test/compiler/6795161/Test.java | 2 +- test/compiler/6857159/Test6857159.sh | 23 +- test/compiler/6863420/Test.java | 24 +- test/compiler/6946040/TestCharShortByteSwap.java | 2 +- test/compiler/7068051/Test7068051.sh | 24 +- test/compiler/7070134/Test7070134.sh | 23 +- test/compiler/7200264/Test7200264.sh | 47 +- test/compiler/8000805/Test8000805.java | 2 +- test/compiler/8009761/Test8009761.java | 4 +- test/compiler/8010927/Test8010927.java | 153 ++ test/compiler/8011901/Test8011901.java | 68 + test/gc/6941923/test6941923.sh | 39 +- test/gc/7072527/TestFullGCCount.java | 88 +- test/gc/TestVerifyBeforeGCDuringStartup.java | 45 + test/gc/init/TestHandleExceedingProcessSizeLimitIn32BitBuilds.java | 58 + test/runtime/6626217/Test6626217.sh | 71 +- test/runtime/6878713/Test6878713.sh | 60 +- test/runtime/6929067/Test6929067.sh | 109 +- test/runtime/7020373/GenOOMCrashClass.java | 157 ++ test/runtime/7020373/Test7020373.sh | 56 +- test/runtime/7020373/testcase.jar | Bin test/runtime/7051189/Xchecksig.sh | 26 +- test/runtime/7107135/Test7107135.sh | 23 +- test/runtime/7110720/Test7110720.sh | 21 +- test/runtime/7158804/Test7158804.sh | 11 +- test/runtime/7162488/Test7162488.sh | 26 +- test/runtime/CommandLine/CompilerConfigFileWarning.java | 50 + test/runtime/CommandLine/ConfigFileWarning.java | 50 + test/runtime/NMT/AllocTestType.java | 73 - test/runtime/NMT/JcmdDiffCallsite.java | 80 + test/runtime/NMT/MallocTestType.java | 74 + test/runtime/NMT/PrintNMTStatistics.java | 10 +- test/runtime/NMT/ReleaseCommittedMemory.java | 50 + test/runtime/NMT/ThreadedMallocTestType.java | 91 + test/runtime/NMT/ThreadedVirtualAllocTestType.java | 112 + test/runtime/NMT/VirtualAllocTestType.java | 88 + test/test_env.sh | 193 +++ test/testlibrary/OutputAnalyzerTest.java | 74 +- test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java | 105 +- test/testlibrary/whitebox/sun/hotspot/WhiteBox.java | 8 +- 267 files changed, 7792 insertions(+), 4205 deletions(-) diffs (truncated from 20202 to 500 lines): diff -r 3e88170d8be2 -r 1ba6a7cfc687 .hgtags --- a/.hgtags Thu Apr 11 22:44:42 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:36 2013 +0100 @@ -50,6 +50,7 @@ faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 +b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 @@ -87,6 +88,7 @@ 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 +a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 @@ -160,6 +162,7 @@ b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 +591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 @@ -182,6 +185,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 +7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 @@ -210,6 +214,7 @@ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21 +f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04 @@ -264,6 +269,7 @@ f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 +a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01 @@ -311,6 +317,7 @@ cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17 +354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09 @@ -334,6 +341,8 @@ ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u9-b02 ed42837374ac730ddaf2fd28814017c665634a8b jdk7u9-b04 da4aa289ac100017f850ed4d492e8054db6a1e28 jdk7u9-b05 +8eaa45ed5f804199c0823b409dc37f72e808926f jdk7u9-b31 +ea83168282c8c3a9f4a8ca723cc86972a3188d58 jdk7u9-b32 d2e25680db9d4209b3f0f51e5c848284cedea508 jdk7u10-b10 d37fd995683ab5bc2d941648ce7bf8bd194732f2 jdk7u10-b11 f26f3d92e6d9ef7842b2d785f92439dbb15e670e jdk7u10-b12 @@ -344,8 +353,11 @@ 5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17 78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18 c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30 +07f7daeb261073a4a2946d988979ee65ba8ed753 jdk7u10-b31 25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20 7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21 +06b5c3f663b81f11da2080a91d215a96ae431f84 jdk7u11-b32 +abb5b690122caabf09f93958c747358cc22f8a59 jdk7u11-b33 db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03 4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04 f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05 @@ -435,6 +447,7 @@ 4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09 +6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint 7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29 181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10 4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30 @@ -447,10 +460,27 @@ 5fbe0cae3a2a78a73946cfd08c56a64860f1afd9 jdk7u15-b01 30d72c9abb560bc424d16d96bfd396ccd3c62cbc jdk7u15-b02 221c64550c5b4411d78b63820835de1a8cd0c118 jdk7u15-b30 +0b905a04f573565515aa8614085099abd73dcac4 jdk7u15-b31 +8b349f332a66ebe5982b5680c85f903efb03da8e jdk7u15-b33 5b55cef461b034766f05a46640caa123aa4247d4 jdk7u15-b03 34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u15-b32 a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01 0d82bf449a610602b6e9ddcc9e076839d5351449 jdk7u17-b02 +7b357c079370e2fd324c229f2e24c982915c80a0 jdk7u17-b30 +22b6fd616cfe61774525a944f162bf5e7c418f03 jdk7u17-b31 +be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u21-b01 +5119d89c7cc844190c0799dca85710e7592d42e7 jdk7u21-b02 +ad14169fb640ca532193cca0fd6e14910f226075 jdk7u21-b03 +c954aab38a7f8f62e33ae5103494576f67fc36d9 jdk7u21-b04 +0e8e9d990d91dc0f8b8807bb82c090de3264c809 jdk7u21-b05 +beeb3d6b76f06d9f60c31d6c5b9e04d82f01ad79 jdk7u21-b06 +663b5c744e82d1c884048cd9b38f625e52004773 jdk7u21-b07 +87e9bb582938552180b024dd99bc5166816f3921 jdk7u21-b08 +1f195ee7856aecb6527bc5c957f66e1960e51a12 jdk7u21-b09 +d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10 +d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11 +a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30 +c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12 e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 @@ -467,3 +497,25 @@ c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20 d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39 3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40 +ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0 +3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21 +d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41 +aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22 +482ff4e18ca3fb97f62fd9fe2823d48721fdee28 hs24-b42 +34a398422e596f9160335c0376cdfbc13baebb39 jdk7u40-b23 +2efcfec8a6dc4deb84bdfb6d0531556719a118f8 hs24-b43 +a36051465050a52485c29b9eef7135003f528528 jdk7u40-b24 +7eabf05bddea524aa4a00c1fc6f2eba21c06e275 hs24-b44 +a8a071629df4856a44660143c6dd8e7843cdcca2 jdk7u40-b25 +69fecd3e06892e95a32ce4c27f85b1d61e946fc8 hs24-b45 +43fd44b89792fcc931569218dce51df4c2856a17 jdk7u40-b26 +e50c5a1869b1f629508780eda1592674177a9f91 hs24-b46 +f2614c006bb73eabf8fdf8027b042b98149d06a7 jdk7u40-b27 +64aaeeee0a10e568f2234d91dca91608412ae5d1 hs24-b47 +6206774b59597ab260f65ff3b87ad92401f91a52 jdk7u40-b28 +58e723f20009d2703eac040e324620949ca923fe hs24-b48 +d74376b0f20be7982d824e9af6105a75cc24e020 jdk7u40-b29 +88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49 +24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30 +41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50 +5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1 diff -r 3e88170d8be2 -r 1ba6a7cfc687 .jcheck/conf --- a/.jcheck/conf Thu Apr 11 22:44:42 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 3e88170d8be2 -r 1ba6a7cfc687 agent/src/os/bsd/MacosxDebuggerLocal.m --- a/agent/src/os/bsd/MacosxDebuggerLocal.m Thu Apr 11 22:44:42 2013 -0700 +++ b/agent/src/os/bsd/MacosxDebuggerLocal.m Tue Jul 02 02:26:36 2013 +0100 @@ -90,7 +90,8 @@ * Method: init0 * Signature: ()V */ -JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL +Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0(JNIEnv *env, jclass cls) { symbolicatorID = (*env)->GetFieldID(env, cls, "symbolicator", "J"); taskID = (*env)->GetFieldID(env, cls, "task", "J"); CHECK_EXCEPTION; @@ -101,7 +102,11 @@ * Method: lookupByName0 * Signature: (Ljava/lang/String;Ljava/lang/String;)J */ -JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0(JNIEnv *env, jobject this_obj, jstring objectName, jstring symbolName) { +JNIEXPORT jlong JNICALL +Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0( + JNIEnv *env, jobject this_obj, + jstring objectName, jstring symbolName) +{ jlong address = 0; JNF_COCOA_ENTER(env); @@ -130,7 +135,11 @@ * Method: readBytesFromProcess0 * Signature: (JJ)Lsun/jvm/hotspot/debugger/ReadResult; */ -JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0(JNIEnv *env, jobject this_obj, jlong addr, jlong numBytes) { +JNIEXPORT jbyteArray JNICALL +Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0( + JNIEnv *env, jobject this_obj, + jlong addr, jlong numBytes) +{ if (debug) printf("readBytesFromProcess called. addr = %llx numBytes = %lld\n", addr, numBytes); // must allocate storage instead of using former parameter buf @@ -202,12 +211,74 @@ return array; } + /* - * Class: sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal + * Lookup the thread_t that corresponds to the given thread_id. + * The thread_id should be the result from calling thread_info() with THREAD_IDENTIFIER_INFO + * and reading the m_ident_info.thread_id returned. + * The returned thread_t is the mach send right to the kernel port for the corresponding thread. + * + * We cannot simply use the OSThread._thread_id field in the JVM. This is set to ::mach_thread_self() + * in the VM, but that thread port is not valid for a remote debugger to access the thread. + */ +thread_t +lookupThreadFromThreadId(task_t task, jlong thread_id) { + if (debug) { + printf("lookupThreadFromThreadId thread_id=0x%llx\n", thread_id); + } + + thread_array_t thread_list = NULL; + mach_msg_type_number_t thread_list_count = 0; + thread_t result_thread = 0; + int i; + + // get the list of all the send rights + kern_return_t result = task_threads(task, &thread_list, &thread_list_count); + if (result != KERN_SUCCESS) { + if (debug) { + printf("task_threads returned 0x%x\n", result); + } + return 0; + } + + for(i = 0 ; i < thread_list_count; i++) { + thread_identifier_info_data_t m_ident_info; + mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT; + + // get the THREAD_IDENTIFIER_INFO for the send right + result = thread_info(thread_list[i], THREAD_IDENTIFIER_INFO, (thread_info_t) &m_ident_info, &count); + if (result != KERN_SUCCESS) { + if (debug) { + printf("thread_info returned 0x%x\n", result); + } + break; + } + + // if this is the one we're looking for, return the send right + if (thread_id == m_ident_info.thread_id) + { + result_thread = thread_list[i]; + break; + } + } + + vm_size_t thread_list_size = (vm_size_t) (thread_list_count * sizeof (thread_t)); + vm_deallocate(mach_task_self(), (vm_address_t) thread_list, thread_list_count); + + return result_thread; +} + + +/* + * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal * Method: getThreadIntegerRegisterSet0 - * Signature: (I)[J + * Signature: (J)[J */ -JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0(JNIEnv *env, jobject this_obj, jint lwp_id) { +JNIEXPORT jlongArray JNICALL +Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0( + JNIEnv *env, jobject this_obj, + jlong thread_id) +{ if (debug) printf("getThreadRegisterSet0 called\n"); @@ -219,8 +290,9 @@ int i; jlongArray registerArray; jlong *primitiveArray; + task_t gTask = getTask(env, this_obj); - tid = lwp_id; + tid = lookupThreadFromThreadId(gTask, thread_id); result = thread_get_state(tid, HSDB_THREAD_STATE, (thread_state_t)&state, &count); @@ -321,19 +393,21 @@ } /* - * Class: sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal + * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal * Method: translateTID0 * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal_translateTID0(JNIEnv *env, jobject this_obj, jint tid) { +Java_sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal_translateTID0( + JNIEnv *env, jobject this_obj, jint tid) +{ if (debug) printf("translateTID0 called on tid = 0x%x\n", (int)tid); kern_return_t result; thread_t foreign_tid, usable_tid; mach_msg_type_name_t type; - + foreign_tid = tid; task_t gTask = getTask(env, this_obj); @@ -421,7 +495,10 @@ * Method: attach0 * Signature: (I)V */ -JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__I(JNIEnv *env, jobject this_obj, jint jpid) { +JNIEXPORT void JNICALL +Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__I( + JNIEnv *env, jobject this_obj, jint jpid) +{ JNF_COCOA_ENTER(env); if (getenv("JAVA_SAPROC_DEBUG") != NULL) debug = JNI_TRUE; @@ -469,7 +546,10 @@ * Method: detach0 * Signature: ()V */ -JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_detach0(JNIEnv *env, jobject this_obj) { +JNIEXPORT void JNICALL +Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_detach0( + JNIEnv *env, jobject this_obj) +{ JNF_COCOA_ENTER(env); if (debug) printf("detach0 called\n"); diff -r 3e88170d8be2 -r 1ba6a7cfc687 agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Thu Apr 11 22:44:42 2013 -0700 +++ b/agent/src/os/linux/Makefile Tue Jul 02 02:26:36 2013 +0100 @@ -23,7 +23,12 @@ # ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) -GCC = gcc + +ifndef BUILD_GCC +BUILD_GCC = gcc +endif + +GCC = $(BUILD_GCC) JAVAH = ${JAVA_HOME}/bin/javah @@ -40,7 +45,7 @@ LIBS = -lthread_db -CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64 +CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64 LIBSA = $(ARCH)/libsaproc.so @@ -73,7 +78,7 @@ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) test.o: test.c - $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c + $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r 3e88170d8be2 -r 1ba6a7cfc687 agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Thu Apr 11 22:44:42 2013 -0700 +++ b/agent/src/os/linux/libproc.h Tue Jul 02 02:26:36 2013 +0100 @@ -41,9 +41,34 @@ These two files define pt_regs structure differently */ #ifdef _LP64 -#include "asm-sparc64/ptrace.h" +struct pt_regs { + unsigned long u_regs[16]; /* globals and ins */ + unsigned long tstate; + unsigned long tpc; + unsigned long tnpc; + unsigned int y; + + /* We encode a magic number, PT_REGS_MAGIC, along + * with the %tt (trap type) register value at trap + * entry time. The magic number allows us to identify + * accurately a trap stack frame in the stack + * unwinder, and the %tt value allows us to test + * things like "in a system call" etc. for an arbitray + * process. + * + * The PT_REGS_MAGIC is chosen such that it can be + * loaded completely using just a sethi instruction. + */ + unsigned int magic; +}; #else -#include "asm-sparc/ptrace.h" +struct pt_regs { + unsigned long psr; + unsigned long pc; + unsigned long npc; + unsigned long y; + unsigned long u_regs[16]; /* globals and ins */ +}; #endif #endif //sparc or sparcv9 diff -r 3e88170d8be2 -r 1ba6a7cfc687 agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java --- a/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java Thu Apr 11 22:44:42 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java Tue Jul 02 02:26:36 2013 +0100 @@ -48,7 +48,7 @@ public BsdAddress readCompOopAddress(long address) throws DebuggerException; public BsdOopHandle readOopHandle(long address) throws DebuggerException; public BsdOopHandle readCompOopHandle(long address) throws DebuggerException; - public long[] getThreadIntegerRegisterSet(int lwp_id) throws DebuggerException; + public long[] getThreadIntegerRegisterSet(long unique_thread_id) throws DebuggerException; public long getAddressValue(Address addr) throws DebuggerException; public Address newAddress(long value) throws DebuggerException; diff -r 3e88170d8be2 -r 1ba6a7cfc687 agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java --- a/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java Thu Apr 11 22:44:42 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java Tue Jul 02 02:26:36 2013 +0100 @@ -90,7 +90,7 @@ throws DebuggerException; private native ClosestSymbol lookupByAddress0(long address) throws DebuggerException; - private native long[] getThreadIntegerRegisterSet0(int lwp_id) + private native long[] getThreadIntegerRegisterSet0(long unique_thread_id) throws DebuggerException; private native byte[] readBytesFromProcess0(long address, long numBytes) throws DebuggerException; @@ -400,10 +400,15 @@ // /** From the ThreadAccess interface via Debugger and JVMDebugger */ + public ThreadProxy getThreadForIdentifierAddress(Address threadIdAddr, Address uniqueThreadIdAddr) { + return new BsdThread(this, threadIdAddr, uniqueThreadIdAddr); + } + @Override public ThreadProxy getThreadForIdentifierAddress(Address addr) { - return new BsdThread(this, addr); + throw new RuntimeException("unimplemented"); } + /** From the ThreadAccess interface via Debugger and JVMDebugger */ public ThreadProxy getThreadForThreadId(long id) { return new BsdThread(this, id); @@ -449,22 +454,22 @@ // Thread context access // - public synchronized long[] getThreadIntegerRegisterSet(int lwp_id) + public synchronized long[] getThreadIntegerRegisterSet(long unique_thread_id) throws DebuggerException { requireAttach(); if (isCore) { - return getThreadIntegerRegisterSet0(lwp_id); + return getThreadIntegerRegisterSet0(unique_thread_id); } else { class GetThreadIntegerRegisterSetTask implements WorkerThreadTask { - int lwp_id; + long unique_thread_id; long[] result; public void doit(BsdDebuggerLocal debugger) { - result = debugger.getThreadIntegerRegisterSet0(lwp_id); + result = debugger.getThreadIntegerRegisterSet0(unique_thread_id); } } GetThreadIntegerRegisterSetTask task = new GetThreadIntegerRegisterSetTask(); - task.lwp_id = lwp_id; + task.unique_thread_id = unique_thread_id; workerThread.execute(task); return task.result; } diff -r 3e88170d8be2 -r 1ba6a7cfc687 agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java --- a/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java Thu Apr 11 22:44:42 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java Tue Jul 02 02:26:36 2013 +0100 @@ -28,21 +28,23 @@ class BsdThread implements ThreadProxy { private BsdDebugger debugger; - private int lwp_id; + private int thread_id; + private long unique_thread_id; /** The address argument must be the address of the _thread_id in the OSThread. It's value is result ::gettid() call. */ - BsdThread(BsdDebugger debugger, Address addr) { + BsdThread(BsdDebugger debugger, Address threadIdAddr, Address uniqueThreadIdAddr) { this.debugger = debugger; // FIXME: size of data fetched here should be configurable. // However, making it so would produce a dependency on the "types" // package from the debugger package, which is not desired. - this.lwp_id = (int) addr.getCIntegerAt(0, 4, true); + this.thread_id = (int) threadIdAddr.getCIntegerAt(0, 4, true); + this.unique_thread_id = uniqueThreadIdAddr.getCIntegerAt(0, 8, true); } BsdThread(BsdDebugger debugger, long id) { this.debugger = debugger; - this.lwp_id = (int) id; + this.thread_id = (int) id; } public boolean equals(Object obj) { From andrew at icedtea.classpath.org Mon Jul 1 18:30:38 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 01:30:38 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 386 new changesets Message-ID: changeset 87c6c2882d3f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=87c6c2882d3f author: katleman date: Wed Apr 17 12:13:43 2013 -0700 Added tag jdk7u14-b21 for changeset 0a00f10abb2d changeset d4bf5c15837c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d4bf5c15837c author: lana date: Thu Apr 18 14:38:37 2013 -0700 Merge changeset d3fef82a86bb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d3fef82a86bb author: katleman date: Wed Apr 24 12:21:25 2013 -0700 Added tag jdk7u14-b22 for changeset d4bf5c15837c changeset 39a85b6373fa in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=39a85b6373fa author: mullan date: Mon Dec 03 11:07:20 2012 -0500 7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout Summary: Added com.sun.security.ocsp.timeout system property to control timeout Reviewed-by: mullan, vinnie Contributed-by: jason.uh at oracle.com changeset 71fae0a3d111 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=71fae0a3d111 author: mullan date: Thu Apr 25 14:45:16 2013 -0700 8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined Reviewed-by: vinnie changeset 3689db12c7ac in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3689db12c7ac author: mullan date: Fri Apr 26 10:41:35 2013 -0700 8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout Reviewed-by: vinnie changeset a76a886dc057 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a76a886dc057 author: ngthomas date: Tue Apr 30 22:07:48 2013 -0700 Merge changeset b79b064da2a3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b79b064da2a3 author: katleman date: Wed May 01 14:51:39 2013 -0700 Added tag jdk7u40-b23 for changeset a76a886dc057 changeset edf084032dc3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=edf084032dc3 author: anthony date: Tue Apr 24 19:12:47 2012 +0400 7163898: add isLoggable() check to doLog() Summary: Add the check and return immediately if it's false Reviewed-by: anthony, mchung, sla Contributed-by: Nicolas Carranza changeset 313b549c79b9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=313b549c79b9 author: mchung date: Thu Mar 28 13:14:09 2013 -0700 8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level Reviewed-by: mchung Contributed-by: peter.levart at gmail.com, bourges.laurent at gmail.com changeset 3cabe9b4f6cf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3cabe9b4f6cf author: mchung date: Fri Apr 05 10:41:46 2013 -0700 8011380: FX dependency on PlatformLogger broken by 8010309 Reviewed-by: alanb changeset 10c99a79062e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=10c99a79062e author: mchung date: Tue Apr 23 22:50:22 2013 -0700 8007703: Remove com.sun.servicetag API Reviewed-by: dholmes, alanb, erikj changeset 7a0ea184495b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7a0ea184495b author: lana date: Wed Apr 24 18:32:38 2013 -0700 Merge changeset af4766e8f616 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=af4766e8f616 author: serb date: Thu Apr 25 13:38:16 2013 +0400 8000435: [macosx] Button painting error under Java 7 on Mac Reviewed-by: denis, alexsch changeset 549bf714839b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=549bf714839b author: serb date: Fri Apr 26 22:29:03 2013 +0400 8004821: Graphics2D.drawPolygon() fails with IllegalPathStateException Reviewed-by: prr, flar changeset 05420e655463 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=05420e655463 author: alanb date: Wed Apr 17 16:11:19 2013 +0100 8012019: (fc) Thread.interrupt triggers hang in FileChannelImpl.pread (win) Reviewed-by: chegar changeset c43b12d25743 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c43b12d25743 author: malenkov date: Wed May 01 18:35:52 2013 +0400 8007458: [findbugs] One more beans issue, with ReflectionUtils Reviewed-by: art, alexsch changeset d4aefc01d80f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d4aefc01d80f author: lana date: Wed May 01 13:29:37 2013 -0700 Merge changeset 8e3d618505d3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8e3d618505d3 author: lana date: Mon May 06 09:54:45 2013 -0700 Merge changeset fd2743154fcf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fd2743154fcf author: katleman date: Wed May 08 16:52:22 2013 -0700 Added tag jdk7u40-b24 for changeset 8e3d618505d3 changeset e8a95b807123 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e8a95b807123 author: pchelko date: Tue May 07 15:05:51 2013 +0100 7179050: [macosx] Make LWAWT be able to run on AppKit thread Reviewed-by: serb, anthony changeset c19dcbf5d629 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c19dcbf5d629 author: serb date: Tue May 07 18:07:07 2013 +0400 7198229: Painting during resizing of the frame should be more smooth Reviewed-by: anthony, denis, skovatch changeset 47b62182e705 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=47b62182e705 author: pchelko date: Tue May 07 15:08:39 2013 +0100 8006634: Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler Summary: Changed the logic for the nested event loops and deleted deadlock detection Reviewed-by: art, serb, anthony changeset 0361f198b7ba in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0361f198b7ba author: serb date: Tue May 07 18:10:06 2013 +0400 8002308: [macosx] 7198229 should be applied to the user action only Reviewed-by: anthony, skovatch changeset 1059afbc0a7f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1059afbc0a7f author: serb date: Wed May 08 16:54:28 2013 +0400 7124520: [macosx] re:6373505 Toolkit.getScreenResolution() != GraphicsConfiguration.getNormalizingTransform() Reviewed-by: anthony, kizune changeset ee1c1379c035 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee1c1379c035 author: serb date: Wed May 08 18:42:20 2013 +0400 8003173: [macosx] Fullscreen on Mac leaves an empty rectangle Reviewed-by: anthony, alexsch changeset 99b3f9c060b9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=99b3f9c060b9 author: mduigou date: Wed Apr 10 12:43:18 2013 -0700 8011200: (coll) Optimize empty HashMap and ArrayList Reviewed-by: mduigou, alanb, bchristi, martin Contributed-by: Sergey Linetskiy , John Rose , Mike Duigou changeset 52af1f496486 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=52af1f496486 author: serb date: Thu May 09 03:26:41 2013 +0400 8008660: Failure in 2D Queue Flusher thread on Mac Reviewed-by: swingler, bae changeset 0fb7552db146 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0fb7552db146 author: serb date: Thu May 09 03:27:54 2013 +0400 8003169: [macosx] JVM crash after disconnecting from projector Reviewed-by: anthony, alexsch changeset 44eb69320403 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=44eb69320403 author: dxu date: Tue Sep 18 13:14:49 2012 +0100 7142919: TEST_BUG: java/nio/channels/AsyncCloseAndInterrupt.java failing intermittently [sol11] Reviewed-by: alanb changeset 9f9499bb263a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9f9499bb263a author: aywang date: Thu May 09 15:43:25 2013 -0700 8014129: makefile changes to allow integration of new features Reviewed-by: tbell, robilad changeset 1181ca946735 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1181ca946735 author: lana date: Fri May 10 10:57:24 2013 -0700 Merge changeset 52545faaba9a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=52545faaba9a author: weijun date: Mon Apr 22 11:39:53 2013 +0800 8005527: [TEST_BUG] console.sh failed Automatically with exit code 1. Reviewed-by: xuelei changeset 88d337f3e7fe in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=88d337f3e7fe author: weijun date: Wed May 01 21:05:10 2013 +0800 8012082: SASL: auth-conf negotiated, but unencrypted data is accepted, reset to unencrypt Reviewed-by: vinnie changeset 0ab2391bea61 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0ab2391bea61 author: serb date: Mon May 13 16:41:49 2013 +0400 7194902: [macosx] closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed since jdk8b49 7181403: Invalid MouseEvent conversion with SwingUtilities.convertMouseEvent Reviewed-by: malenkov, alexsch changeset fe542af733bc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe542af733bc author: serb date: Mon May 13 17:03:04 2013 +0400 7184945: [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47 Reviewed-by: malenkov, alexsch changeset cda39f32d35b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cda39f32d35b author: khazra date: Mon May 13 14:48:14 2013 -0700 8013140: Heap corruption with NetworkInterface.getByInetAddress() and long i/f name Summary: Remove buffer overruns in native code Reviewed-by: alanb, chegar changeset e55e4808077a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e55e4808077a author: leonidr date: Tue May 14 21:04:32 2013 +0400 8008366: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar Reviewed-by: anthony, serb changeset f584e51acda7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f584e51acda7 author: coffeys date: Thu Apr 25 21:12:35 2013 +0100 8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters Reviewed-by: okutsu changeset 889f9b9f79b4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=889f9b9f79b4 author: coffeys date: Tue May 14 20:10:10 2013 +0100 Merge changeset ac03c48f1d82 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ac03c48f1d82 author: katleman date: Thu May 16 12:15:21 2013 -0700 Added tag jdk7u40-b25 for changeset 889f9b9f79b4 changeset 6ce66ba86478 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6ce66ba86478 author: katleman date: Wed May 22 16:02:00 2013 -0700 Added tag jdk7u40-b26 for changeset ac03c48f1d82 changeset 4e22a3ec8e36 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4e22a3ec8e36 author: katleman date: Wed May 29 13:24:33 2013 -0700 Added tag jdk7u40-b27 for changeset 6ce66ba86478 changeset b9336793e998 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b9336793e998 author: leonidr date: Wed May 15 15:29:39 2013 +0400 2223192: [macosx] "opposite" seems always null in focus events Reviewed-by: anthony changeset e4c0c70ce3bd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e4c0c70ce3bd author: leonidr date: Thu May 16 17:01:50 2013 +0400 8014724: Broken 7u-dev build Reviewed-by: serb changeset 90ab7acf1d7a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=90ab7acf1d7a author: alanb date: Tue May 14 20:32:43 2013 +0100 7152866: Tests not run because they are missing the @run tag Reviewed-by: chegar, dholmes changeset 801a1f2f2664 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=801a1f2f2664 author: alanb date: Wed Apr 24 19:03:07 2013 +0100 8005555: TEST_BUG: java/io/Serializable/accessConstants/AccessConstants.java should be removed Reviewed-by: chegar changeset 1bd5522551a6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1bd5522551a6 author: sla date: Mon Mar 19 14:18:36 2012 +0100 7152798: TEST_BUG: sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java does not compile Summary: Make sure the test is compiled, run and finds it supporting classes Reviewed-by: alanb, sspitsyn, rbackman changeset ab5a2be659de in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ab5a2be659de author: coffeys date: Fri May 17 14:28:37 2013 +0100 Merge changeset 7e73565030c4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7e73565030c4 author: serb date: Fri May 17 22:21:10 2013 +0400 8000629: [macosx] Blurry rendering with Java 7 on Retina display Reviewed-by: anthony, prr, flar changeset 76a967072b83 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=76a967072b83 author: serb date: Sat May 18 01:56:42 2013 +0400 8004866: [macosx] HiDPI support in Aqua L&F Reviewed-by: swingler, alexsch changeset c23785615010 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c23785615010 author: sherman date: Tue May 08 11:16:36 2012 -0700 7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0 Summary: updated SeekableByteChannel.read() to count the bytes read correctly Reviewed-by: sherman Contributed-by: paul.sandoz at oracle.com changeset 1dcdd2e31524 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1dcdd2e31524 author: sherman date: Fri Apr 12 12:12:53 2013 -0700 8002390: (zipfs) Problems moving files between zip file systems Summary: fixed the corner cases in zipfs Reviewed-by: sherman Contributed-by: mark.sheppard at oracle.com changeset 3b6c30f3b201 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3b6c30f3b201 author: ewang date: Tue Mar 05 10:10:55 2013 +0000 8009259: TEST_BUG: sun/misc/Cleaner/exitOnThrow.sh failing intermittently Reviewed-by: chegar, alanb changeset 7103e7d73b6d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7103e7d73b6d author: dingxmin date: Mon Feb 18 08:14:18 2013 +0000 6429204: (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps Reviewed-by: alanb changeset 017bd924a3c8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=017bd924a3c8 author: alanb date: Wed Mar 13 17:58:45 2013 +0000 8009751: (se) Selector spin when select, close and interestOps(0) invoked at same time (lnx) Reviewed-by: zhouyx, chegar, robm changeset 2d54c06ac56b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2d54c06ac56b author: uta date: Wed Mar 13 13:22:02 2013 +0400 7190897: (fs) Files.isWritable method returns false when the path is writable (win) Summary: The [GetEffectiveRightsFromAcl] based implementation was changed to the [AccessCheck] based. Reviewed-by: alanb changeset 23a5c142b13f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=23a5c142b13f author: dxu date: Mon May 06 14:17:59 2013 -0700 8003992: File and other classes in java.io do not handle embedded nulls properly Summary: Have every file operation done with File, FileInputStream, FileOutputStream, or RandomAccessFile that involves a file path containing NUL fail. Also reviewed by fweimer at redhat.com Reviewed-by: alanb, sherman, ahgross, mduigou, dholmes, aph, plevart, martin changeset a13d508c69a8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a13d508c69a8 author: serb date: Mon May 20 15:35:37 2013 +0400 8009012: [macosx] DisplayChangedListener is not implemented in LWWindowPeer/CGraphicsEnvironment Reviewed-by: anthony, bae changeset 0bb10924802a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0bb10924802a author: alanb date: Thu Mar 14 16:59:06 2013 +0000 7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1) Reviewed-by: alanb, chegar Contributed-by: yiming.wang at oracle.com changeset bc8119b0f297 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bc8119b0f297 author: jzavgren date: Tue Mar 05 14:30:18 2013 +0000 8008804: file descriptor leak in src/windows/native/java/net/DualStackPlainSocketImpl.c Reviewed-by: alanb, chegar, dsamersoff changeset 386f40565f83 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=386f40565f83 author: peytoia date: Thu Apr 11 12:22:23 2013 +0900 8009638: Wrong comment for PL in LocaleISOData, 1989 forward Poland is Republic of Poland Reviewed-by: okutsu changeset cbdea5da546b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cbdea5da546b author: kshefov date: Mon May 20 18:21:33 2013 +0400 8011186: [TEST_BUG] java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java failed on windows 8 Reviewed-by: coffeys changeset 1c16f069e9e0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1c16f069e9e0 author: kshefov date: Wed May 22 13:18:35 2013 +0400 8014721: TEST_BUG: java/awt/TrayIcon/DragEventSource/DragEventSource.java fails with java.lang.UnsupportedOperationException Reviewed-by: serb, anthony changeset 7376234e354a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7376234e354a author: pchelko date: Thu May 23 12:39:31 2013 +0100 8005405: [macosx] Drag and Drop: wrong animation when dropped outside any drop target. Summary: Changed the calculation of the drag image offset Reviewed-by: serb, kizune changeset ea21d3a2e49e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ea21d3a2e49e author: pchelko date: Thu May 23 13:10:47 2013 +0100 8005997: [macosx] Printer Dialog opens an additional title bar Reviewed-by: anthony, art changeset 8e6e356df9bd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8e6e356df9bd author: mcherkas date: Thu May 23 17:06:37 2013 +0400 8012004: JInternalFrame not being finalized after closing Reviewed-by: alexsch, alexp changeset bec4d7f840cf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bec4d7f840cf author: lana date: Thu May 23 17:16:02 2013 -0700 Merge changeset c4788be627ad in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c4788be627ad author: erikj date: Fri May 24 08:59:40 2013 +0200 8014969: Use open man pages for non commercial builds Reviewed-by: tbell changeset 34cf6b72042e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34cf6b72042e author: nloodin date: Thu May 23 14:46:44 2013 +0200 8014048: Online user guide of jconsole points incorrect link Reviewed-by: mchung, sla, jbachorik changeset cb92124a3507 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cb92124a3507 author: alexsch date: Fri May 24 15:01:50 2013 +0400 8014924: JToolTip#setTipText() sometimes (very often) not repaints component. Reviewed-by: serb changeset 05e7d9925f3e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=05e7d9925f3e author: andrew date: Fri May 24 16:50:36 2013 +0100 8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker Summary: Replace use of java.security.cert.* to avoid conflict with class in OpenJDK 6. Reviewed-by: mullan changeset d8cb3b571560 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d8cb3b571560 author: nloodin date: Tue May 28 14:39:48 2013 +0200 6470730: Disconnect button leads to wrong popup message Reviewed-by: mchung, dcubed, sla, egahlin changeset d91e77f0de85 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d91e77f0de85 author: dingxmin date: Tue May 28 17:24:58 2013 +0100 8008289: DefaultButtonModel instance keeps stale listeners in html FormView Reviewed-by: malenkov, alexsch changeset 076f18ea2362 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=076f18ea2362 author: ksrini date: Fri May 24 17:01:08 2013 -0700 8007333: [launcher] removes multiple back slashes Reviewed-by: alanb, akhil changeset b28a67552b37 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b28a67552b37 author: prr date: Tue May 28 15:11:03 2013 -0700 8008535: JDK7 Printing : CJK and Latin Text in a string overlap Reviewed-by: bae, jgodinez changeset df02fb90c36d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=df02fb90c36d author: dsamersoff date: Wed May 29 12:04:19 2013 +0400 8014420: Default JDP address does not match the one assigned by IANA Summary: JDP protocol defaults changed to IANA assigned values Reviewed-by: dholmes, jbachorik, hirt Contributed-by: fweimer at redhat.com changeset 224b33e3303f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=224b33e3303f author: weijun date: Fri May 24 17:15:43 2013 +0800 8014196: ktab creates a file with zero kt_vno Reviewed-by: valeriep changeset 98123b18dcb4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=98123b18dcb4 author: serb date: Wed May 29 18:45:46 2013 +0400 8012586: [x11] Modal dialogs for fullscreen window may show behind its owner 8014726: TEST_BUG: java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java should be modified Reviewed-by: anthony, art, serb Contributed-by: vova.kravets at gmail.com, alexander.zvegintsev at oracle.com changeset d61d06e30d0b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d61d06e30d0b author: vinnie date: Wed May 29 20:10:59 2013 +0100 7174966: With OCSP enabled on Java 7 get error 'Wrong key usage' with Comodo certificate Reviewed-by: xuelei changeset afd02b86df42 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=afd02b86df42 author: peytoia date: Thu May 30 14:34:18 2013 +0900 8014469: (tz) Support tzdata2013c 8015570: Use long comparison in Rule.getRules(). Reviewed-by: okutsu changeset e271dc2d12f6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e271dc2d12f6 author: malenkov date: Thu May 30 11:19:29 2013 +0400 8013416: Java Bean Persistence with XMLEncoder Reviewed-by: alexsch changeset df33fcb65568 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=df33fcb65568 author: dfuchs date: Fri May 31 16:30:05 2013 +0200 8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently Summary: Encodings.java sometimes creates EncodingInfo objects whose java names are not recognized by the Charset API. This patch fixes that issue. Reviewed-by: joehw, alanb changeset 204390009589 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=204390009589 author: lana date: Fri May 31 15:42:54 2013 -0700 Merge changeset d3186a0676db in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d3186a0676db author: katleman date: Wed Jun 05 17:46:54 2013 -0700 Added tag jdk7u40-b28 for changeset 204390009589 changeset 1ebda79d86ba in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1ebda79d86ba author: katleman date: Wed Jun 12 19:58:29 2013 -0700 Added tag jdk7u40-b29 for changeset d3186a0676db changeset 75119057b941 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=75119057b941 author: anthony date: Mon Jun 03 16:53:44 2013 +0400 8015303: [macosx] Application launched via custom URL Scheme does not receive URL Summary: Make copies of event parameters Reviewed-by: anthony, swingler, serb Contributed-by: James Tomson changeset b5393be7f815 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b5393be7f815 author: dfuchs date: Mon Jun 03 15:35:00 2013 +0200 8013900: More warnings compiling jaxp. Summary: Some internal implementation classes in Jaxp were redefining equals() without redefining hashCode(). This patch adds hashCode() methods that are consistent with equals(). Reviewed-by: chegar, joehw changeset dc0aeab104f0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dc0aeab104f0 author: jgodinez date: Mon Jun 03 09:50:35 2013 -0700 8012381: [macosx] Collation selection ignored when printing on MacOSX Reviewed-by: jchen, prr changeset 4fdf087a50ae in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4fdf087a50ae author: jgodinez date: Mon Jun 03 09:59:29 2013 -0700 7158350: [macosx] Strange results of SwingUIText printing Reviewed-by: prr, bae changeset f49065b46f8a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f49065b46f8a author: malenkov date: Tue Jun 04 21:19:45 2013 +0400 8013557: XMLEncoder in 1.7 can't encode objects initialized in no argument constructor Reviewed-by: alexsch changeset 4ddf38310049 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4ddf38310049 author: bae date: Tue Jun 04 21:46:24 2013 +0400 8015606: Text is not rendered correctly if destination buffer is custom Reviewed-by: prr, vadim changeset b6d5b700480e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b6d5b700480e author: vkarnauk date: Wed Jun 05 13:43:34 2013 +0400 6436314: Vector could be created with appropriate size in DefaultComboBoxModel Reviewed-by: alexsch changeset e918e166dbe3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e918e166dbe3 author: vkarnauk date: Wed Jun 05 13:49:10 2013 +0400 7068740: If you wrap a JTable in a JLayer you can't use the page up and page down cmds Reviewed-by: alexsch changeset 52f9d3dcb6bd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=52f9d3dcb6bd author: vkarnauk date: Wed Jun 05 13:54:05 2013 +0400 8010721: In JDK7 the menu bar disappears when a Dialog is shown Reviewed-by: anthony changeset 414f86bfaca6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=414f86bfaca6 author: vkarnauk date: Wed Jun 05 14:10:47 2013 +0400 8014863: Line break calculations in Java 7 are incorrect Reviewed-by: alexsch, alexp Contributed-by: dmitry.markov at oracle.com changeset 23e5a8a113bc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=23e5a8a113bc author: alitvinov date: Wed Jun 05 15:16:12 2013 +0400 6337518: Null Arrow Button Throws Exception in BasicComboBoxUI Reviewed-by: alexp, alexsch changeset be5962b333a6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=be5962b333a6 author: alitvinov date: Wed Jun 05 15:19:41 2013 +0400 7151823: The test incorrectly recognizing OS Reviewed-by: serb, alexp changeset f363150cc5f7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f363150cc5f7 author: simonis date: Mon May 06 12:57:42 2013 -0700 7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc Reviewed-by: prr, ceisserer changeset 060ab87975cb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=060ab87975cb author: andrew date: Wed Jun 05 14:16:17 2013 +0100 Merge changeset 21bf0e775ea4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=21bf0e775ea4 author: dsamersoff date: Wed Jun 05 17:19:11 2013 +0400 8015604: JDP packets containing ideographic characters are broken Summary: Code uses string length rather than byte array length and non ascii entry brakes packet. Reviewed-by: dholmes, jbachorik, sla changeset 08c487859f32 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=08c487859f32 author: pchelko date: Wed Jun 05 14:39:35 2013 +0100 8009911: [macosx] SWT app freeze when going full screen using Java 7 on Mac Reviewed-by: anthony, ksrini changeset e43407be037d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e43407be037d author: prr date: Wed Jun 05 07:57:52 2013 -0700 8015556: [macosx] surrogate pairs do not render properly. Reviewed-by: bae, jchen changeset c67bf7ef6881 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c67bf7ef6881 author: malenkov date: Wed Jun 05 20:43:56 2013 +0400 8013370: Null pointer exception when adding more than 9 accelators to a JMenuBar Reviewed-by: serb changeset 61d0911d5bd8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=61d0911d5bd8 author: dmarkov date: Thu Jun 06 18:14:42 2013 +0400 8015375: Edits to text components hang for clipboard access Reviewed-by: anthony, art changeset 3c100c6c3923 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3c100c6c3923 author: alanb date: Fri May 10 14:53:33 2013 +0100 8011128: (fs) Files.createDirectory fails if the resolved path is exactly 248 characters long Reviewed-by: khazra, chegar changeset 9a93f4d2eb5c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9a93f4d2eb5c author: darcy date: Thu Apr 25 09:37:03 2013 -0700 8012044: Give more information about self-suppression from Throwable.addSuppressed Reviewed-by: alanb, dholmes changeset 99a0d93eb8cf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=99a0d93eb8cf author: kshefov date: Fri Jun 07 12:28:53 2013 +0400 7109977: [macosx] MixingInHwPanel.java test fails on Mac trying to click in the reserved corner Reviewed-by: coffeys, serb, anthony changeset fa856e37c8ef in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fa856e37c8ef author: ddehaven date: Fri Jun 07 14:56:56 2013 +0400 7181710: [macosx] jawt_md.h shipped with jdk is outdated Reviewed-by: anthony, art changeset 3b589265048d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3b589265048d author: dl date: Mon Jan 30 11:44:45 2012 +0000 7132378: Race in FutureTask if used with explicit set ( not Runnable ) Reviewed-by: chegar, dholmes changeset 0710f082cdc2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0710f082cdc2 author: lana date: Thu Jun 06 19:10:41 2013 -0700 Merge changeset 2d12e848c02e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2d12e848c02e author: lana date: Fri Jun 07 09:39:46 2013 -0700 Merge changeset 504928f651c7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=504928f651c7 author: jgodinez date: Fri Jun 07 10:55:03 2013 -0700 7183520: [macosx]Unable to print out the defined page for 2D_PrintingTiger/JTablePrintPageRangesTest Reviewed-by: prr, bae changeset 3bd0d3ec8839 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3bd0d3ec8839 author: jgodinez date: Fri Jun 07 10:58:51 2013 -0700 8009199: Printed text become garbage on Mac OSX Reviewed-by: prr, bae changeset a27ef05ab815 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a27ef05ab815 author: kshefov date: Mon Jun 10 18:05:46 2013 +0400 7105030: [TEST_BUG] [macosx] The tests never finishes Reviewed-by: alexsch, serb changeset 62d5a5d4abec in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=62d5a5d4abec author: jgodinez date: Mon Jun 10 09:40:03 2013 -0700 8013810: PrintServiceLookup.lookupPrintServices() does not return consistent result Reviewed-by: prr, jgodinez Contributed-by: patrick at reini.net changeset 6417b1a98b80 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6417b1a98b80 author: coffeys date: Thu Jun 06 14:10:44 2013 +0100 8000450: Restrict access to com/sun/corba/se/impl package Reviewed-by: alanb, chegar, lancea changeset d5a64b1a77b1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d5a64b1a77b1 author: kshefov date: Tue Jun 11 15:34:21 2013 +0400 7184908: TEST_BUG: [macosx] closed/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java fails Reviewed-by: alexsch, serb changeset 6e8c218b8eb8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6e8c218b8eb8 author: robm date: Tue May 28 16:35:17 2013 +0100 7038105: File.isHidden() should return true for pagefile.sys and hiberfil.sys Reviewed-by: alanb changeset 4065ac9fa4b9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4065ac9fa4b9 author: robm date: Thu Jun 06 22:22:56 2013 +0100 8016063: getFinalAttributes should use FindClose Reviewed-by: alanb changeset 80fefc247e3d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=80fefc247e3d author: alanb date: Thu Jun 07 12:31:45 2012 +0100 7164256: EnumMap clone doesn't clear the entrySet keeping a reference to the original Map Reviewed-by: alanb, chegar, forax, mduigou Contributed-by: dbelfer at gmail.com changeset 16d2f8b0eb3c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=16d2f8b0eb3c author: dxu date: Mon Jun 10 11:06:26 2013 -0700 8013827: File.createTempFile hangs with temp file starting with 'com1.4' 8011950: java.io.File.createTempFile enters infinite loop when passed invalid data Reviewed-by: alanb changeset 1e615506a1cc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1e615506a1cc author: alanb date: Wed Jun 22 15:13:29 2011 +0100 7056447: test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java fails in agentvm Reviewed-by: emcmanus changeset 39bd470724e2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=39bd470724e2 author: lana date: Sun Jun 16 22:18:43 2013 -0700 Merge changeset 0e80792291c0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0e80792291c0 author: mullan date: Wed Feb 13 15:43:16 2013 -0500 6741606: Integrate Apache Santuario Reviewed-by: vinnie, hawtin changeset e9e8c27a8e3e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e9e8c27a8e3e author: mullan date: Wed Feb 13 15:47:26 2013 -0500 Merge changeset a5e712ea6944 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a5e712ea6944 author: bae date: Thu Feb 14 19:51:51 2013 +0400 8007014: Improve image handling Reviewed-by: prr, mschoene, jgodinez changeset a36dc31f8aff in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a36dc31f8aff author: katleman date: Thu Feb 14 14:11:40 2013 -0800 Added tag jdk7u21-b02 for changeset a5e712ea6944 changeset 737fff584cd5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=737fff584cd5 author: prr date: Fri Feb 15 11:25:43 2013 -0800 8008249: Sync ICU into JDK : Reviewed-by: bae, jgodinez changeset ae8a62c99239 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ae8a62c99239 author: joehw date: Sat Feb 16 18:04:30 2013 -0800 6657673: Issues with JAXP Reviewed-by: alanb, lancea, ahgross, mullan changeset 9d87f5f84afe in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9d87f5f84afe author: serb date: Tue Feb 19 20:40:48 2013 +0400 8004261: Improve input validation Reviewed-by: art, mschoene, amenkov changeset 6a37e5210ac3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6a37e5210ac3 author: katleman date: Tue Feb 19 17:14:01 2013 -0800 Added tag jdk7u21-b03 for changeset 9d87f5f84afe changeset aff8dc7564f4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=aff8dc7564f4 author: mkos date: Wed Feb 20 22:26:11 2013 +0100 8005432: Update access to JAX-WS Summary: newly restricted the whole package com.sun.xml.internal; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset d8b20e180cc9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d8b20e180cc9 author: bae date: Thu Feb 21 11:25:43 2013 +0400 8007675: Improve color conversion Reviewed-by: prr, jgodinez changeset e0523b05372c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e0523b05372c author: raginip date: Thu Feb 21 12:34:51 2013 -0800 8007406: Improve accessibility of AccessBridge Reviewed-by: skoivu, mullan, ptbrunet changeset 939a9fe61252 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=939a9fe61252 author: bae date: Fri Feb 22 15:14:25 2013 +0400 8007617: Better validation of images Reviewed-by: prr, jgodinez changeset 4910d7a21607 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4910d7a21607 author: dsamersoff date: Mon Feb 25 20:06:22 2013 +0400 8006435: Improvements in JMX Summary: Improvements in JMX Reviewed-by: dfuchs, skoivu changeset 1e530d26e57b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1e530d26e57b author: weijun date: Tue Jul 17 11:57:37 2012 +0800 7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified Reviewed-by: mullan changeset 5c76f6947024 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5c76f6947024 author: alexsch date: Mon Aug 06 15:51:54 2012 +0400 7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue Reviewed-by: rupashka changeset 9204789bb4b7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9204789bb4b7 author: dsamersoff date: Thu Aug 09 17:42:55 2012 +0400 7183753: [TEST] Some colon in the diff for this test Summary: Reference output file contains extra colon Reviewed-by: sspitsyn, mgronlun changeset ba57e4d85891 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ba57e4d85891 author: dmocek date: Sun Feb 24 13:42:45 2013 +0000 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset 84a8e601020c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=84a8e601020c author: dmocek date: Wed Jul 18 10:04:45 2012 -0700 7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java 7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java Reviewed-by: smarks changeset c9c183914982 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c9c183914982 author: dmocek date: Fri Jul 27 16:53:15 2012 -0700 7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup Reviewed-by: smarks, jgish changeset f49ee844919f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f49ee844919f author: dmocek date: Sat Sep 08 00:03:36 2012 -0700 6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently Reviewed-by: dholmes, smarks Contributed-by: Eric Wang changeset 06bf002467f4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=06bf002467f4 author: olagneau date: Mon Aug 27 11:44:45 2012 -0700 7144861: speed up RMI activation tests Reviewed-by: alanb, smarks, dholmes, dmocek changeset 351f20a53068 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=351f20a53068 author: alanb date: Thu Aug 16 14:35:26 2012 +0100 7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin Reviewed-by: alanb, dmocek, smarks Contributed-by: Eric Wang changeset 78379e1f39fa in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=78379e1f39fa author: vkarnauk date: Thu Sep 20 21:08:33 2012 +0400 7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows Reviewed-by: rupashka changeset 1d88263c987f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1d88263c987f author: smarks date: Thu Sep 20 13:29:43 2012 -0700 7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx Reviewed-by: alanb, coffeys changeset 49f4edf487ad in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=49f4edf487ad author: juh date: Fri Sep 28 11:20:31 2012 +0800 7054918: jdk_security1 test target cleanup Reviewed-by: xuelei, weijun changeset 09001da05bc3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09001da05bc3 author: juh date: Fri Sep 28 11:20:32 2012 +0800 7055362: jdk_security2 test target cleanup Reviewed-by: xuelei, weijun changeset 92ab21fc0225 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=92ab21fc0225 author: juh date: Sun Feb 24 14:20:46 2013 +0000 7055363: jdk_security3 test target cleanup Reviewed-by: xuelei, weijun changeset e5332527caa1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e5332527caa1 author: robm date: Thu Oct 11 18:24:38 2012 +0100 7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol] Reviewed-by: alanb, martin, dholmes changeset 201ecfb75ff1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=201ecfb75ff1 author: robm date: Mon Oct 15 03:26:11 2012 +0100 8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java Reviewed-by: alanb, martin changeset 4d52c56c969d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4d52c56c969d author: dxu date: Mon Jul 30 04:57:27 2012 +0100 7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win] Reviewed-by: alanb changeset d27b051605b6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d27b051605b6 author: alanb date: Sat Sep 10 14:55:14 2011 +0100 7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile Reviewed-by: darcy, jrose changeset ac8c4bc4034f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ac8c4bc4034f author: weijun date: Sat Jul 21 19:56:55 2012 +0800 7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout Reviewed-by: xuelei changeset 08b6968e01b3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=08b6968e01b3 author: dfuchs date: Wed Nov 07 13:24:39 2012 +0100 6720349: (ch) Channels tests depending on hosts inside Sun Summary: This changeset make the nio tests start small TCP or UDP servers from within the tests, instead of relying on external services. Reviewed-by: alanb changeset b136c427bd0e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b136c427bd0e author: alanb date: Fri Jun 24 19:30:39 2011 +0100 6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long Reviewed-by: chegar changeset dddebb6016bd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dddebb6016bd author: weijun date: Thu Oct 27 17:23:25 2011 +0800 7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu Reviewed-by: alanb changeset 68427d98767e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=68427d98767e author: alanb date: Sun Jun 10 10:29:27 2012 +0100 7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset Reviewed-by: minqi changeset e7addf490f64 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e7addf490f64 author: robm date: Wed Nov 28 00:47:38 2012 +0000 8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests Reviewed-by: chegar changeset 81f11fc4e289 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=81f11fc4e289 author: kshefov date: Fri Nov 30 15:21:53 2012 +0000 7072120: No mac os x support in several regression tests Reviewed-by: anthony, serb changeset e61255f12eb9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e61255f12eb9 author: kshefov date: Fri Nov 30 15:36:11 2012 +0000 7147408: [macosx] Add autodelay to fix a regression test Reviewed-by: anthony, alexsch changeset 0079a2150886 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0079a2150886 author: smarks date: Wed Dec 12 09:53:01 2012 -0800 8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung changeset c99213bc620f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c99213bc620f author: alexp date: Fri Dec 21 18:59:10 2012 +0400 8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx Reviewed-by: anthony, alexsch changeset 1f0e52931b0f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1f0e52931b0f author: weijun date: Tue Jul 17 11:28:16 2012 +0800 7183203: ShortRSAKeynnn.sh tests intermittent failure Reviewed-by: xuelei changeset b63606fafce3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b63606fafce3 author: kshefov date: Thu Jan 17 14:47:01 2013 +0000 7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default Reviewed-by: yan, alexsch changeset a83eb49fa0a1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a83eb49fa0a1 author: robm date: Sun Feb 24 16:53:31 2013 +0000 7162111: TEST_BUG: change tests run in headless mode [macosx] Reviewed-by: uta changeset aa88f22e90ab in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=aa88f22e90ab author: alanb date: Mon Nov 21 12:51:30 2011 +0000 7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently Reviewed-by: forax, chegar, dholmes Contributed-by: gary.adams at oracle.com changeset 09860239dce3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09860239dce3 author: juh date: Thu Jan 31 16:47:54 2013 -0500 8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode Reviewed-by: mullan changeset 23e4490b1461 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=23e4490b1461 author: weijun date: Fri Feb 01 07:39:41 2013 +0800 8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit Reviewed-by: alanb changeset 61dc35e261d5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=61dc35e261d5 author: chegar date: Tue Mar 13 09:33:50 2012 +0000 7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate Reviewed-by: alanb changeset aafeffc6996d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=aafeffc6996d author: chegar date: Thu Dec 13 09:55:55 2012 +0000 8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff changeset e0099d8fe88c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e0099d8fe88c author: chegar date: Sat Dec 29 11:00:15 2012 +0000 8005556: java/net/Socks/SocksV4Test.java is missing @run tag Reviewed-by: alanb changeset 98fd6a425355 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=98fd6a425355 author: chegar date: Sun Jan 20 09:37:51 2013 +0000 8006560: java/net/ipv6tests/B6521014.java fails intermittently Reviewed-by: khazra, wetmore changeset fedc35c8b46b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fedc35c8b46b author: jgish date: Wed Dec 05 21:08:14 2012 -0800 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks changeset e2fb111a4be0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e2fb111a4be0 author: jgish date: Thu Jan 17 15:09:46 2013 -0500 8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times Summary: Increase number of retries to twice the number of ports in the reserved range Reviewed-by: mduigou changeset 4c0d2f6dd20c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4c0d2f6dd20c author: smarks date: Thu Dec 20 20:11:45 2012 -0800 8005290: remove -showversion from RMI test library subprocess mechanism Reviewed-by: jgish, chegar, dmocek changeset ab13edf4532c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ab13edf4532c author: chegar date: Wed Jan 23 14:45:44 2013 +0000 8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac Reviewed-by: alanb changeset 9968e92494e2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9968e92494e2 author: smarks date: Mon Jan 07 18:09:07 2013 -0800 7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently Summary: Tighten up JavaVM test library API, and adjust tests to match. Reviewed-by: mchung, dmocek changeset b3cd489501f4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b3cd489501f4 author: smarks date: Tue Jan 22 18:30:49 2013 -0800 8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running Reviewed-by: mchung changeset 51877c178a00 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=51877c178a00 author: kshefov date: Mon Feb 11 14:37:57 2013 +0000 7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal Reviewed-by: serb, alexsch changeset 8dbc6c8923e7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8dbc6c8923e7 author: chegar date: Fri Sep 07 14:00:31 2012 +0100 7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address Summary: TESTBUG Reviewed-by: chegar, alanb Contributed-by: Eric Wang changeset 666a4b5ed3b6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=666a4b5ed3b6 author: chegar date: Wed Apr 04 15:14:00 2012 +0100 6963841: java/util/concurrent/Phaser/Basic.java fails intermittently Reviewed-by: dl, dholmes changeset 6304301913e2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6304301913e2 author: chegar date: Wed Nov 23 12:30:19 2011 +0000 6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX Reviewed-by: chegar, dholmes Contributed-by: gary.adams at oracle.com changeset 156fa7032946 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=156fa7032946 author: chegar date: Thu Aug 25 16:08:31 2011 +0100 7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 Reviewed-by: alanb, chegar Contributed-by: kurchi.subhra.hazra at oracle.com changeset 099da739d51a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=099da739d51a author: chegar date: Tue Aug 09 16:39:04 2011 +0100 7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) Reviewed-by: mchung changeset 3092790deb93 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3092790deb93 author: chegar date: Tue Aug 09 16:59:44 2011 +0100 7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin Reviewed-by: alanb, dcubed changeset 1ce6a6a06398 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1ce6a6a06398 author: chegar date: Wed Feb 08 11:16:52 2012 +0000 7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc Reviewed-by: dholmes changeset f6598a50f748 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f6598a50f748 author: chegar date: Tue Nov 06 21:01:43 2012 +0000 8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently Reviewed-by: alanb, dsamersoff changeset 2f2396e06665 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2f2396e06665 author: gadams date: Wed Feb 08 11:18:29 2012 +0000 6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient Reviewed-by: chegar, dholmes, alanb changeset 8e528f3b7c55 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8e528f3b7c55 author: gadams date: Wed Feb 08 11:19:25 2012 +0000 6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing Reviewed-by: chegar, dholmes, alanb changeset d1e8b3418f9e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d1e8b3418f9e author: gadams date: Mon Jan 09 19:33:02 2012 +0000 7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space Reviewed-by: alanb changeset 009f33e56cdf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=009f33e56cdf author: khazra date: Tue Apr 17 11:59:12 2012 -0700 7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows Summary: Remove usage of HTTP Server at test/sun/net/www/httptest Reviewed-by: chegar, alanb changeset 4f5897ab2603 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4f5897ab2603 author: khazra date: Thu Apr 19 13:26:06 2012 -0700 7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again Summary: Enable finding "foo1.jar" Reviewed-by: chegar changeset c1917562bcd5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c1917562bcd5 author: alanb date: Sat Nov 19 19:55:19 2011 +0000 6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently Reviewed-by: dholmes, alanb, forax Contributed-by: gary.adams at oracle.com changeset 35961dabc4ec in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=35961dabc4ec author: alanb date: Sat Nov 19 20:03:00 2011 +0000 6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java Reviewed-by: alanb, dholmes, forax Contributed-by: gary.adams at oracle.com changeset 459b649cb1ea in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=459b649cb1ea author: smarks date: Tue Feb 12 14:41:18 2013 -0800 8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 Reviewed-by: alanb, mchung, dmocek changeset fda293be88c3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fda293be88c3 author: kshefov date: Thu Feb 14 14:14:19 2013 +0000 7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified Summary: Added @build Util jtreg tag Reviewed-by: serb, alexsch Contributed-by: Vera Akulova changeset f42ad70d2a23 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f42ad70d2a23 author: kshefov date: Mon Feb 18 09:31:10 2013 +0000 8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. Reviewed-by: serb, denis Contributed-by: Vera Akulova changeset 624afe258567 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=624afe258567 author: chegar date: Fri Feb 15 11:06:52 2013 +0000 8008223: java/net/BindException/Test.java fails rarely Reviewed-by: khazra, alanb changeset 945206693c9c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=945206693c9c author: fparain date: Wed Feb 15 09:29:05 2012 -0800 7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently Reviewed-by: alanb changeset 162d99fca364 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=162d99fca364 author: sla date: Tue Mar 20 12:48:48 2012 +0100 7154114: jstat tests failing on non-english locales 7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system Reviewed-by: rbackman, kamg, dsamersoff changeset 5dd979f0ef06 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5dd979f0ef06 author: sla date: Mon Oct 29 09:23:55 2012 +0100 8001621: Update awk scripts that check output from jps/jcmd Reviewed-by: alanb changeset f2ce22226ca2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f2ce22226ca2 author: kshefov date: Wed Feb 20 17:07:30 2013 +0000 8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. Reviewed-by: serb, anthony changeset 0cda40f881f6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0cda40f881f6 author: fparain date: Tue Feb 14 07:28:29 2012 -0800 7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData Reviewed-by: fparain, dholmes changeset dd05955627f9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dd05955627f9 author: sla date: Wed Sep 05 14:42:44 2012 +0200 6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh Summary: Make tests more resilient by allowing for more error messages from jps Reviewed-by: alanb, rbackman, dsamersoff changeset 2506caa34870 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2506caa34870 author: jjg date: Tue Aug 28 10:29:30 2012 +0100 7194032: update tests for upcoming changes for jtreg Reviewed-by: alanb, iris, smarks changeset 46126bc51bb8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=46126bc51bb8 author: jjg date: Tue Aug 28 10:31:27 2012 +0100 7194035: update tests for upcoming changes for jtreg Reviewed-by: alanb, sspitsyn changeset a0853a216bd3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a0853a216bd3 author: coffeys date: Mon Feb 25 16:17:37 2013 +0000 8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up Reviewed-by: chegar, alanb changeset 093a1890be06 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=093a1890be06 author: coffeys date: Mon Feb 25 16:24:49 2013 +0000 Merge changeset 05c784caa6d9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=05c784caa6d9 author: prr date: Mon Feb 25 09:52:53 2013 -0800 8004986: Better handling of glyph table 8004987: Improve font layout 8004994: Improve checking of glyph table Reviewed-by: bae, mschoene, jgodinez Contributed-by: steven.loomis at oracle.com changeset 278325d15b3d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=278325d15b3d author: bae date: Tue Feb 26 00:15:17 2013 +0400 8007667: Better image reading Reviewed-by: prr, jgodinez changeset 292cce668342 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=292cce668342 author: bae date: Tue Feb 26 01:27:17 2013 +0400 8007918: Better image writing Reviewed-by: prr, jgodinez changeset 139d3e3b62d4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=139d3e3b62d4 author: uta date: Tue Feb 26 15:58:40 2013 +0400 8005943: (process) Improved Runtime.exec Reviewed-by: alanb, ahgross changeset 52c41d308415 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=52c41d308415 author: katleman date: Tue Feb 26 12:45:21 2013 -0800 Added tag jdk7u21-b04 for changeset 139d3e3b62d4 changeset 1111f9acb96b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1111f9acb96b author: bae date: Wed Feb 27 11:53:10 2013 +0400 8001034: Memory management improvements Reviewed-by: prr, jgodinez changeset b1a2b9ac9714 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b1a2b9ac9714 author: alanb date: Wed Feb 27 11:50:30 2013 +0000 8004288: (fs) Files.probeContentType problems Reviewed-by: ahgross, sherman changeset bdbb9f5a2ee7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bdbb9f5a2ee7 author: smarks date: Wed Feb 27 13:58:55 2013 -0800 8001040: Rework RMI model Reviewed-by: alanb, ahgross, coffeys, dmocek changeset c450b20e8030 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c450b20e8030 author: smarks date: Wed Feb 27 15:04:56 2013 -0800 Merge changeset 294da2a34164 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=294da2a34164 author: vlivanov date: Fri Mar 01 03:50:17 2013 +0400 8009049: Better method handle binding Reviewed-by: jrose, twisti, jdn changeset 69fecef67912 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=69fecef67912 author: vlivanov date: Fri Mar 01 03:50:33 2013 +0400 8008140: Better method handle resolution Reviewed-by: jrose, twisti, jdn changeset ff402baefe38 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ff402baefe38 author: dsamersoff date: Fri Mar 01 21:35:49 2013 +0400 8009165: Fix for 8008817 needs revision Summary: The fix for JDK-8008817 added a new ReflectUtil.ensureClassAccess method which is not an appropriate utility method in ReflectUtil. Reviewed-by: alanb, mchung, dfuchs changeset 9b80592b0113 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9b80592b0113 author: chegar date: Sun Mar 03 10:11:45 2013 +0000 8009063: Improve reliability of ConcurrentHashMap Reviewed-by: alanb, ahgross changeset a46991f99fc3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a46991f99fc3 author: srl date: Mon Mar 04 12:29:30 2013 -0800 8001031: Better font processing. Reviewed-by: vadim, prr, mschoene changeset 285765be3123 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=285765be3123 author: dmocek date: Mon Mar 04 14:34:15 2013 -0800 8000638: Improve deserialization Reviewed-by: smarks, hawtin, mchung changeset be15531f9b71 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=be15531f9b71 author: srl date: Wed Mar 06 06:44:14 2013 -0800 8009530: ICU Kern table support broken Reviewed-by: prr, vadim changeset 2e06b7765cb7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2e06b7765cb7 author: jbachorik date: Thu Mar 07 14:05:05 2013 +0100 8008603: Improve provision of JMX providers Reviewed-by: alanb, dfuchs, jfdenise, skoivu changeset d972b493d2f4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d972b493d2f4 author: uta date: Fri Mar 08 13:47:02 2013 +0400 8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. Reviewed-by: alanb, ahgross changeset 449039ad3109 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=449039ad3109 author: valeriep date: Mon Mar 11 20:05:37 2013 -0700 8009610: Blacklist certificate used with malware. Summary: updated the black list and the reg test with the new cert. Reviewed-by: weijun changeset ee66b912f65b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee66b912f65b author: jbachorik date: Tue Mar 12 09:34:26 2013 +0100 8009038: Improve JMX notification support Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset 7fd0922d6ed2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7fd0922d6ed2 author: jbachorik date: Tue Mar 12 11:09:37 2013 +0100 8009034: Improve resulting notifications in JMX Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset b2bd9d9b28f5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b2bd9d9b28f5 author: katleman date: Tue Mar 12 14:45:23 2013 -0700 Added tag jdk7u25-b01 for changeset 7fd0922d6ed2 changeset b8fa2ba65c47 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b8fa2ba65c47 author: jbachorik date: Thu Mar 14 14:42:12 2013 +0100 8008585: Better JMX data handling Reviewed-by: alanb, dfuchs, jfdenise, skoivu, sjiang changeset 34dd146e8438 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34dd146e8438 author: jbachorik date: Thu Mar 14 14:45:55 2013 +0100 8008607: Better input checking in JMX Reviewed-by: dfuchs, mchung, skoivu, sjiang changeset d3fc37cd366f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d3fc37cd366f author: kvn date: Thu Mar 14 08:55:04 2013 -0700 8009677: Better setting of setters Reviewed-by: ahgross, jrose, twisti changeset 6e0721fb94e1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6e0721fb94e1 author: bae date: Thu Mar 14 20:11:45 2013 +0400 7053526: Upgrade JDK 8 to use Little CMS 2.4 Reviewed-by: prr, jgodinez changeset 8dd8266a2f4b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8dd8266a2f4b author: khazra date: Thu Mar 14 13:54:32 2013 -0700 7170730: Improve Windows network stack support. Summary: Enable exclusive binding of ports on Windows Reviewed-by: alanb, chegar, ahgross changeset 4c690b73a79f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4c690b73a79f author: dfuchs date: Thu Mar 14 17:27:32 2013 +0100 8009305: Improve AWT data transfer Reviewed-by: art, skoivu, smarks, ant changeset 1d14cb00aa71 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1d14cb00aa71 author: dfuchs date: Mon Mar 11 15:07:19 2013 +0100 8001322: Refactor deserialization Reviewed-by: mchung, skoivu, smarks changeset 6c99bbdc35ff in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6c99bbdc35ff author: dfuchs date: Thu Mar 14 21:17:42 2013 +0000 Merge changeset 25ebac17c3cb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=25ebac17c3cb author: dmocek date: Wed Mar 13 17:24:34 2013 -0700 8001033: Refactor network address handling in virtual machine identifiers Reviewed-by: smarks, hawtin, mchung changeset 4d07143f514c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4d07143f514c author: robm date: Fri Mar 15 01:43:04 2013 +0000 8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version Reviewed-by: alanb changeset 49a3711e4c99 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=49a3711e4c99 author: dfuchs date: Fri Mar 15 17:59:10 2013 +0100 8001043: Clarify definition restrictions Reviewed-by: alanb, skoivu, smarks changeset 9452e451224a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9452e451224a author: lancea date: Sat Mar 16 10:08:14 2013 -0400 8009814: Better driver management Reviewed-by: alanb, skoivu changeset 48aff3ba41eb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=48aff3ba41eb author: jbachorik date: Mon Mar 18 11:17:06 2013 +0100 8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail Reviewed-by: dfuchs, dholmes changeset ae0dfa5bb05b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ae0dfa5bb05b author: jfdenise date: Mon Mar 18 13:50:19 2013 +0100 8009004: Better implementation of RMI connections Summary: Better class handling. Reviewed-by: alanb, dfuchs, skoivu, jbachorik Contributed-by: jean-francois.denise at oracle.com changeset 3927a18bbcbf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3927a18bbcbf author: sla date: Mon Mar 18 15:22:51 2013 +0100 8003703: Update RMI connection dialog box Reviewed-by: skoivu, ahgross, mchung, jbachorik changeset 5da72f23bfa9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5da72f23bfa9 author: smarks date: Mon Mar 18 18:05:31 2013 -0700 8009857: Problem with plugin Reviewed-by: jdn, mchung changeset 7293ed355706 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7293ed355706 author: robm date: Tue Mar 19 16:52:53 2013 +0000 8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) Reviewed-by: kvn changeset 846304f476f1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=846304f476f1 author: leonidr date: Tue Mar 19 21:13:09 2013 +0400 8004584: Augment applet contextualization Summary: Do not create the main AppContext for applets Reviewed-by: art, ahgross changeset ca1cdb0ca372 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ca1cdb0ca372 author: katleman date: Tue Mar 19 14:31:47 2013 -0700 Added tag jdk7u25-b02 for changeset 846304f476f1 changeset be8500a31d10 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=be8500a31d10 author: sjiang date: Tue Mar 19 18:45:19 2013 +0100 8007467: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, mchung, skoivu changeset b4c36757fe45 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b4c36757fe45 author: sjiang date: Tue Mar 19 11:18:45 2013 -0700 Merge changeset 3079d056c9bd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3079d056c9bd author: sjiang date: Tue Mar 19 17:01:40 2013 -0700 Merge changeset a7299af2af32 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a7299af2af32 author: khazra date: Wed Mar 20 13:39:56 2013 -0700 8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build Summary: Eliminate fall-through while setting socket options on Windows Reviewed-by: alanb, chegar changeset 4047e9efcbd0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4047e9efcbd0 author: bae date: Thu Mar 21 11:52:10 2013 +0400 8007927: Improve cmsAllocProfileSequenceDescription Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 2c71b4f2104b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2c71b4f2104b author: bae date: Thu Mar 21 12:02:04 2013 +0400 8007929: Improve CurvesAlloc Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 0a3f502b1026 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0a3f502b1026 author: jbachorik date: Thu Mar 21 09:26:55 2013 +0100 8008623: Better handling of MBeanServers Reviewed-by: dfuchs, dholmes, skoivu changeset 8ebdc80ffbc7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8ebdc80ffbc7 author: vinnie date: Thu Mar 21 10:42:36 2013 +0000 8009067: Improve storing keys in KeyStore Reviewed-by: mullan, skoivu changeset c98afec1bf86 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c98afec1bf86 author: anthony date: Thu Mar 21 17:04:01 2013 +0400 8009071: Improve shape handling Reviewed-by: art, mschoene changeset 753eea1a0e03 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=753eea1a0e03 author: egahlin date: Thu Mar 21 13:56:28 2013 +0100 8008611: Better handling of annotations in JMX Reviewed-by: skoivu, dholmes, jfdenise changeset 6d4d0b939099 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6d4d0b939099 author: dsamersoff date: Thu Mar 21 22:32:42 2013 +0400 8007471: Improve MBean notifications Summary: Improve MBean notifications Reviewed-by: dfuchs, mchung, alanb, skoivu changeset df597b1ebb4b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=df597b1ebb4b author: sjiang date: Thu Mar 21 18:27:25 2013 +0100 8008616: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, skoivu, dholmes changeset 975d1f8c48dc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=975d1f8c48dc author: sjiang date: Thu Mar 21 10:49:14 2013 -0700 Merge changeset 88c913e066d8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=88c913e066d8 author: sjiang date: Thu Mar 21 23:07:09 2013 -0700 Merge changeset c2fb1948c39f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c2fb1948c39f author: jfdenise date: Fri Mar 22 10:02:24 2013 +0100 8008128: Better API coherence for JMX Summary: Permission for getting classloader Reviewed-by: alanb, dfuchs, skoivu Contributed-by: jean-francois.denise at oracle.com changeset ee10aa75d397 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee10aa75d397 author: coffeys date: Thu Mar 21 22:38:46 2013 +0000 Merge changeset a424696cf0e4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a424696cf0e4 author: coffeys date: Fri Mar 22 09:35:50 2013 +0000 Merge changeset ec931d812faa in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ec931d812faa author: lancea date: Fri Mar 22 15:40:16 2013 -0400 8009554: Improve SerialJavaObject.getFields Reviewed-by: alanb, skoivu changeset 0ca6cbe3f350 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0ca6cbe3f350 author: dmeetry date: Mon Mar 25 12:41:55 2013 +0400 8001309: Better handling of annotation interfaces Reviewed-by: darcy changeset 141facdacbf0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=141facdacbf0 author: smarks date: Mon Mar 25 17:05:30 2013 +0000 8008132: Better serialization support Reviewed-by: alanb, hawtin changeset 5d5ca338574f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5d5ca338574f author: jfranck date: Mon Mar 25 20:18:21 2013 +0100 8007812: (reflect) Class.getEnclosingMethod problematic for some classes Summary: Better checking in getEnclosing(Method|Constructor|Class) Reviewed-by: darcy, ahgross, mchung changeset a0f09271d2c5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a0f09271d2c5 author: bae date: Tue Mar 26 11:56:00 2013 +0400 8009013: Better handling of T2K glyphs Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 2a444d8e36eb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2a444d8e36eb author: dsamersoff date: Tue Mar 26 22:45:55 2013 +0400 8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 Summary: Test was fixed to reflect changes in jcmd output, but reference jcmd output was not changed. Reviewed-by: dholmes changeset 2a30592312af in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2a30592312af author: katleman date: Tue Mar 26 14:17:58 2013 -0700 Added tag jdk7u25-b03 for changeset 2a444d8e36eb changeset ffef9e05564e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ffef9e05564e author: dsamersoff date: Wed Mar 27 14:32:58 2013 +0400 8008120: Improve JMX class checking Summary: Improve JMX class checking Reviewed-by: mchung, dfuchs, alanb, skoivu changeset 160cde99bb1a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=160cde99bb1a author: jbachorik date: Wed Mar 27 13:29:22 2013 +0100 8010209: Better provision of factories Reviewed-by: dcubed, ahgross changeset 76517dad144d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=76517dad144d author: peytoia date: Fri Mar 15 20:35:51 2013 +0900 8009987: (tz) Support tzdata2013b Reviewed-by: okutsu changeset b1cf36f3435c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b1cf36f3435c author: asaha date: Wed Mar 27 13:06:08 2013 -0700 Merge changeset c78694100fa2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c78694100fa2 author: jbachorik date: Thu Mar 28 09:39:26 2013 +0100 8008982: Adjust JMX for underlying interface changes Reviewed-by: mchung, dholmes, dfuchs, skoivu changeset 09c14ca57ff0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09c14ca57ff0 author: bae date: Thu Mar 28 22:17:04 2013 +0400 8001038: Resourcefully handle resources Reviewed-by: mschoene, prr, bae Contributed-by: jia-hong.chen at oracle.com changeset 56f01b89d8b8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=56f01b89d8b8 author: bae date: Thu Mar 28 23:01:08 2013 +0400 8007925: Improve cmsStageAllocLabV2ToV4curves 8007926: Improve cmsPipelineDup Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset c14aa930b032 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c14aa930b032 author: dsamersoff date: Thu Mar 28 23:39:28 2013 +0400 8008124: Better compliance testing Summary: Better compliance testing Reviewed-by: dfuchs, jfdenise, skoivu, alanb changeset cc656d61e713 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cc656d61e713 author: khazra date: Thu Mar 28 14:59:22 2013 -0700 8001318: Socket.getLocalAddress not consistent with InetAddress.getLocalHost Reviewed-by: alanb, chegar, hawtin changeset 8718da8c36f3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8718da8c36f3 author: bae date: Fri Mar 29 10:30:31 2013 +0400 8009654: Improve stability of cmsnamed Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 91ce9432f88d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=91ce9432f88d author: serb date: Sat Mar 30 22:45:54 2013 +0400 8006328: Improve robustness of sound classes 8009057: Improve MIDI event handling Reviewed-by: amenkov, art, skoivu changeset f38991767794 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f38991767794 author: prr date: Sun Mar 31 09:05:58 2013 -0700 8005007: Better glyph processing Reviewed-by: srl, mschoene, bae changeset 7fc6c331082c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7fc6c331082c author: leonidr date: Tue Apr 02 02:01:04 2013 +0400 8001308: Update display of applet windows Summary: Implemented security warning for OS X port Reviewed-by: art, anthony, serb, skoivu changeset 4181f947e8b0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4181f947e8b0 author: katleman date: Tue Apr 02 12:12:22 2013 -0700 Added tag jdk7u25-b04 for changeset 7fc6c331082c changeset c80531786682 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c80531786682 author: sundar date: Fri Apr 05 15:39:25 2013 +0530 8006611: Improve scripting Reviewed-by: mchung, jdn changeset 05a8336b1eab in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=05a8336b1eab author: mullan date: Fri Apr 05 08:33:25 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 845c9121b16d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=845c9121b16d author: mullan date: Fri Apr 05 08:49:33 2013 -0400 Merge changeset 6c00e5d483b9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6c00e5d483b9 author: mchung date: Fri Apr 05 08:43:00 2013 -0700 8011557: Improve reflection utility classes Reviewed-by: ahgross, alanb changeset 41529646ab84 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=41529646ab84 author: chegar date: Fri Apr 05 18:12:11 2013 +0100 8008593: Better URLClassLoader resource management Reviewed-by: alanb, sherman, hawtin changeset b3ccc94f79fa in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b3ccc94f79fa author: jgish date: Wed Mar 13 11:24:48 2013 -0400 8002070: Remove the stack search for a resource bundle for Logger to use Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) Reviewed-by: mchung changeset 31c487a93b19 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=31c487a93b19 author: jgish date: Fri Apr 05 14:28:42 2013 -0400 Merge changeset 8ab8387ae741 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8ab8387ae741 author: coffeys date: Fri Apr 05 21:34:42 2013 +0100 Merge changeset 4c3d38927a26 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4c3d38927a26 author: prr date: Mon Apr 08 12:41:09 2013 -0700 8011248: Better Component Rasters Reviewed-by: bae, vadim, mschoene changeset 3cd4bec64e31 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3cd4bec64e31 author: prr date: Mon Apr 08 12:46:20 2013 -0700 8011253: Better Short Component Rasters Reviewed-by: bae, vadim, mschoene changeset 259d4998ce2f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=259d4998ce2f author: prr date: Mon Apr 08 12:48:19 2013 -0700 8011253: Better Byte Component Rasters Reviewed-by: bae, vadim, mschoene changeset 84acc064cadd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=84acc064cadd author: vinnie date: Mon Apr 08 21:17:57 2013 +0100 8009235: Improve handling of TSA data Reviewed-by: ahgross, mullan changeset 600fc9cb4696 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=600fc9cb4696 author: coffeys date: Mon Apr 08 23:15:22 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross changeset d0e8dd6dd7a5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d0e8dd6dd7a5 author: mchung date: Mon Apr 08 18:49:18 2013 -0700 8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive Reviewed-by: alanb, twisti, jrose, kvn changeset 41e4ab96d0ed in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=41e4ab96d0ed author: katleman date: Mon Mar 04 14:17:26 2013 -0800 Added tag jdk7u17-b32 for changeset 6c6b9d7943e7 changeset 322261dcbd18 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=322261dcbd18 author: asaha date: Mon Apr 08 15:58:22 2013 -0700 Merge changeset e612d69c3978 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e612d69c3978 author: asaha date: Mon Apr 08 16:32:35 2013 -0700 Merge changeset afdba2ff7ddc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=afdba2ff7ddc author: asaha date: Mon Apr 08 21:43:18 2013 -0700 Merge changeset 97b9792d98c7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=97b9792d98c7 author: anthony date: Tue Apr 09 12:08:53 2013 +0400 8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows Reviewed-by: art, yan changeset 89d9ec9e80c1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=89d9ec9e80c1 author: bae date: Tue Apr 09 15:03:29 2013 +0400 8011243: Improve ImagingLib Reviewed-by: mschoene, prr, vadim changeset 9efb5fb77027 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9efb5fb77027 author: vlivanov date: Tue Apr 09 17:38:32 2013 +0400 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset 153a6abe4a4c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=153a6abe4a4c author: asaha date: Tue Apr 09 12:39:40 2013 -0700 8011806: 7u25-b05 hotspot fastdebug build failure Summary: Backed out changeset 05a8336b1eab Reviewed-by: mullan changeset 5d4d557f374f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5d4d557f374f author: asaha date: Tue Apr 09 12:40:19 2013 -0700 Merge changeset f2d4da9ba0f0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f2d4da9ba0f0 author: asaha date: Tue Apr 09 13:25:25 2013 -0700 Merge changeset 7f4156b0b8d7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7f4156b0b8d7 author: pchelko date: Wed Apr 10 14:28:10 2013 +0400 8010009: [macosx] Unable type into online word games on MacOSX Reviewed-by: anthony, dcherepanov, yan changeset 80d5cd2519bf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=80d5cd2519bf author: katleman date: Wed Apr 10 12:43:06 2013 -0700 Added tag jdk7u25-b05 for changeset f2d4da9ba0f0 changeset 5748526c96f0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5748526c96f0 author: katleman date: Wed Apr 10 12:51:58 2013 -0700 Merge changeset f602974a14c3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f602974a14c3 author: bae date: Fri Apr 12 14:15:17 2013 +0400 8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 Reviewed-by: prr, vadim changeset d59dc08047fd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d59dc08047fd author: bae date: Mon Apr 15 14:15:21 2013 +0400 8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris Reviewed-by: prr, vadim changeset 54f27df0e410 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=54f27df0e410 author: katleman date: Tue Apr 16 11:28:12 2013 -0700 Added tag jdk7u25-b06 for changeset 5748526c96f0 changeset cb27c7d6e1fb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cb27c7d6e1fb author: asaha date: Tue Apr 16 12:14:40 2013 -0700 Merge changeset 898c92b7ab12 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=898c92b7ab12 author: leonidr date: Tue Apr 16 18:52:44 2013 +0400 8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. Summary: EventQueue shoudn't use AppContext.getAppContext() to obtain its AppContext. Reviewed-by: art, serb changeset fe514475bc17 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe514475bc17 author: asaha date: Tue Apr 16 12:20:53 2013 -0700 Merge changeset db57f06c2c8d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=db57f06c2c8d author: jgish date: Tue Apr 16 16:34:14 2013 -0400 8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows Summary: Fix URL to reliably work on all platforms Reviewed-by: duke changeset 97138fb79291 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=97138fb79291 author: katleman date: Thu Apr 18 11:44:29 2013 -0700 Added tag jdk7u25-b07 for changeset fe514475bc17 changeset 5fc00e7f7f5b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5fc00e7f7f5b author: asaha date: Thu Apr 18 14:00:28 2013 -0700 Merge changeset f6dce3552285 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f6dce3552285 author: mullan date: Thu Apr 18 17:53:27 2013 -0400 8001330: Improve on checking order 8011896: Add check for invalid offset for new AccessControlContext isAuthorized field Reviewed-by: acorn, hawtin changeset e6b6c254fab2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e6b6c254fab2 author: mullan date: Thu Apr 18 17:57:54 2013 -0400 Merge changeset 8f7c3ea16f4a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8f7c3ea16f4a author: jfranck date: Thu Apr 18 13:18:28 2013 +0200 8011139: (reflect) Revise checking in getEnclosingClass Reviewed-by: darcy, mchung, ahgross changeset a84ce8e20d28 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a84ce8e20d28 author: asaha date: Thu Apr 18 14:22:14 2013 -0700 Merge changeset f8373784a79e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f8373784a79e author: asaha date: Thu Apr 18 15:23:08 2013 -0700 Merge changeset a7635c74a2c8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a7635c74a2c8 author: katleman date: Tue Apr 23 16:22:26 2013 -0700 Added tag jdk7u25-b08 for changeset f8373784a79e changeset b79d56eee18e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b79d56eee18e author: bae date: Wed Apr 24 15:23:44 2013 +0400 8012438: Better image validation Reviewed-by: mschoene, prr, vadim changeset 971a1b285312 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=971a1b285312 author: prr date: Fri Apr 19 15:40:03 2013 -0700 8012421: Better positioning of PairPositioning Reviewed-by: srl, mschoene, vadim changeset 266962f7c114 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=266962f7c114 author: asaha date: Fri Apr 26 10:03:43 2013 -0700 Merge changeset d2c1fec2f7be in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d2c1fec2f7be author: mullan date: Mon Apr 29 10:20:55 2013 -0400 8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 Reviewed-by: xuelei changeset f209450f970b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f209450f970b author: prr date: Thu Apr 25 21:37:41 2013 -0700 8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer Reviewed-by: bae, srl changeset 64055b403176 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=64055b403176 author: bae date: Fri Apr 26 09:30:54 2013 +0400 8012601: Better validation of image layouts Reviewed-by: mschoene, prr, vadim changeset 2c3fae51b7d6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2c3fae51b7d6 author: alexsch date: Mon Apr 29 16:46:18 2013 +0400 8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus Reviewed-by: serb, ant changeset 9f59600aea52 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9f59600aea52 author: mullan date: Mon Dec 03 11:07:20 2012 -0500 7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout Summary: Added com.sun.security.ocsp.timeout system property to control timeout Reviewed-by: mullan, vinnie Contributed-by: jason.uh at oracle.com changeset 51d6934d1d7d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=51d6934d1d7d author: mullan date: Thu Apr 25 14:45:16 2013 -0700 8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined Reviewed-by: vinnie changeset 023297d5b047 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=023297d5b047 author: mullan date: Fri Apr 26 10:41:35 2013 -0700 8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout Reviewed-by: vinnie changeset 11616f222415 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=11616f222415 author: katleman date: Tue Apr 30 12:25:32 2013 -0700 Added tag jdk7u25-b09 for changeset 023297d5b047 changeset 2a9c79db0040 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2a9c79db0040 author: bae date: Tue Apr 30 04:20:46 2013 +0400 8012597: Better image channel verification Reviewed-by: ahgross, vadim, prr changeset 2dc2b6b34b00 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2dc2b6b34b00 author: mcherkas date: Tue Feb 12 16:11:40 2013 +0400 8005932: Java 7 on mac os x only provides text clipboard formats Reviewed-by: alexp, denis changeset 431c2b754123 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=431c2b754123 author: dfuchs date: Wed May 01 00:49:21 2013 +0200 8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 Reviewed-by: alanb, skoivu, smarks, mchung changeset c448f31eb138 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c448f31eb138 author: coffeys date: Wed May 01 21:02:04 2013 +0100 8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() Reviewed-by: mchung, okutsu changeset c82ed89b21bc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c82ed89b21bc author: mullan date: Wed May 01 17:19:04 2013 -0400 8008744: Rework part of fix for JDK-6741606 Reviewed-by: xuelei, ahgross changeset 55f69873b5b1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=55f69873b5b1 author: katleman date: Tue May 07 12:56:42 2013 -0700 Added tag jdk7u25-b10 for changeset c82ed89b21bc changeset 627060e4a373 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=627060e4a373 author: leonidr date: Mon May 06 16:30:42 2013 +0400 8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 Summary: Do not mark context as disposed until we've posted all the events Reviewed-by: art changeset d6d7ba76d746 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d6d7ba76d746 author: mullan date: Fri May 10 16:28:51 2013 -0400 8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod Reviewed-by: xuelei, hawtin changeset 15ebd1eab1d0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=15ebd1eab1d0 author: jgish date: Fri Apr 19 16:50:10 2013 -0700 8010939: Deadlock in LogManager Summary: re-order locks to avoid deadlock Reviewed-by: mchung, alanb changeset abe9ea5a50d2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=abe9ea5a50d2 author: xuelei date: Mon May 13 18:30:45 2013 -0700 8014281: Better checking of XML signature Summary: also reviewed by Andrew Gross and Christophe Ravel Reviewed-by: mullan changeset 2091127583a3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2091127583a3 author: mchung date: Tue May 14 08:07:08 2013 -0700 8010727: WLS fails to add a logger with "" in its own LogManager subclass instance Reviewed-by: alanb, jgish changeset 70d0a0adb21f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=70d0a0adb21f author: serb date: Tue May 14 20:22:55 2013 +0400 8014423: [macosx] The scrollbar's block increment performs incorrectly Reviewed-by: anthony, art changeset 789f4a57496d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=789f4a57496d author: bae date: Tue May 14 21:05:20 2013 +0400 8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 Reviewed-by: prr, vadim changeset 6788dc17bc5f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6788dc17bc5f author: uta date: Mon May 13 20:09:20 2013 +0400 8012453: (process) Runtime.exec(String) fails if command contains spaces [win] Reviewed-by: alanb changeset ef5d29607cce in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ef5d29607cce author: asaha date: Tue May 14 15:01:18 2013 -0700 8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo Reviewed-by: mullan Contributed-by: jason.uh at oracle.com changeset 02fe0c1285f5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=02fe0c1285f5 author: katleman date: Wed May 15 13:31:16 2013 -0700 Added tag jdk7u25-b11 for changeset ef5d29607cce changeset 1dd4fe0ac19b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1dd4fe0ac19b author: jgish date: Tue May 14 15:42:14 2013 -0400 8013380: Removal of stack walk to find resource bundle breaks Glassfish startup Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader Reviewed-by: mchung, alanb changeset 0eceab95bf4d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0eceab95bf4d author: bae date: Fri May 17 16:07:14 2013 +0400 8014205: Most of the Swing dialogs are blank on one win7 MUI Reviewed-by: prr, vadim changeset c3c21a702e20 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c3c21a702e20 author: dmeetry date: Fri May 17 19:59:49 2013 +0400 8014676: Java debugger may fail to run Summary: The problem is observed when the binaries for windows are placed under a path which contains a space Reviewed-by: alanb Contributed-by: ivan.gerasimov at oracle.com changeset 9603e9d828c4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9603e9d828c4 author: mchung date: Fri May 17 14:29:51 2013 -0700 8014745: Provide a switch to allow stack walk search of resource bundle Reviewed-by: alanb, jgish changeset cf82127fbb70 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cf82127fbb70 author: leonidr date: Mon May 20 18:51:34 2013 +0400 8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 Summary: Removed logging from SunToolkit Reviewed-by: art changeset 415182744480 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=415182744480 author: ngthomas date: Tue May 21 10:25:40 2013 -0700 8014968: OCSP and CRL connection timeout is set to four hours by default Reviewed-by: mullan changeset 39282f162343 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=39282f162343 author: ngthomas date: Tue May 21 11:41:23 2013 -0700 Merge changeset ba6c3d64b94d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ba6c3d64b94d author: katleman date: Wed May 22 15:45:02 2013 -0700 Added tag jdk7u25-b12 for changeset 39282f162343 changeset a71103b8cbb1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a71103b8cbb1 author: katleman date: Fri May 24 16:20:39 2013 -0700 Added tag jdk7u25-b13 for changeset ba6c3d64b94d changeset e1768e2070c9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e1768e2070c9 author: katleman date: Tue Jun 04 10:47:50 2013 -0700 Added tag jdk7u25-b14 for changeset a71103b8cbb1 changeset 0d68732acbd4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0d68732acbd4 author: katleman date: Thu Jun 06 11:41:46 2013 -0700 Added tag jdk7u25-b15 for changeset e1768e2070c9 changeset 173b399abd8a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=173b399abd8a author: katleman date: Tue Jun 11 11:45:28 2013 -0700 Added tag jdk7u25-b30 for changeset 0d68732acbd4 changeset 55f01444cf58 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=55f01444cf58 author: katleman date: Wed Jun 12 20:18:31 2013 -0700 Added tag jdk7u25-b16 for changeset 173b399abd8a changeset 9062acbc098c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9062acbc098c author: asaha date: Sun Jun 16 22:18:54 2013 -0700 Merge changeset 60d52db33828 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=60d52db33828 author: asaha date: Mon Jun 17 22:27:38 2013 -0700 Merge changeset db5a29c812ee in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=db5a29c812ee author: katleman date: Fri Jun 21 11:18:59 2013 -0700 Added tag jdk7u40-b30 for changeset 60d52db33828 changeset 8295223a3d0b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8295223a3d0b author: katleman date: Fri Jun 14 18:10:31 2013 -0700 Added tag jdk7u25-b32 for changeset 55f01444cf58 changeset 7d92b04dc65a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7d92b04dc65a author: asaha date: Fri Jun 21 10:54:03 2013 -0700 Merge changeset 262e23ebdc3d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=262e23ebdc3d author: asaha date: Fri Jun 21 19:01:58 2013 -0700 Merge changeset 55dc0f4c3579 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=55dc0f4c3579 author: prr date: Tue Jun 25 14:50:50 2013 -0700 8015334: Memory leak when kerning is used on Windows. Reviewed-by: srl, bae changeset ee18d5c46468 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee18d5c46468 author: mchung date: Tue Jun 25 16:12:47 2013 -0700 8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 Reviewed-by: jrose, alanb, chegar, twisti changeset 282d82bfdde7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=282d82bfdde7 author: leonidr date: Wed Jun 26 05:57:45 2013 +0400 8014821: Regression: Focus issues with Oracle WebCenter Capture applet Reviewed-by: anthony, leonidr Contributed-by: anton.tarasov at oracle.com changeset 27808c388ea3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=27808c388ea3 author: uta date: Wed Jun 26 11:39:53 2013 +0400 8016046: (process) Strict validation of input should be security manager case only [win]. Reviewed-by: alanb, ahgross changeset c2522d149ff6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c2522d149ff6 author: pchelko date: Wed Jun 26 12:47:44 2013 +0400 8011686: [macosx] AWT accidentally disables the NSApplicationDelegate of SWT, causing loss of OS X integration functionality Reviewed-by: anthony, serb changeset b9532dc6ffc3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b9532dc6ffc3 author: andrew date: Mon Jul 01 09:06:41 2013 -0500 Merge jdk7u40-b29 changeset 65d95818d79e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=65d95818d79e author: andrew date: Mon Jul 01 09:22:10 2013 -0500 Merge jdk7u40-b31 changeset 985b0b444f67 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=985b0b444f67 author: andrew date: Tue Jul 02 02:26:39 2013 +0100 Added tag icedtea-2.4.1 for changeset 65d95818d79e diffstat: .hgtags | 61 + .jcheck/conf | 2 - make/com/oracle/jfr/Makefile | 5 +- make/com/sun/Makefile | 2 +- make/com/sun/java/pack/Makefile | 7 +- make/com/sun/nio/sctp/Makefile | 2 + make/com/sun/servicetag/Makefile | 80 - make/common/Defs-linux.gmk | 23 +- make/common/Defs-windows.gmk | 39 +- make/common/Defs.gmk | 7 +- make/common/Library.gmk | 40 +- make/common/Program.gmk | 80 +- make/common/Release.gmk | 50 +- make/common/shared/Compiler-gcc.gmk | 76 +- make/common/shared/Defs-java.gmk | 9 +- make/common/shared/Defs-versions.gmk | 2 +- make/common/shared/Defs.gmk | 2 +- make/common/shared/Platform.gmk | 9 + make/common/shared/Sanity.gmk | 8 + make/docs/Makefile | 6 +- make/java/java/FILES_c.gmk | 2 - make/java/java/mapfile-vers | 4 +- make/java/java/reorder-i586 | 1 - make/java/java/reorder-sparc | 1 - make/java/java/reorder-sparcv9 | 1 - make/java/net/FILES_c.gmk | 7 + make/java/net/Makefile | 26 +- make/java/nio/Makefile | 226 +- make/java/nio/mapfile-bsd | 1 + make/java/nio/mapfile-linux | 1 + make/java/nio/mapfile-solaris | 1 + make/java/security/Makefile | 12 +- make/java/sun_nio/Makefile | 2 +- make/java/version/Makefile | 5 + make/java/zip/mapfile-vers | 1 + make/java/zip/reorder-i586 | 1 + make/java/zip/reorder-sparc | 1 + make/java/zip/reorder-sparcv9 | 1 + make/javax/sound/SoundDefs.gmk | 48 + make/jdk_generic_profile.sh | 73 +- make/sun/awt/FILES_c_unix.gmk | 10 + make/sun/awt/Makefile | 83 +- make/sun/awt/ToBin.java | 59 + make/sun/awt/mawt.gmk | 39 +- make/sun/cmm/lcms/FILES_c_unix.gmk | 8 +- make/sun/cmm/lcms/FILES_c_windows.gmk | 1 + make/sun/cmm/lcms/Makefile | 8 +- make/sun/font/FILES_c.gmk | 16 +- make/sun/font/Makefile | 6 +- make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/antarctica | 42 +- make/sun/javazic/tzdata/asia | 62 +- make/sun/javazic/tzdata/australasia | 23 +- make/sun/javazic/tzdata/southamerica | 10 +- make/sun/javazic/tzdata/zone.tab | 2 +- make/sun/jawt/Makefile | 14 +- make/sun/jpeg/FILES_c.gmk | 6 +- make/sun/jpeg/Makefile | 11 +- make/sun/native2ascii/Makefile | 2 +- make/sun/net/FILES_java.gmk | 1 + make/sun/nio/cs/Makefile | 2 +- make/sun/security/pkcs11/mapfile-vers | 6 +- make/sun/splashscreen/FILES_c.gmk | 78 +- make/sun/splashscreen/Makefile | 35 +- make/sun/xawt/FILES_c_unix.gmk | 20 + make/sun/xawt/Makefile | 129 +- make/sun/xawt/ToBin.java | 59 - make/tools/Makefile | 9 + make/tools/freetypecheck/Makefile | 2 +- make/tools/generate_nimbus/Makefile | 1 + make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java | 22 +- make/tools/src/build/tools/compileproperties/CompileProperties.java | 9 +- make/tools/src/build/tools/dirdiff/DirDiff.java | 4 +- make/tools/src/build/tools/dtdbuilder/DTDBuilder.java | 34 +- make/tools/src/build/tools/dtdbuilder/DTDInputStream.java | 6 +- make/tools/src/build/tools/dtdbuilder/DTDParser.java | 44 +- make/tools/src/build/tools/dtdbuilder/PublicMapping.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/CharSet.java | 16 +- make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java | 8 +- make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java | 201 +- make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java | 6 +- make/tools/src/build/tools/generatecharacter/GenerateCharacter.java | 4 +- make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java | 147 +- make/tools/src/build/tools/generatecharacter/UnicodeSpec.java | 22 +- make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 4 +- make/tools/src/build/tools/hasher/Hasher.java | 38 +- make/tools/src/build/tools/jarsplit/JarSplit.java | 5 +- make/tools/src/build/tools/javazic/Gen.java | 14 +- make/tools/src/build/tools/javazic/GenDoc.java | 16 +- make/tools/src/build/tools/javazic/Main.java | 3 +- make/tools/src/build/tools/javazic/Rule.java | 2 +- make/tools/src/build/tools/javazic/Simple.java | 23 +- make/tools/src/build/tools/javazic/Time.java | 10 +- make/tools/src/build/tools/javazic/Zoneinfo.java | 18 +- make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java | 14 +- make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java | 26 +- make/tools/src/build/tools/jdwpgen/AltNode.java | 4 +- make/tools/src/build/tools/jdwpgen/CommandSetNode.java | 11 +- make/tools/src/build/tools/jdwpgen/ConstantSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/ErrorSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/Node.java | 25 +- make/tools/src/build/tools/jdwpgen/OutNode.java | 14 +- make/tools/src/build/tools/jdwpgen/RootNode.java | 10 +- make/tools/src/build/tools/jdwpgen/SelectNode.java | 10 +- make/tools/src/build/tools/makeclasslist/MakeClasslist.java | 15 +- make/tools/src/build/tools/stripproperties/StripProperties.java | 4 +- src/macosx/bin/java_md_macosx.c | 53 +- src/macosx/classes/com/apple/laf/AquaButtonBorder.java | 9 +- src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java | 40 +- src/macosx/classes/com/apple/laf/AquaComboBoxUI.java | 24 +- src/macosx/classes/com/apple/laf/AquaPainter.java | 95 +- src/macosx/classes/com/apple/laf/ImageCache.java | 60 +- src/macosx/classes/sun/awt/CGraphicsConfig.java | 2 +- src/macosx/classes/sun/awt/CGraphicsDevice.java | 98 +- src/macosx/classes/sun/awt/CGraphicsEnvironment.java | 75 +- src/macosx/classes/sun/font/CCharToGlyphMapper.java | 145 +- src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java | 69 +- src/macosx/classes/sun/java2d/opengl/CGLLayer.java | 21 +- src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java | 71 +- src/macosx/classes/sun/lwawt/LWComponentPeer.java | 44 +- src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java | 17 + src/macosx/classes/sun/lwawt/LWScrollBarPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWToolkit.java | 2 + src/macosx/classes/sun/lwawt/LWWindowPeer.java | 305 +- src/macosx/classes/sun/lwawt/PlatformEventNotifier.java | 65 + src/macosx/classes/sun/lwawt/PlatformWindow.java | 4 +- src/macosx/classes/sun/lwawt/SecurityWarningWindow.java | 35 + src/macosx/classes/sun/lwawt/macosx/CClipboard.java | 8 + src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java | 45 +- src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 14 +- src/macosx/classes/sun/lwawt/macosx/CFileDialog.java | 4 +- src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java | 7 +- src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 81 +- src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 57 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 180 +- src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java | 4 +- src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java | 66 +- src/macosx/classes/sun/lwawt/macosx/CRobot.java | 8 +- src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java | 36 +- src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java | 2 +- src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java | 5 + src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java | 444 ++ src/macosx/classes/sun/lwawt/macosx/CWrapper.java | 3 +- src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 129 +- src/macosx/javavm/export/jawt_md.h | 110 + src/macosx/javavm/export/jni_md.h | 41 + src/macosx/javavm/export/jvm_md.h | 81 + src/macosx/native/com/apple/laf/JRSUIController.m | 3 +- src/macosx/native/jobjc/src/core/native/SEL.m | 2 +- src/macosx/native/sun/awt/AWTEvent.h | 3 +- src/macosx/native/sun/awt/AWTEvent.m | 5 +- src/macosx/native/sun/awt/AWTSurfaceLayers.h | 3 +- src/macosx/native/sun/awt/AWTSurfaceLayers.m | 4 +- src/macosx/native/sun/awt/AWTView.m | 35 +- src/macosx/native/sun/awt/AWTWindow.h | 3 + src/macosx/native/sun/awt/AWTWindow.m | 148 +- src/macosx/native/sun/awt/ApplicationDelegate.m | 69 +- src/macosx/native/sun/awt/CClipboard.m | 39 +- src/macosx/native/sun/awt/CCursorManager.m | 16 +- src/macosx/native/sun/awt/CDesktopPeer.m | 4 - src/macosx/native/sun/awt/CDragSource.m | 14 +- src/macosx/native/sun/awt/CDragSourceContextPeer.m | 4 +- src/macosx/native/sun/awt/CDropTarget.m | 3 +- src/macosx/native/sun/awt/CGraphicsDevice.m | 77 +- src/macosx/native/sun/awt/CGraphicsEnv.m | 7 +- src/macosx/native/sun/awt/CImage.m | 9 +- src/macosx/native/sun/awt/CInputMethod.m | 12 +- src/macosx/native/sun/awt/CMenu.m | 14 +- src/macosx/native/sun/awt/CMenuBar.m | 8 +- src/macosx/native/sun/awt/CMenuComponent.h | 2 +- src/macosx/native/sun/awt/CMenuComponent.m | 8 +- src/macosx/native/sun/awt/CMenuItem.m | 41 +- src/macosx/native/sun/awt/CPopupMenu.m | 4 +- src/macosx/native/sun/awt/CRobot.m | 7 +- src/macosx/native/sun/awt/CTextPipe.m | 24 +- src/macosx/native/sun/awt/CTrayIcon.m | 14 +- src/macosx/native/sun/awt/CWrapper.m | 165 +- src/macosx/native/sun/awt/JavaComponentAccessibility.m | 28 +- src/macosx/native/sun/awt/LWCToolkit.h | 2 - src/macosx/native/sun/awt/LWCToolkit.m | 113 +- src/macosx/native/sun/awt/awt.m | 14 +- src/macosx/native/sun/awt/jawt.m | 4 +- src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 6 +- src/macosx/native/sun/font/CoreTextSupport.h | 2 +- src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m | 26 +- src/macosx/native/sun/java2d/opengl/CGLLayer.m | 48 +- src/macosx/native/sun/osxapp/QueuingApplicationDelegate.m | 8 +- src/macosx/native/sun/osxapp/ThreadUtilities.h | 15 +- src/macosx/native/sun/osxapp/ThreadUtilities.m | 203 +- src/share/bin/java.c | 8 +- src/share/classes/com/sun/beans/finder/AbstractFinder.java | 21 +- src/share/classes/com/sun/beans/finder/ConstructorFinder.java | 15 +- src/share/classes/com/sun/beans/finder/MethodFinder.java | 4 +- src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 6 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 295 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 149 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +- src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java | 16 +- src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/Introspector.java | 14 +- src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java | 21 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 62 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java | 4 +- src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java | 3 +- src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java | 16 +- src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java | 18 +- src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 + src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java | 7 +- src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +- src/share/classes/com/sun/media/sound/AbstractDataLine.java | 45 +- src/share/classes/com/sun/media/sound/AbstractLine.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDevice.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java | 16 +- src/share/classes/com/sun/media/sound/AbstractMixer.java | 54 +- src/share/classes/com/sun/media/sound/AiffFileFormat.java | 10 +- src/share/classes/com/sun/media/sound/AiffFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AiffFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/AlawCodec.java | 14 +- src/share/classes/com/sun/media/sound/AuFileFormat.java | 6 +- src/share/classes/com/sun/media/sound/AuFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AuFileWriter.java | 16 +- src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 39 +- src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 51 +- src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 26 +- src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInstrument.java | 18 +- src/share/classes/com/sun/media/sound/DLSModulator.java | 16 +- src/share/classes/com/sun/media/sound/DLSRegion.java | 28 +- src/share/classes/com/sun/media/sound/DLSSample.java | 14 +- src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 10 +- src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 14 +- src/share/classes/com/sun/media/sound/DLSSoundbank.java | 12 +- src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/DataPusher.java | 8 +- src/share/classes/com/sun/media/sound/DirectAudioDevice.java | 44 +- src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java | 68 +- src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 4 +- src/share/classes/com/sun/media/sound/EventDispatcher.java | 34 +- src/share/classes/com/sun/media/sound/FFT.java | 12 +- src/share/classes/com/sun/media/sound/FastShortMessage.java | 8 +- src/share/classes/com/sun/media/sound/FastSysexMessage.java | 2 +- src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 22 +- src/share/classes/com/sun/media/sound/JDK13Services.java | 16 +- src/share/classes/com/sun/media/sound/JSSecurityManager.java | 103 +- src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java | 12 +- src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiInDevice.java | 9 +- src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiOutDevice.java | 22 +- src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiUtils.java | 11 +- src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 8 +- src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 12 +- src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 4 +- src/share/classes/com/sun/media/sound/ModelDestination.java | 4 +- src/share/classes/com/sun/media/sound/ModelIdentifier.java | 4 +- src/share/classes/com/sun/media/sound/ModelInstrument.java | 8 +- src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 4 +- src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 6 +- src/share/classes/com/sun/media/sound/ModelPatch.java | 4 +- src/share/classes/com/sun/media/sound/ModelPerformer.java | 6 +- src/share/classes/com/sun/media/sound/ModelSource.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 4 +- src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java | 10 +- src/share/classes/com/sun/media/sound/Platform.java | 25 +- src/share/classes/com/sun/media/sound/PortMixer.java | 28 +- src/share/classes/com/sun/media/sound/PortMixerProvider.java | 46 +- src/share/classes/com/sun/media/sound/Printer.java | 10 +- src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFReader.java | 8 +- src/share/classes/com/sun/media/sound/RIFFWriter.java | 16 +- src/share/classes/com/sun/media/sound/RealTimeSequencer.java | 80 +- src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java | 4 +- src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 4 +- src/share/classes/com/sun/media/sound/SF2Instrument.java | 22 +- src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Layer.java | 10 +- src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Modulator.java | 14 +- src/share/classes/com/sun/media/sound/SF2Sample.java | 24 +- src/share/classes/com/sun/media/sound/SF2Soundbank.java | 36 +- src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 6 +- src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 4 +- src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 8 +- src/share/classes/com/sun/media/sound/SoftChannel.java | 44 +- src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 4 +- src/share/classes/com/sun/media/sound/SoftChorus.java | 14 +- src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 38 +- src/share/classes/com/sun/media/sound/SoftFilter.java | 6 +- src/share/classes/com/sun/media/sound/SoftInstrument.java | 8 +- src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 8 +- src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLimiter.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 4 +- src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 24 +- src/share/classes/com/sun/media/sound/SoftMainMixer.java | 26 +- src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftMixingClip.java | 8 +- src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 88 +- src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 6 +- src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 10 +- src/share/classes/com/sun/media/sound/SoftPerformer.java | 4 +- src/share/classes/com/sun/media/sound/SoftPointResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftProvider.java | 8 +- src/share/classes/com/sun/media/sound/SoftReceiver.java | 14 +- src/share/classes/com/sun/media/sound/SoftReverb.java | 10 +- src/share/classes/com/sun/media/sound/SoftShortMessage.java | 4 +- src/share/classes/com/sun/media/sound/SoftSincResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 60 +- src/share/classes/com/sun/media/sound/SoftTuning.java | 6 +- src/share/classes/com/sun/media/sound/SoftVoice.java | 134 +- src/share/classes/com/sun/media/sound/StandardMidiFileReader.java | 29 +- src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java | 10 +- src/share/classes/com/sun/media/sound/SunCodec.java | 18 +- src/share/classes/com/sun/media/sound/SunFileReader.java | 33 +- src/share/classes/com/sun/media/sound/SunFileWriter.java | 17 +- src/share/classes/com/sun/media/sound/Toolkit.java | 9 +- src/share/classes/com/sun/media/sound/UlawCodec.java | 9 +- src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 14 +- src/share/classes/com/sun/media/sound/WaveFileFormat.java | 22 +- src/share/classes/com/sun/media/sound/WaveFileReader.java | 34 +- src/share/classes/com/sun/media/sound/WaveFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 4 +- src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 8 +- src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +- src/share/classes/com/sun/org/apache/xml/internal/security/Init.java | 643 +- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java | 280 + src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java | 403 +- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java | 812 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java | 237 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java | 7 +- src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java | 251 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java | 622 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java | 2 + src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties | 249 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java | 14 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java | 3 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java | 21 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java | 49 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java | 280 + src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java | 420 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java | 23 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java | 848 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java | 338 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java | 395 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java | 534 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java | 12 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java | 98 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java | 66 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +- src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 3 +- src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java | 3 +- src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java | 1 - src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java | 1 - src/share/classes/com/sun/servicetag/BrowserSupport.java | 199 - src/share/classes/com/sun/servicetag/Installer.java | 972 ----- src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java | 193 - src/share/classes/com/sun/servicetag/RegistrationData.java | 475 -- src/share/classes/com/sun/servicetag/RegistrationDocument.java | 368 -- src/share/classes/com/sun/servicetag/Registry.java | 556 --- src/share/classes/com/sun/servicetag/ServiceTag.java | 634 --- src/share/classes/com/sun/servicetag/SolarisServiceTag.java | 62 - src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java | 159 - src/share/classes/com/sun/servicetag/SunConnection.java | 305 - src/share/classes/com/sun/servicetag/SystemEnvironment.java | 338 - src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java | 53 - src/share/classes/com/sun/servicetag/Util.java | 339 - src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java | 150 - src/share/classes/com/sun/servicetag/package.html | 71 - src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt | 25 - src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties | 29 - src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties | 29 - src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties | 29 - src/share/classes/com/sun/servicetag/resources/jdk_header.png | Bin src/share/classes/com/sun/servicetag/resources/product_registration.xsd | 301 - src/share/classes/com/sun/servicetag/resources/register.html | 105 - src/share/classes/com/sun/servicetag/resources/register_ja.html | 91 - src/share/classes/com/sun/servicetag/resources/register_zh_CN.html | 92 - src/share/classes/com/sun/tools/jdi/AbstractLauncher.java | 2 +- src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java | 2 +- src/share/classes/java/awt/EventQueue.java | 21 +- src/share/classes/java/awt/Font.java | 40 +- src/share/classes/java/awt/Toolkit.java | 10 +- src/share/classes/java/awt/Window.java | 4 +- src/share/classes/java/awt/color/ICC_Profile.java | 4 +- src/share/classes/java/awt/image/BufferedImage.java | 38 +- src/share/classes/java/awt/image/ComponentSampleModel.java | 16 +- src/share/classes/java/awt/image/PixelInterleavedSampleModel.java | 10 +- src/share/classes/java/awt/image/Raster.java | 15 +- src/share/classes/java/awt/peer/WindowPeer.java | 13 +- src/share/classes/java/beans/MetaData.java | 147 +- src/share/classes/java/beans/ReflectionUtils.java | 75 - src/share/classes/java/beans/ThreadGroupContext.java | 7 +- src/share/classes/java/beans/WeakIdentityMap.java | 181 + src/share/classes/java/beans/XMLEncoder.java | 35 +- src/share/classes/java/io/File.java | 153 +- src/share/classes/java/io/FileInputStream.java | 5 +- src/share/classes/java/io/FileOutputStream.java | 5 +- src/share/classes/java/io/InputStream.java | 2 +- src/share/classes/java/io/ObjectInputStream.java | 19 + src/share/classes/java/io/ObjectOutputStream.java | 13 + src/share/classes/java/io/ObjectStreamClass.java | 20 + src/share/classes/java/io/ObjectStreamField.java | 10 + src/share/classes/java/io/RandomAccessFile.java | 5 +- src/share/classes/java/lang/Class.java | 148 +- src/share/classes/java/lang/ClassLoader.java | 60 +- src/share/classes/java/lang/Integer.java | 2 +- src/share/classes/java/lang/Package.java | 11 +- src/share/classes/java/lang/ProcessBuilder.java | 22 +- src/share/classes/java/lang/Runtime.java | 8 +- src/share/classes/java/lang/System.java | 13 +- src/share/classes/java/lang/Thread.java | 11 +- src/share/classes/java/lang/Throwable.java | 9 +- src/share/classes/java/lang/invoke/MemberName.java | 13 +- src/share/classes/java/lang/invoke/MethodHandleImpl.java | 8 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 66 +- src/share/classes/java/lang/invoke/MethodHandleProxies.java | 5 +- src/share/classes/java/lang/invoke/MethodHandles.java | 197 +- src/share/classes/java/lang/ref/Finalizer.java | 18 +- src/share/classes/java/lang/reflect/Constructor.java | 5 +- src/share/classes/java/lang/reflect/Field.java | 129 +- src/share/classes/java/lang/reflect/Method.java | 19 +- src/share/classes/java/lang/reflect/Proxy.java | 68 +- src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | 2 +- src/share/classes/java/net/Inet4Address.java | 39 +- src/share/classes/java/net/Inet4AddressImpl.java | 2 +- src/share/classes/java/net/Inet6Address.java | 19 +- src/share/classes/java/net/Inet6AddressImpl.java | 2 +- src/share/classes/java/net/InetAddress.java | 120 +- src/share/classes/java/net/InetSocketAddress.java | 4 +- src/share/classes/java/net/NetUtil.java | 74 + src/share/classes/java/net/ServerSocket.java | 25 +- src/share/classes/java/net/Socket.java | 8 + src/share/classes/java/net/SocksSocketImpl.java | 13 +- src/share/classes/java/nio/file/Files.java | 11 +- src/share/classes/java/rmi/dgc/VMID.java | 69 +- src/share/classes/java/rmi/server/LogStream.java | 9 +- src/share/classes/java/security/AccessControlContext.java | 13 +- src/share/classes/java/security/AccessController.java | 27 +- src/share/classes/java/security/KeyStore.java | 2 +- src/share/classes/java/security/Policy.java | 1 - src/share/classes/java/security/ProtectionDomain.java | 7 +- src/share/classes/java/sql/DriverManager.java | 72 +- src/share/classes/java/text/CalendarBuilder.java | 11 +- src/share/classes/java/text/SimpleDateFormat.java | 4 +- src/share/classes/java/util/ArrayList.java | 86 +- src/share/classes/java/util/EnumMap.java | 1 + src/share/classes/java/util/HashMap.java | 126 +- src/share/classes/java/util/LocaleISOData.java | 2 +- src/share/classes/java/util/ResourceBundle.java | 29 +- src/share/classes/java/util/concurrent/ConcurrentHashMap.java | 28 +- src/share/classes/java/util/concurrent/FutureTask.java | 540 +- src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java | 11 +- src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java | 18 +- src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java | 13 +- src/share/classes/java/util/logging/LogManager.java | 60 +- src/share/classes/java/util/logging/Logger.java | 198 +- src/share/classes/java/util/logging/LoggingProxyImpl.java | 5 + src/share/classes/java/util/zip/ZipFile.java | 26 +- src/share/classes/javax/crypto/Cipher.java | 172 +- src/share/classes/javax/management/JMX.java | 90 +- src/share/classes/javax/management/MBeanServerFactory.java | 3 +- src/share/classes/javax/management/MBeanServerInvocationHandler.java | 15 +- src/share/classes/javax/management/StandardEmitterMBean.java | 40 +- src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java | 2 + src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java | 10 +- src/share/classes/javax/management/relation/RelationNotification.java | 255 +- src/share/classes/javax/management/remote/JMXConnectorFactory.java | 39 +- src/share/classes/javax/management/remote/NotificationResult.java | 4 +- src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 2 + src/share/classes/javax/management/remote/rmi/RMIConnector.java | 5 +- src/share/classes/javax/script/ScriptEngineManager.java | 48 +- src/share/classes/javax/sound/midi/MetaMessage.java | 18 +- src/share/classes/javax/sound/sampled/Mixer.java | 8 +- src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java | 19 +- src/share/classes/javax/swing/DefaultComboBoxModel.java | 5 +- src/share/classes/javax/swing/JComponent.java | 13 +- src/share/classes/javax/swing/JDesktopPane.java | 11 +- src/share/classes/javax/swing/JDialog.java | 3 +- src/share/classes/javax/swing/JEditorPane.java | 11 +- src/share/classes/javax/swing/JFrame.java | 10 +- src/share/classes/javax/swing/JInternalFrame.java | 6 +- src/share/classes/javax/swing/JPopupMenu.java | 10 +- src/share/classes/javax/swing/JToolTip.java | 6 + src/share/classes/javax/swing/KeyboardManager.java | 5 +- src/share/classes/javax/swing/MenuSelectionManager.java | 5 +- src/share/classes/javax/swing/PopupFactory.java | 14 +- src/share/classes/javax/swing/RepaintManager.java | 8 +- src/share/classes/javax/swing/SwingUtilities.java | 8 +- src/share/classes/javax/swing/SwingWorker.java | 2 +- src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 8 +- src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +- src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 16 +- src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 14 +- src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +- src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +- src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +- src/share/classes/javax/swing/text/JTextComponent.java | 6 +- src/share/classes/javax/swing/text/View.java | 3 +- src/share/classes/javax/swing/text/html/FormView.java | 63 +- src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java | 19 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java | 12 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 - src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java | 21 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java | 36 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 33 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 35 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java | 42 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java | 4 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java | 10 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java | 13 + src/share/classes/sun/applet/AppletPanel.java | 10 +- src/share/classes/sun/applet/AppletSecurity.java | 4 +- src/share/classes/sun/applet/AppletViewerPanel.java | 18 +- src/share/classes/sun/audio/AudioData.java | 4 +- src/share/classes/sun/audio/AudioDataStream.java | 10 +- src/share/classes/sun/audio/AudioDevice.java | 16 +- src/share/classes/sun/audio/AudioPlayer.java | 15 +- src/share/classes/sun/audio/AudioStream.java | 14 +- src/share/classes/sun/audio/AudioStreamSequence.java | 7 +- src/share/classes/sun/audio/AudioTranslatorStream.java | 9 +- src/share/classes/sun/audio/ContinuousAudioDataStream.java | 7 +- src/share/classes/sun/audio/InvalidAudioFormatException.java | 8 +- src/share/classes/sun/awt/AppContext.java | 159 +- src/share/classes/sun/awt/EmbeddedFrame.java | 4 +- src/share/classes/sun/awt/IconInfo.java | 237 + src/share/classes/sun/awt/SunToolkit.java | 47 +- src/share/classes/sun/awt/datatransfer/TransferableProxy.java | 20 +- src/share/classes/sun/awt/image/ByteBandedRaster.java | 73 +- src/share/classes/sun/awt/image/ByteComponentRaster.java | 23 +- src/share/classes/sun/awt/image/BytePackedRaster.java | 3 +- src/share/classes/sun/awt/image/ImageRepresentation.java | 19 +- src/share/classes/sun/awt/image/IntegerComponentRaster.java | 23 +- src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +- src/share/classes/sun/awt/image/ShortBandedRaster.java | 66 +- src/share/classes/sun/awt/image/ShortComponentRaster.java | 23 +- src/share/classes/sun/awt/image/SurfaceManager.java | 15 + src/share/classes/sun/awt/resources/security-icon-bw16.png | Bin src/share/classes/sun/awt/resources/security-icon-bw24.png | Bin src/share/classes/sun/awt/resources/security-icon-bw32.png | Bin src/share/classes/sun/awt/resources/security-icon-bw48.png | Bin src/share/classes/sun/awt/resources/security-icon-interim16.png | Bin src/share/classes/sun/awt/resources/security-icon-interim24.png | Bin src/share/classes/sun/awt/resources/security-icon-interim32.png | Bin src/share/classes/sun/awt/resources/security-icon-interim48.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow16.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow24.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow32.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow48.png | Bin src/share/classes/sun/font/CMap.java | 3 - src/share/classes/sun/font/CreatedFontTracker.java | 119 +- src/share/classes/sun/font/ExtendedTextSourceLabel.java | 54 +- src/share/classes/sun/font/FileFontStrike.java | 11 +- src/share/classes/sun/font/GlyphLayout.java | 21 +- src/share/classes/sun/font/GlyphList.java | 12 +- src/share/classes/sun/java2d/SunGraphics2D.java | 172 +- src/share/classes/sun/java2d/SurfaceData.java | 10 + src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +- src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 41 +- src/share/classes/sun/java2d/loops/MaskFill.java | 4 + src/share/classes/sun/java2d/opengl/OGLBlitLoops.java | 12 +- src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java | 2 +- src/share/classes/sun/java2d/pipe/BufferedContext.java | 16 +- src/share/classes/sun/java2d/pipe/DrawImage.java | 21 +- src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java | 14 +- src/share/classes/sun/java2d/pipe/Region.java | 95 + src/share/classes/sun/management/Agent.java | 2 +- src/share/classes/sun/management/jdp/JdpPacketWriter.java | 9 +- src/share/classes/sun/management/jdp/package-info.java | 2 +- src/share/classes/sun/misc/JavaUtilZipFileAccess.java | 32 + src/share/classes/sun/misc/SharedSecrets.java | 23 +- src/share/classes/sun/misc/URLClassPath.java | 21 +- src/share/classes/sun/misc/Unsafe.java | 12 +- src/share/classes/sun/misc/Version.java.template | 58 +- src/share/classes/sun/net/NetworkClient.java | 8 +- src/share/classes/sun/net/ftp/impl/FtpClient.java | 31 +- src/share/classes/sun/net/httpserver/ServerImpl.java | 11 +- src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 23 +- src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 27 +- src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 33 +- src/share/classes/sun/nio/ch/FileChannelImpl.java | 30 +- src/share/classes/sun/nio/ch/IOUtil.java | 22 +- src/share/classes/sun/nio/ch/NativeDispatcher.java | 16 +- src/share/classes/sun/nio/ch/Net.java | 107 +- src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 3 +- src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java | 40 +- src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 4 +- src/share/classes/sun/nio/ch/SocketAdaptor.java | 4 +- src/share/classes/sun/nio/ch/SocketChannelImpl.java | 30 +- src/share/classes/sun/reflect/CallerSensitive.java | 41 + src/share/classes/sun/reflect/Reflection.java | 53 +- src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java | 9 +- src/share/classes/sun/reflect/misc/MethodUtil.java | 40 +- src/share/classes/sun/reflect/misc/ReflectUtil.java | 56 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 + src/share/classes/sun/rmi/server/Activation.java | 16 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 35 +- src/share/classes/sun/rmi/server/MarshalInputStream.java | 14 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +- src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java | 11 +- src/share/classes/sun/security/krb5/PrincipalName.java | 2 +- src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java | 2 +- src/share/classes/sun/security/pkcs/PKCS7.java | 31 +- src/share/classes/sun/security/pkcs/PKCS9Attribute.java | 94 +- src/share/classes/sun/security/pkcs11/Config.java | 3 + src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 4 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/pkcs11/SunPKCS11.java | 23 +- src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +- src/share/classes/sun/security/provider/certpath/CertPathHelper.java | 2 +- src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java | 35 +- src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java | 40 +- src/share/classes/sun/security/provider/certpath/OCSP.java | 46 +- src/share/classes/sun/security/provider/certpath/OCSPChecker.java | 13 +- src/share/classes/sun/security/provider/certpath/OCSPResponse.java | 33 +- src/share/classes/sun/security/provider/certpath/URICertStore.java | 31 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 + src/share/classes/sun/security/timestamp/TimestampToken.java | 6 +- src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +- src/share/classes/sun/security/util/SignatureFileVerifier.java | 29 +- src/share/classes/sun/security/util/UntrustedCertificates.java | 47 + src/share/classes/sun/swing/DefaultLookup.java | 3 +- src/share/classes/sun/swing/SwingUtilities2.java | 17 +- src/share/classes/sun/tools/jar/Main.java | 2 +- src/share/classes/sun/tools/jconsole/AboutDialog.java | 14 +- src/share/classes/sun/tools/jconsole/Messages.java | 3 + src/share/classes/sun/tools/jconsole/ProxyClient.java | 15 +- src/share/classes/sun/tools/jconsole/VMPanel.java | 19 +- src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java | 462 -- src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java | 442 -- src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java | 442 -- src/share/classes/sun/tools/jconsole/resources/messages.properties | 5 +- src/share/classes/sun/tools/jconsole/resources/messages_ja.properties | 2 +- src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties | 2 +- src/share/classes/sun/tools/native2ascii/Main.java | 9 +- src/share/classes/sun/tracing/ProviderSkeleton.java | 31 +- src/share/classes/sun/tracing/dtrace/DTraceProvider.java | 15 +- src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +- src/share/classes/sun/util/logging/LoggingProxy.java | 2 + src/share/classes/sun/util/logging/LoggingSupport.java | 5 + src/share/classes/sun/util/logging/PlatformLogger.java | 441 +- src/share/demo/jvmti/gctest/sample.makefile.txt | 6 +- src/share/demo/jvmti/heapTracker/sample.makefile.txt | 19 +- src/share/demo/jvmti/heapViewer/sample.makefile.txt | 5 +- src/share/demo/jvmti/hprof/sample.makefile.txt | 6 +- src/share/demo/jvmti/minst/sample.makefile.txt | 19 +- src/share/demo/jvmti/mtrace/sample.makefile.txt | 20 +- src/share/demo/jvmti/versionCheck/sample.makefile.txt | 6 +- src/share/demo/jvmti/waiters/sample.makefile.txt | 8 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java | 17 +- src/share/javavm/export/jawt.h | 4 +- src/share/lib/security/java.security-linux | 62 +- src/share/lib/security/java.security-macosx | 60 +- src/share/lib/security/java.security-solaris | 60 +- src/share/lib/security/java.security-windows | 62 +- src/share/lib/security/nss.cfg.in | 5 + src/share/lib/security/sunpkcs11-solaris.cfg | 14 +- src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 1 - src/share/native/com/sun/media/sound/SoundDefs.h | 8 + src/share/native/common/sizecalc.h | 118 + src/share/native/java/lang/ClassLoader.c | 17 - src/share/native/java/lang/SecurityManager.c | 1 - src/share/native/java/lang/System.c | 8 + src/share/native/java/net/InetAddress.c | 23 +- src/share/native/java/net/net_util.c | 70 +- src/share/native/java/net/net_util.h | 12 +- src/share/native/java/util/zip/Deflater.c | 46 +- src/share/native/java/util/zip/Inflater.c | 6 +- src/share/native/java/util/zip/ZipFile.c | 8 + src/share/native/java/util/zip/zip_util.c | 8 + src/share/native/java/util/zip/zip_util.h | 1 + src/share/native/sun/awt/image/awt_ImageRep.c | 175 +- src/share/native/sun/awt/image/awt_parseImage.c | 167 +- src/share/native/sun/awt/image/jpeg/README | 385 -- src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 47 +- src/share/native/sun/awt/image/jpeg/jcapimin.c | 284 - src/share/native/sun/awt/image/jpeg/jcapistd.c | 165 - src/share/native/sun/awt/image/jpeg/jccoefct.c | 453 -- src/share/native/sun/awt/image/jpeg/jccolor.c | 462 -- src/share/native/sun/awt/image/jpeg/jcdctmgr.c | 391 -- src/share/native/sun/awt/image/jpeg/jchuff.c | 913 ----- src/share/native/sun/awt/image/jpeg/jchuff.h | 51 - src/share/native/sun/awt/image/jpeg/jcinit.c | 76 - src/share/native/sun/awt/image/jpeg/jcmainct.c | 297 - src/share/native/sun/awt/image/jpeg/jcmarker.c | 682 --- src/share/native/sun/awt/image/jpeg/jcmaster.c | 594 --- src/share/native/sun/awt/image/jpeg/jcomapi.c | 110 - src/share/native/sun/awt/image/jpeg/jconfig.h | 43 - src/share/native/sun/awt/image/jpeg/jcparam.c | 614 --- src/share/native/sun/awt/image/jpeg/jcphuff.c | 837 ---- src/share/native/sun/awt/image/jpeg/jcprepct.c | 358 -- src/share/native/sun/awt/image/jpeg/jcsample.c | 523 --- src/share/native/sun/awt/image/jpeg/jctrans.c | 392 -- src/share/native/sun/awt/image/jpeg/jdapimin.c | 399 -- src/share/native/sun/awt/image/jpeg/jdapistd.c | 279 - src/share/native/sun/awt/image/jpeg/jdcoefct.c | 740 ---- src/share/native/sun/awt/image/jpeg/jdcolor.c | 398 -- src/share/native/sun/awt/image/jpeg/jdct.h | 180 - src/share/native/sun/awt/image/jpeg/jddctmgr.c | 273 - src/share/native/sun/awt/image/jpeg/jdhuff.c | 655 --- src/share/native/sun/awt/image/jpeg/jdhuff.h | 205 - src/share/native/sun/awt/image/jpeg/jdinput.c | 385 -- src/share/native/sun/awt/image/jpeg/jdmainct.c | 516 -- src/share/native/sun/awt/image/jpeg/jdmarker.c | 1384 -------- src/share/native/sun/awt/image/jpeg/jdmaster.c | 561 --- src/share/native/sun/awt/image/jpeg/jdmerge.c | 404 -- src/share/native/sun/awt/image/jpeg/jdphuff.c | 672 --- src/share/native/sun/awt/image/jpeg/jdpostct.c | 294 - src/share/native/sun/awt/image/jpeg/jdsample.c | 482 -- src/share/native/sun/awt/image/jpeg/jdtrans.c | 147 - src/share/native/sun/awt/image/jpeg/jerror.c | 272 - src/share/native/sun/awt/image/jpeg/jerror.h | 295 - src/share/native/sun/awt/image/jpeg/jfdctflt.c | 172 - src/share/native/sun/awt/image/jpeg/jfdctfst.c | 228 - src/share/native/sun/awt/image/jpeg/jfdctint.c | 287 - src/share/native/sun/awt/image/jpeg/jidctflt.c | 246 - src/share/native/sun/awt/image/jpeg/jidctfst.c | 372 -- src/share/native/sun/awt/image/jpeg/jidctint.c | 393 -- src/share/native/sun/awt/image/jpeg/jidctred.c | 402 -- src/share/native/sun/awt/image/jpeg/jinclude.h | 95 - src/share/native/sun/awt/image/jpeg/jmemmgr.c | 1124 ------ src/share/native/sun/awt/image/jpeg/jmemnobs.c | 113 - src/share/native/sun/awt/image/jpeg/jmemsys.h | 202 - src/share/native/sun/awt/image/jpeg/jmorecfg.h | 378 -- src/share/native/sun/awt/image/jpeg/jpeg-6b/README | 385 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c | 284 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c | 165 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c | 453 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c | 462 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c | 391 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c | 913 +++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h | 51 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c | 76 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c | 297 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c | 682 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c | 594 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c | 110 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h | 43 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c | 614 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c | 837 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c | 358 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c | 523 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c | 392 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c | 399 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c | 279 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c | 740 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c | 398 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h | 180 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c | 273 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c | 655 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h | 205 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c | 385 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c | 516 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c | 1384 ++++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c | 561 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c | 404 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c | 672 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c | 294 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c | 482 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c | 147 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c | 272 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h | 295 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c | 172 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c | 228 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c | 287 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c | 246 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c | 372 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c | 393 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c | 402 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h | 95 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 1124 ++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c | 113 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h | 202 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h | 378 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h | 396 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h | 1100 ++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c | 860 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c | 1314 +++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c | 183 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h | 18 + src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 2 +- src/share/native/sun/awt/image/jpeg/jpegint.h | 396 -- src/share/native/sun/awt/image/jpeg/jpeglib.h | 1100 ------ src/share/native/sun/awt/image/jpeg/jquant1.c | 860 ---- src/share/native/sun/awt/image/jpeg/jquant2.c | 1314 ------- src/share/native/sun/awt/image/jpeg/jutils.c | 183 - src/share/native/sun/awt/image/jpeg/jversion.h | 18 - src/share/native/sun/awt/medialib/awt_ImagingLib.c | 487 +- src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 31 +- src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c | 3 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 17 +- src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +- src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +- src/share/native/sun/font/FontInstanceAdapter.cpp | 47 +- src/share/native/sun/font/FontInstanceAdapter.h | 1 + src/share/native/sun/font/fontscalerdefs.h | 21 +- src/share/native/sun/font/freetypeScaler.c | 20 +- src/share/native/sun/font/layout/AlternateSubstSubtables.cpp | 11 +- src/share/native/sun/font/layout/AlternateSubstSubtables.h | 6 +- src/share/native/sun/font/layout/ArabicLayoutEngine.cpp | 36 +- src/share/native/sun/font/layout/ArabicLayoutEngine.h | 2 +- src/share/native/sun/font/layout/ArabicShaping.cpp | 14 +- src/share/native/sun/font/layout/ArabicShaping.h | 2 + src/share/native/sun/font/layout/AttachmentPosnSubtables.h | 6 +- src/share/native/sun/font/layout/CanonData.cpp | 5 + src/share/native/sun/font/layout/CanonShaping.cpp | 10 +- src/share/native/sun/font/layout/CanonShaping.h | 2 + src/share/native/sun/font/layout/ClassDefinitionTables.cpp | 104 +- src/share/native/sun/font/layout/ClassDefinitionTables.h | 27 +- src/share/native/sun/font/layout/ContextualGlyphInsertion.h | 15 +- src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.cpp | 139 + src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.h | 106 + src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp | 48 +- src/share/native/sun/font/layout/ContextualGlyphSubstProc.h | 8 +- src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp | 170 + src/share/native/sun/font/layout/ContextualGlyphSubstProc2.h | 92 + src/share/native/sun/font/layout/ContextualGlyphSubstitution.h | 13 +- src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 20 +- src/share/native/sun/font/layout/ContextualSubstSubtables.h | 22 + src/share/native/sun/font/layout/CoverageTables.h | 3 + src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 8 +- src/share/native/sun/font/layout/CursiveAttachmentSubtables.h | 3 +- src/share/native/sun/font/layout/DeviceTables.h | 1 + src/share/native/sun/font/layout/ExtensionSubtables.cpp | 10 +- src/share/native/sun/font/layout/ExtensionSubtables.h | 3 +- src/share/native/sun/font/layout/Features.cpp | 12 +- src/share/native/sun/font/layout/GDEFMarkFilter.cpp | 7 +- src/share/native/sun/font/layout/GDEFMarkFilter.h | 4 +- src/share/native/sun/font/layout/GXLayoutEngine.cpp | 5 +- src/share/native/sun/font/layout/GXLayoutEngine.h | 4 +- src/share/native/sun/font/layout/GXLayoutEngine2.cpp | 91 + src/share/native/sun/font/layout/GXLayoutEngine2.h | 149 + src/share/native/sun/font/layout/GlyphDefinitionTables.cpp | 28 +- src/share/native/sun/font/layout/GlyphDefinitionTables.h | 20 +- src/share/native/sun/font/layout/GlyphIterator.cpp | 27 +- src/share/native/sun/font/layout/GlyphIterator.h | 6 +- src/share/native/sun/font/layout/GlyphLookupTables.cpp | 15 +- src/share/native/sun/font/layout/GlyphLookupTables.h | 4 +- src/share/native/sun/font/layout/GlyphPositioningTables.cpp | 6 +- src/share/native/sun/font/layout/GlyphPositioningTables.h | 5 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp | 38 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.h | 4 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp | 30 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.h | 4 +- src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp | 7 +- src/share/native/sun/font/layout/GlyphSubstitutionTables.h | 5 +- src/share/native/sun/font/layout/HanLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/HanLayoutEngine.h | 2 +- src/share/native/sun/font/layout/HangulLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/HangulLayoutEngine.h | 2 +- src/share/native/sun/font/layout/ICUFeatures.h | 9 +- src/share/native/sun/font/layout/IndicClassTables.cpp | 6 +- src/share/native/sun/font/layout/IndicLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/IndicLayoutEngine.h | 2 +- src/share/native/sun/font/layout/IndicRearrangement.h | 10 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp | 14 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.h | 7 +- src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp | 425 ++ src/share/native/sun/font/layout/IndicRearrangementProcessor2.h | 88 + src/share/native/sun/font/layout/IndicReordering.cpp | 15 +- src/share/native/sun/font/layout/IndicReordering.h | 6 +- src/share/native/sun/font/layout/KernTable.cpp | 87 +- src/share/native/sun/font/layout/KernTable.h | 11 +- src/share/native/sun/font/layout/KhmerLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/KhmerLayoutEngine.h | 2 +- src/share/native/sun/font/layout/LEFontInstance.h | 19 + src/share/native/sun/font/layout/LEGlyphFilter.h | 4 +- src/share/native/sun/font/layout/LEGlyphStorage.cpp | 16 +- src/share/native/sun/font/layout/LEInsertionList.h | 4 +- src/share/native/sun/font/layout/LEScripts.h | 24 +- src/share/native/sun/font/layout/LETableReference.h | 443 ++ src/share/native/sun/font/layout/LETypes.h | 168 +- src/share/native/sun/font/layout/LayoutEngine.cpp | 158 +- src/share/native/sun/font/layout/LayoutEngine.h | 25 +- src/share/native/sun/font/layout/LigatureSubstProc.cpp | 68 +- src/share/native/sun/font/layout/LigatureSubstProc.h | 6 +- src/share/native/sun/font/layout/LigatureSubstProc2.cpp | 170 + src/share/native/sun/font/layout/LigatureSubstProc2.h | 97 + src/share/native/sun/font/layout/LigatureSubstSubtables.cpp | 8 +- src/share/native/sun/font/layout/LigatureSubstSubtables.h | 5 +- src/share/native/sun/font/layout/LigatureSubstitution.h | 19 +- src/share/native/sun/font/layout/LookupProcessor.cpp | 127 +- src/share/native/sun/font/layout/LookupProcessor.h | 19 +- src/share/native/sun/font/layout/LookupTables.cpp | 29 +- src/share/native/sun/font/layout/LookupTables.h | 10 +- src/share/native/sun/font/layout/Lookups.cpp | 36 +- src/share/native/sun/font/layout/Lookups.h | 29 +- src/share/native/sun/font/layout/MPreFixups.cpp | 6 +- src/share/native/sun/font/layout/MarkArrays.h | 1 + src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 10 +- src/share/native/sun/font/layout/MarkToBasePosnSubtables.h | 4 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp | 10 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h | 5 +- src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp | 10 +- src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h | 4 +- src/share/native/sun/font/layout/MorphStateTables.h | 7 +- src/share/native/sun/font/layout/MorphTables.cpp | 40 +- src/share/native/sun/font/layout/MorphTables.h | 306 +- src/share/native/sun/font/layout/MorphTables2.cpp | 248 + src/share/native/sun/font/layout/MultipleSubstSubtables.cpp | 8 +- src/share/native/sun/font/layout/MultipleSubstSubtables.h | 4 +- src/share/native/sun/font/layout/NonContextualGlyphSubst.h | 7 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp | 23 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h | 6 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.cpp | 88 + src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.h | 68 + src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp | 221 +- src/share/native/sun/font/layout/OpenTypeLayoutEngine.h | 16 +- src/share/native/sun/font/layout/OpenTypeTables.h | 3 +- src/share/native/sun/font/layout/OpenTypeUtilities.cpp | 98 +- src/share/native/sun/font/layout/OpenTypeUtilities.h | 13 +- src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 59 +- src/share/native/sun/font/layout/PairPositioningSubtables.h | 15 +- src/share/native/sun/font/layout/ScriptAndLanguage.cpp | 65 +- src/share/native/sun/font/layout/ScriptAndLanguage.h | 9 +- src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp | 15 +- src/share/native/sun/font/layout/ScriptAndLanguageTags.h | 13 +- src/share/native/sun/font/layout/SegmentArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/SegmentArrayProcessor.h | 6 +- src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp | 84 + src/share/native/sun/font/layout/SegmentArrayProcessor2.h | 82 + src/share/native/sun/font/layout/SegmentSingleProcessor.cpp | 17 +- src/share/native/sun/font/layout/SegmentSingleProcessor.h | 6 +- src/share/native/sun/font/layout/SegmentSingleProcessor2.cpp | 79 + src/share/native/sun/font/layout/SegmentSingleProcessor2.h | 82 + src/share/native/sun/font/layout/ShapingTypeData.cpp | 2 + src/share/native/sun/font/layout/SimpleArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/SimpleArrayProcessor.h | 6 +- src/share/native/sun/font/layout/SimpleArrayProcessor2.cpp | 78 + src/share/native/sun/font/layout/SimpleArrayProcessor2.h | 83 + src/share/native/sun/font/layout/SinglePositioningSubtables.cpp | 24 +- src/share/native/sun/font/layout/SinglePositioningSubtables.h | 7 +- src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp | 24 +- src/share/native/sun/font/layout/SingleSubstitutionSubtables.h | 7 +- src/share/native/sun/font/layout/SingleTableProcessor.cpp | 13 +- src/share/native/sun/font/layout/SingleTableProcessor.h | 6 +- src/share/native/sun/font/layout/SingleTableProcessor2.cpp | 77 + src/share/native/sun/font/layout/SingleTableProcessor2.h | 82 + src/share/native/sun/font/layout/StateTableProcessor.cpp | 24 +- src/share/native/sun/font/layout/StateTableProcessor.h | 9 +- src/share/native/sun/font/layout/StateTableProcessor2.cpp | 236 + src/share/native/sun/font/layout/StateTableProcessor2.h | 85 + src/share/native/sun/font/layout/StateTables.h | 54 +- src/share/native/sun/font/layout/SubtableProcessor.cpp | 6 +- src/share/native/sun/font/layout/SubtableProcessor.h | 6 +- src/share/native/sun/font/layout/SubtableProcessor2.cpp | 57 + src/share/native/sun/font/layout/SubtableProcessor2.h | 70 + src/share/native/sun/font/layout/SunLayoutEngine.cpp | 17 +- src/share/native/sun/font/layout/ThaiLayoutEngine.cpp | 9 +- src/share/native/sun/font/layout/TibetanLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/TibetanLayoutEngine.h | 2 +- src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/TrimmedArrayProcessor.h | 6 +- src/share/native/sun/font/layout/TrimmedArrayProcessor2.cpp | 82 + src/share/native/sun/font/layout/TrimmedArrayProcessor2.h | 84 + src/share/native/sun/font/layout/ValueRecords.h | 1 + src/share/native/sun/font/sunFont.c | 18 +- src/share/native/sun/java2d/cmm/lcms/cmscam02.c | 42 +- src/share/native/sun/java2d/cmm/lcms/cmscgats.c | 213 +- src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c | 70 +- src/share/native/sun/java2d/cmm/lcms/cmserr.c | 28 +- src/share/native/sun/java2d/cmm/lcms/cmsgamma.c | 78 +- src/share/native/sun/java2d/cmm/lcms/cmsgmt.c | 15 +- src/share/native/sun/java2d/cmm/lcms/cmshalf.c | 564 +++ src/share/native/sun/java2d/cmm/lcms/cmsintrp.c | 347 +- src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 112 +- src/share/native/sun/java2d/cmm/lcms/cmsio1.c | 287 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 225 +- src/share/native/sun/java2d/cmm/lcms/cmsmd5.c | 2 +- src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c | 3 +- src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 201 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 121 +- src/share/native/sun/java2d/cmm/lcms/cmspack.c | 1392 +++++-- src/share/native/sun/java2d/cmm/lcms/cmspcs.c | 1 + src/share/native/sun/java2d/cmm/lcms/cmsplugin.c | 17 +- src/share/native/sun/java2d/cmm/lcms/cmsps2.c | 88 +- src/share/native/sun/java2d/cmm/lcms/cmssamp.c | 305 +- src/share/native/sun/java2d/cmm/lcms/cmssm.c | 14 +- src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 820 ++++- src/share/native/sun/java2d/cmm/lcms/cmsvirt.c | 92 +- src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c | 12 +- src/share/native/sun/java2d/cmm/lcms/cmsxform.c | 371 +- src/share/native/sun/java2d/cmm/lcms/lcms2.h | 153 +- src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h | 130 +- src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h | 91 +- src/share/native/sun/java2d/loops/TransformHelper.c | 11 +- src/share/native/sun/java2d/pipe/Region.c | 5 +- src/share/native/sun/reflect/Reflection.c | 8 + src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 6 +- src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 9 +- src/solaris/classes/sun/awt/X11/XIconInfo.java | 237 - src/solaris/classes/sun/awt/X11/XIconWindow.java | 9 +- src/solaris/classes/sun/awt/X11/XNETProtocol.java | 12 +- src/solaris/classes/sun/awt/X11/XWM.java | 15 +- src/solaris/classes/sun/awt/X11/XWarningWindow.java | 65 +- src/solaris/classes/sun/awt/X11/XWindowAttributesData.java | 7 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 59 +- src/solaris/classes/sun/awt/X11/security-icon-bw16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow48.png | Bin src/solaris/classes/sun/font/XRGlyphCacheEntry.java | 30 +- src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java | 275 +- src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java | 23 +- src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java | 9 +- src/solaris/classes/sun/nio/ch/SctpNet.java | 62 +- src/solaris/classes/sun/nio/ch/SinkChannelImpl.java | 2 +- src/solaris/classes/sun/nio/ch/SourceChannelImpl.java | 2 +- src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 10 +- src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 3 +- src/solaris/classes/sun/print/IPPPrintService.java | 7 + src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 25 +- src/solaris/native/common/deps/cups_fp.c | 104 + src/solaris/native/common/deps/cups_fp.h | 61 + src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h | 302 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c | 188 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h | 161 + src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 + src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 + src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 + src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 65 + src/solaris/native/common/deps/glib2/gio_fp.c | 109 + src/solaris/native/common/deps/glib2/gio_fp.h | 61 + src/solaris/native/common/deps/glib2/glib_fp.h | 41 + src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 +++ src/solaris/native/common/deps/gtk2/gtk_fp.c | 398 ++ src/solaris/native/common/deps/gtk2/gtk_fp.h | 469 ++ src/solaris/native/common/deps/syscalls_fp.c | 122 + src/solaris/native/common/deps/syscalls_fp.h | 79 + src/solaris/native/java/lang/java_props_md.c | 12 +- src/solaris/native/java/net/Inet4AddressImpl.c | 22 +- src/solaris/native/java/net/Inet6AddressImpl.c | 13 +- src/solaris/native/java/net/NetworkInterface.c | 37 +- src/solaris/native/java/net/PlainDatagramSocketImpl.c | 55 +- src/solaris/native/java/net/net_util_md.c | 6 +- src/solaris/native/sun/awt/CUPSfuncs.c | 137 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 7 +- src/solaris/native/sun/awt/awt_GraphicsEnv.h | 3 + src/solaris/native/sun/awt/awt_Robot.c | 8 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 30 +- src/solaris/native/sun/awt/fontconfig.h | 941 ----- src/solaris/native/sun/awt/fontpath.c | 412 +- src/solaris/native/sun/awt/gtk2_interface.c | 992 +---- src/solaris/native/sun/awt/gtk2_interface.h | 580 +--- src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 22 +- src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +- src/solaris/native/sun/awt/swing_GTKEngine.c | 76 +- src/solaris/native/sun/awt/swing_GTKStyle.c | 20 +- src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 11 +- src/solaris/native/sun/java2d/x11/XRBackendNative.c | 7 +- src/solaris/native/sun/net/spi/DefaultProxySelector.c | 465 +- src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 - src/solaris/native/sun/nio/ch/Net.c | 9 +- src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 94 +- src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 50 +- src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 111 +- src/solaris/native/sun/xawt/XlibWrapper.c | 17 +- src/solaris/native/sun/xawt/awt_Desktop.c | 103 +- src/windows/bin/cmdtoargs.c | 14 +- src/windows/classes/java/lang/ProcessImpl.java | 250 +- src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 51 +- src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 32 +- src/windows/classes/java/net/DualStackPlainSocketImpl.java | 33 +- src/windows/classes/java/net/PlainSocketImpl.java | 25 +- src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 47 +- src/windows/classes/java/net/TwoStacksPlainSocketImpl.java | 39 +- src/windows/classes/sun/awt/windows/WFileDialogPeer.java | 4 +- src/windows/classes/sun/awt/windows/WPathGraphics.java | 2 + src/windows/classes/sun/awt/windows/WPrintDialogPeer.java | 4 +- src/windows/classes/sun/awt/windows/WWindowPeer.java | 6 +- src/windows/classes/sun/nio/ch/FileDispatcherImpl.java | 21 +- src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 4 +- src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java | 25 +- src/windows/classes/sun/nio/fs/WindowsConstants.java | 5 + src/windows/classes/sun/nio/fs/WindowsFileCopy.java | 18 +- src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java | 76 +- src/windows/classes/sun/nio/fs/WindowsLinkSupport.java | 16 +- src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java | 39 +- src/windows/classes/sun/nio/fs/WindowsPath.java | 2 +- src/windows/classes/sun/nio/fs/WindowsSecurity.java | 45 +- src/windows/classes/sun/security/krb5/internal/tools/Ktab.java | 46 +- src/windows/native/java/io/WinNTFileSystem_md.c | 71 +- src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 6 +- src/windows/native/java/net/DualStackPlainSocketImpl.c | 6 +- src/windows/native/java/net/Inet4AddressImpl.c | 14 +- src/windows/native/java/net/Inet6AddressImpl.c | 13 +- src/windows/native/java/net/NetworkInterface.c | 9 +- src/windows/native/java/net/NetworkInterface.h | 1 - src/windows/native/java/net/NetworkInterface_winXP.c | 6 +- src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 63 +- src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 22 +- src/windows/native/java/net/net_util_md.c | 71 +- src/windows/native/java/net/net_util_md.h | 5 +- src/windows/native/sun/awt/splashscreen/splashscreen_sys.c | 31 +- src/windows/native/sun/font/lcdglyph.c | 10 +- src/windows/native/sun/java2d/opengl/WGLSurfaceData.c | 3 +- src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp | 1 + src/windows/native/sun/java2d/windows/GDIRenderer.cpp | 2 +- src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 5 +- src/windows/native/sun/nio/ch/Net.c | 18 +- src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c | 56 +- src/windows/native/sun/windows/CmdIDList.cpp | 6 +- src/windows/native/sun/windows/Devices.cpp | 7 +- src/windows/native/sun/windows/ShellFolder2.cpp | 6 + src/windows/native/sun/windows/WPrinterJob.cpp | 2 +- src/windows/native/sun/windows/alloc.h | 3 + src/windows/native/sun/windows/awt.h | 6 +- src/windows/native/sun/windows/awt_BitmapUtil.cpp | 14 +- src/windows/native/sun/windows/awt_Component.cpp | 45 +- src/windows/native/sun/windows/awt_Cursor.cpp | 6 +- src/windows/native/sun/windows/awt_DataTransferer.cpp | 12 +- src/windows/native/sun/windows/awt_DesktopProperties.cpp | 6 +- src/windows/native/sun/windows/awt_DnDDT.cpp | 4 +- src/windows/native/sun/windows/awt_Frame.cpp | 6 +- src/windows/native/sun/windows/awt_InputMethod.cpp | 8 +- src/windows/native/sun/windows/awt_PrintControl.cpp | 4 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 17 +- src/windows/native/sun/windows/awt_Robot.cpp | 5 + test/Makefile | 12 +- test/ProblemList.txt | 10 +- test/com/oracle/security/ucrypto/TestAES.java | 118 +- test/com/oracle/security/ucrypto/TestDigest.java | 24 +- test/com/oracle/security/ucrypto/TestRSA.java | 276 +- test/com/oracle/security/ucrypto/UcryptoTest.java | 28 +- test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +- test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java | 420 ++ test/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java | 244 + test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java | 1 + test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java | 9 +- test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java | 23 +- test/com/sun/servicetag/DeleteServiceTag.java | 129 - test/com/sun/servicetag/DuplicateNotFound.java | 97 - test/com/sun/servicetag/FindServiceTags.java | 141 - test/com/sun/servicetag/InstanceUrnCheck.java | 76 - test/com/sun/servicetag/InvalidRegistrationData.java | 65 - test/com/sun/servicetag/InvalidServiceTag.java | 96 - test/com/sun/servicetag/JavaServiceTagTest.java | 177 - test/com/sun/servicetag/JavaServiceTagTest1.java | 250 - test/com/sun/servicetag/NewRegistrationData.java | 105 - test/com/sun/servicetag/SvcTagClient.java | 200 - test/com/sun/servicetag/SystemRegistryTest.java | 139 - test/com/sun/servicetag/TestLoadFromXML.java | 69 - test/com/sun/servicetag/UpdateServiceTagTest.java | 109 - test/com/sun/servicetag/Util.java | 265 - test/com/sun/servicetag/ValidRegistrationData.java | 112 - test/com/sun/servicetag/environ.properties | 9 - test/com/sun/servicetag/missing-environ-field.xml | 45 - test/com/sun/servicetag/newer-registry-version.xml | 32 - test/com/sun/servicetag/registration.xml | 61 - test/com/sun/servicetag/servicetag1.properties | 13 - test/com/sun/servicetag/servicetag2.properties | 13 - test/com/sun/servicetag/servicetag3.properties | 13 - test/com/sun/servicetag/servicetag4.properties | 13 - test/com/sun/servicetag/servicetag5.properties | 13 - test/demo/zipfs/ZipFSTester.java | 60 +- test/demo/zipfs/basic.sh | 1 + test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 + test/java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java | 157 - test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java | 157 + test/java/awt/FontClass/SurrogateTest/SuppCharTest.java | 127 + test/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java | 47 + test/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java | 156 + test/java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java | 96 + test/java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java | 105 + test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java | 59 + test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java | 55 + test/java/awt/Mixing/MixingInHwPanel.java | 8 +- test/java/awt/TrayIcon/DragEventSource/DragEventSource.java | 21 +- test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java | 146 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html | 22 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java | 235 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java | 67 + test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java | 78 + test/java/awt/font/TextLayout/KerningLeak.java | 57 + test/java/awt/font/TextLayout/TestKerning.java | 94 + test/java/awt/image/DrawImage/IncorrectBounds.java | 102 + test/java/awt/image/DrawImage/IncorrectOffset.java | 93 + test/java/awt/image/mlib/MlibOpsTest.java | 2 +- test/java/awt/print/PrinterJob/Collate2DPrintingTest.java | 2 +- test/java/awt/print/PrinterJob/PrintLatinCJKTest.java | 102 + test/java/beans/XMLEncoder/AbstractTest.java | 26 +- test/java/beans/XMLEncoder/BeanValidator.java | 37 +- test/java/beans/XMLEncoder/Test4631471.java | 5 - test/java/beans/XMLEncoder/Test4679556.java | 1 - test/java/beans/XMLEncoder/Test6989223.java | 60 + test/java/beans/XMLEncoder/Test7080156.java | 60 + test/java/beans/XMLEncoder/Test8013416.java | 90 + test/java/beans/XMLEncoder/Test8013557.java | 84 + test/java/beans/XMLEncoder/java_awt_BorderLayout.java | 6 +- test/java/beans/XMLEncoder/java_awt_CardLayout.java | 83 + test/java/beans/XMLEncoder/java_awt_GridBagLayout.java | 101 + test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java | 6 + test/java/io/File/CreateNewFile.java | 19 +- test/java/io/File/IsHidden.java | 12 +- test/java/io/File/NulFile.java | 625 +++ test/java/io/File/createTempFile/SpecialTempFile.java | 80 + test/java/io/File/isDirectory/Applet.html | 2 - test/java/io/Serializable/accessConstants/AccessConstants.java | 44 - test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java | 1 - test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java | 1 - test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java | 1 - test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java | 1 - test/java/lang/Runtime/exec/ExecCommand.java | 230 + test/java/lang/SecurityManager/CheckPackageAccess.java | 13 +- test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java | 56 + test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh | 96 + test/java/lang/Throwable/SuppressedExceptions.java | 41 +- test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java | 2 +- test/java/net/URL/TestHttps.java | 34 + test/java/nio/MappedByteBuffer/Basic.java | 91 +- test/java/nio/channels/AsyncCloseAndInterrupt.java | 148 +- test/java/nio/channels/DatagramChannel/Connect.java | 4 + test/java/nio/channels/DatagramChannel/ConnectedSend.java | 18 +- test/java/nio/channels/FileChannel/InterruptDeadlock.java | 137 + test/java/nio/channels/Selector/RacyDeregister.java | 148 + test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java | 7 +- test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin test/java/nio/file/Files/NameLimits.java | 103 + test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +- test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java | 3 +- test/java/rmi/registry/readTest/readTest.sh | 3 +- test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java | 4 + test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy | 2 + test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java | 3 +- test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java | 100 + test/java/rmi/testlibrary/RMID.java | 3 + test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java | 9 +- test/java/security/cert/pkix/policyChanges/TestPolicy.java | 12 +- test/java/text/Bidi/Bug6850113.java | 1 + test/java/text/Format/DateFormat/Bug7130335.java | 44 +- test/java/util/EnumMap/ProperEntrySetOnClone.java | 58 + test/java/util/Locale/data/deflocale.sol10 | 1725 ---------- test/java/util/Map/BasicSerialization.java | 221 + test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java | 163 + test/java/util/concurrent/FutureTask/ExplicitSet.java | 87 + test/java/util/logging/DrainFindDeadlockTest.java | 196 + test/java/util/logging/LogManagerInstanceTest.java | 76 + test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties | 25 + test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java | 163 + test/java/util/logging/bundlesearch/LoadItUp1.java | 49 + test/java/util/logging/bundlesearch/LoadItUp2.java | 62 + test/java/util/logging/bundlesearch/LoadItUp2Invoker.java | 60 + test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java | 297 + test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java | 91 + test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties | 25 + test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties | 25 + test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties | 25 + test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java | 4 +- test/javax/naming/spi/DirectoryManager/GetContDirCtx.java | 1 + test/javax/print/PrintServiceLookup/GetPrintServices.java | 58 + test/javax/swing/JComboBox/6337518/bug6337518.java | 48 + test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java | 139 + test/javax/swing/JMenu/4692443/bug4692443.java | 132 + test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java | 85 +- test/javax/swing/JPopupMenu/6827786/bug6827786.java | 8 +- test/javax/swing/JTabbedPane/4624207/bug4624207.java | 6 +- test/javax/swing/JTable/7068740/bug7068740.java | 134 + test/javax/swing/JTree/8004298/bug8004298.java | 11 +- test/javax/swing/KeyboardManager/8013370/Test8013370.java | 110 + test/javax/swing/text/View/8014863/bug8014863.java | 146 + test/javax/swing/text/html/8008289/bug8008289.java | 138 + test/javax/xml/crypto/dsig/GenerationTests.java | 8 +- test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java | 7 +- test/javax/xml/crypto/dsig/ValidationTests.java | 4 +- test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java | 421 ++ test/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java | 103 + test/lib/testlibrary/ClassFileInstaller.java | 53 + test/sun/awt/AppContext/8012933/Test8012933.java | 92 + test/sun/java2d/OpenGL/CustomCompositeTest.java | 2 +- test/sun/java2d/loops/RenderToCustomBufferTest.java | 115 + test/sun/java2d/pipe/Test8004821.java | 60 + test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java | 14 +- test/sun/management/jdp/JdpTest.sh | 117 +- test/sun/management/jdp/JdpUnitTest.java | 8 +- test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher | Bin test/sun/management/windows/revokeall.exe | Bin test/sun/misc/Cleaner/ExitOnThrow.java | 6 +- test/sun/misc/Cleaner/exitOnThrow.sh | 3 +- test/sun/misc/Version/Version.java | 114 +- test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +- test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 + test/sun/nio/cs/OLD/TestIBMDB.java | 1 + test/sun/nio/cs/OLD/TestX11CS.java | 133 - test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java | 248 + test/sun/reflect/CallerSensitive/ClassFileReader.java | 338 + test/sun/reflect/CallerSensitive/MethodFinder.java | 201 + test/sun/reflect/CallerSensitive/MissingCallerSensitive.java | 73 + test/sun/reflect/GetCallerClass.java | 51 + test/sun/security/krb5/auto/SaslGSS.java | 106 + test/sun/security/krb5/name/Immutable.java | 41 + test/sun/security/krb5/tools/KtabZero.java | 78 + test/sun/security/krb5/tools/ktzero.sh | 74 + test/sun/security/pkcs/pkcs9/UnknownAttribute.java | 81 + test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 + test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java | 410 ++ test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java | 6 + test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java | 9 +- test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java | 9 +- test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java | 9 +- test/sun/security/provider/certpath/X509CertPath/ForwardBuildCompromised.java | 312 - test/sun/security/provider/certpath/X509CertPath/ReverseBuildCompromised.java | 315 - test/sun/security/provider/certpath/X509CertPath/ValidateCompromised.java | 297 - test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java | 1 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java | 5 + test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java | 433 ++ test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java | 8 + test/sun/security/tools/keytool/console.sh | 7 +- test/sun/tools/jcmd/help_help.out | 2 +- test/sun/tools/native2ascii/NativeErrors.java | 4 +- test/sun/util/logging/PlatformLoggerTest.java | 132 +- test/tools/launcher/Arrrghs.java | 16 +- test/tools/launcher/I18NJarTest.java | 17 +- test/tools/launcher/RunpathTest.java | 84 + test/tools/pack200/MemoryAllocatorTest.java | 369 ++ 1365 files changed, 67718 insertions(+), 53141 deletions(-) diffs (truncated from 161692 to 500 lines): diff -r 0a00f10abb2d -r 985b0b444f67 .hgtags --- a/.hgtags Wed Apr 10 10:30:17 2013 -0700 +++ b/.hgtags Tue Jul 02 02:26:39 2013 +0100 @@ -50,6 +50,7 @@ f708138c9aca4b389872838fe6773872fce3609e jdk7-b73 eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74 8885b22565077236a927e824ef450742e434a230 jdk7-b75 +fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76 e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78 @@ -63,6 +64,7 @@ eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87 b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88 +2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13 4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89 7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90 08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91 @@ -111,6 +113,7 @@ 554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136 +1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139 @@ -123,6 +126,7 @@ 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01 f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147 +7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02 a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03 b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04 @@ -141,6 +145,7 @@ 79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12 fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13 24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21 +a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02 7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03 fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04 @@ -157,6 +162,7 @@ 6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10 d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11 16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12 +907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13 09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14 9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01 @@ -191,6 +197,7 @@ e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15 966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16 aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17 +8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20 @@ -213,6 +220,8 @@ 901c290c9c8b495a2696f10a87523363239d001b jdk7u9-b02 7302c386ca9c6cd20c27d0a2adb0b142f679d6b3 jdk7u9-b04 ffad06d7009576c3098705e05452ebc309a59e56 jdk7u9-b05 +3b1a395f1948c7063d342a0c3e26c8450c6e7acb jdk7u9-b31 +77f7e5f13763fed11afb6e12840d78bd55c2d979 jdk7u9-b32 c1efb11d7db509dafd7882811b2562ba593f6431 jdk7u10-b10 0243e41000c6f76654725cac31ffdc95633c63e7 jdk7u10-b11 c86a49dd4a0dca3a56f00429cfcffb2ad5f2a224 jdk7u10-b12 @@ -223,8 +232,11 @@ a1c5bac982a6d4aa58f551cb46cde53f526aca48 jdk7u10-b17 115d1e4365293846bbc911cf312886c471e37fbd jdk7u10-b18 84218dff5e4c7bc00fd9266769c0d12bdde866f5 jdk7u10-b30 +3515fd583ede49b125a0b5f72ac403b3984d199b jdk7u10-b31 ecc14534318c80dc7612c8b1d328a67849c5b07f jdk7u11-b20 d9969a953f693f5760b1d2759f11a2cb222e4f20 jdk7u11-b21 +c7282a85c6bcc717b7099a03db028ecb77b41098 jdk7u11-b32 +8fd5e105c6a288b01f8809a6c84a5a64a63f39be jdk7u11-b33 84da14fbd3ac12a3c6734fa4b6a366cfde1426af jdk7u11-b03 932ef74edbf984299a68c126c70bbe04ffbde9b5 jdk7u11-b04 fb35fb91f6478f8076993bcc4112746bcd9a2985 jdk7u11-b05 @@ -253,6 +265,7 @@ cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07 b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08 2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09 +b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10 9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11 ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12 @@ -262,9 +275,45 @@ 835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01 0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02 70b0f967c0649c501fb14a27bb06daeccbff823a jdk7u15-b30 +9f20468265071696b4d2ece286bc228a4d5a302a jdk7u15-b31 +3ef25219292f57ea56ac0ef338ceadf5fd098bdf jdk7u15-b33 87e45d30e24db726ea03b20d861f0a025e437641 jdk7u15-b03 b5ae6fb92e71df1833221026efe50863593bf682 jdk7u17-b01 b130c8cfecfc552614047b3244d5d94439827fcd jdk7u17-b02 +a474615061bf610105a426780a7ac4c95bd76456 jdk7u17-b30 +1ad6f413e250bd2671b4908e232bd0d244c917a7 jdk7u17-b31 +6c6b9d7943e78d1f797b0c2e1c1231f81816dfde jdk7u17-b32 +8261e56b7f91c7553e8485b206bdc9030a3546e4 jdk7u21-b01 +af6be9d7aed7c323858932c908b049f4bcdb6a3e jdk7u21-b05 +ffc1454e644a39265cd6d80ef4b4c12c5dbf35c9 jdk7u21-b06 +b453d9be6b3f5496aa217ade7478d3b7fa32b13b jdk7u21-b07 +de4e41c5c549136209a68154d847cf126e563b88 jdk7u21-b08 +622aedcdda610a148a082558a0c25d8b3b735d07 jdk7u21-b09 +f447c3bbf074439ece0ce9fea82c857f93817801 jdk7u21-b10 +f9323b9d020ce8d313af2d2e2682e2b6cabcc40d jdk7u21-b11 +08ed0bfc9668f04ce4e3803f16aad92f6e50f885 jdk7u21-b30 +f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b12 +a5e712ea6944b1c81bcd5343a50645964f12b107 jdk7u21-b02 +9d87f5f84afef6ba4c92523a76e3c81fd9acfa00 jdk7u21-b03 +139d3e3b62d49374112ce1add84cd3d1e5ed5335 jdk7u21-b04 +7fd0922d6ed2988954c666de313f7fceef75dc63 jdk7u25-b01 +846304f476f1b1d2955d025d54307be76c3c4874 jdk7u25-b02 +2a444d8e36ebc7161a735b45143b22e141d9a5c0 jdk7u25-b03 +7fc6c331082c3586fa6c6ead014c96f3c532bc34 jdk7u25-b04 +f2d4da9ba0f05165e8a85d0fd5085d707e434eab jdk7u25-b05 +5748526c96f0d3fd5771b72a81fcd61f4e23b0d8 jdk7u25-b06 +fe514475bc17355f5f0a8dc7dd423d0043ed5326 jdk7u25-b07 +f8373784a79eba32b47e655cc5880f594a12423c jdk7u25-b08 +023297d5b047c0b6c54869d6514fa3c1427c206c jdk7u25-b09 +c82ed89b21bcb5279ff2fd4bc54127cd580dea7e jdk7u25-b10 +ef5d29607ccee9712f2c768f269e4b9fa53a6859 jdk7u25-b11 +39282f16234385bbddd19189de2450f8bf88492b jdk7u25-b12 +ba6c3d64b94d17d90b86e36b7a282480a1c6808a jdk7u25-b13 +a71103b8cbb155a4af136baaee4f4bdd30ee817c jdk7u25-b14 +e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15 +0d68732acbd4b6669512b1d2be496a9e391795a9 jdk7u25-b30 +173b399abd8aa2e4fdc0066c977719670d180125 jdk7u25-b16 +55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32 555ea0c4e9567294d37793777d521902d43f1a39 jdk7u14-b16 950fa827c2ec8a3a1ceba755994ae59016daa621 jdk7u14-b17 e7ba683c15009b166127c3437fe9fbaf4eee6efe jdk7u14-b18 @@ -272,3 +321,15 @@ eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19 a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19 bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20 +d1563025e086a464f05414267b84a6408f7b377d icedtea-2.4.0 +0a00f10abb2df203f13a723be158fb759e54b19b jdk7u14-b21 +d4bf5c15837c47d179c71f6df8716ad9bef53ef9 jdk7u14-b22 +a76a886dc057582bf332e60a023d8f8a35526217 jdk7u40-b23 +8e3d618505d33572c7b087f47e60818269f71475 jdk7u40-b24 +889f9b9f79b4ec9ea52754a1ad134ed92d4f9672 jdk7u40-b25 +ac03c48f1d82e0c8c1d5d72b8953be8aef558d87 jdk7u40-b26 +6ce66ba864780251fc44fff65358ef24f68ea51a jdk7u40-b27 +2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28 +d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29 +60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30 +65d95818d79e340d042457ee1a8155d7658e86b6 icedtea-2.4.1 diff -r 0a00f10abb2d -r 985b0b444f67 .jcheck/conf --- a/.jcheck/conf Wed Apr 10 10:30:17 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 0a00f10abb2d -r 985b0b444f67 make/com/oracle/jfr/Makefile --- a/make/com/oracle/jfr/Makefile Wed Apr 10 10:30:17 2013 -0700 +++ b/make/com/oracle/jfr/Makefile Tue Jul 02 02:26:39 2013 +0100 @@ -73,8 +73,9 @@ JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc)) +-include ${JDK_TOPDIR}/make/closed/common/jfr.gmk + $(JFC_XSD_FILE) : $(JFC_XSD_SRC) $(install-file) -all build : $(JFC_FILES) $(JFC_XSD_FILE) - +all build: $(JFC_FILES) $(JFC_XSD_FILE) diff -r 0a00f10abb2d -r 985b0b444f67 make/com/sun/Makefile --- a/make/com/sun/Makefile Wed Apr 10 10:30:17 2013 -0700 +++ b/make/com/sun/Makefile Tue Jul 02 02:26:39 2013 +0100 @@ -45,7 +45,7 @@ SUBDIRS_desktop = image SUBDIRS_enterprise = crypto/provider jndi \ org rowset net/httpserver -SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo +SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo # Omit mirror since it's built with the apt tool. SUBDIRS_tools = tools diff -r 0a00f10abb2d -r 985b0b444f67 make/com/sun/java/pack/Makefile --- a/make/com/sun/java/pack/Makefile Wed Apr 10 10:30:17 2013 -0700 +++ b/make/com/sun/java/pack/Makefile Tue Jul 02 02:26:39 2013 +0100 @@ -75,7 +75,7 @@ OTHER_CXXFLAGS += $(ZINCLUDE) LDDFLAGS += $(ZIPOBJS) else - LDDFLAGS += $(ZLIB_LIBS) + OTHER_LDLIBS += $(ZLIB_LIBS) OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB endif else @@ -99,8 +99,7 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space - LDDFLAGS += -lc - OTHER_LDLIBS += $(LIBCXX) + OTHER_LDLIBS += -lc $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ifeq ("$(CC_VER_MAJOR)", "3") @@ -157,7 +156,7 @@ $(prep-target) $(RM) $(TEMPDIR)/mapfile-vers $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) + $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif diff -r 0a00f10abb2d -r 985b0b444f67 make/com/sun/nio/sctp/Makefile --- a/make/com/sun/nio/sctp/Makefile Wed Apr 10 10:30:17 2013 -0700 +++ b/make/com/sun/nio/sctp/Makefile Tue Jul 02 02:26:39 2013 +0100 @@ -60,7 +60,9 @@ -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders ifeq ($(PLATFORM), linux) +ifneq ($(COMPILER_WARNINGS_FATAL),false) COMPILER_WARNINGS_FATAL=true +endif #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl endif diff -r 0a00f10abb2d -r 985b0b444f67 make/com/sun/servicetag/Makefile --- a/make/com/sun/servicetag/Makefile Wed Apr 10 10:30:17 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -# Copyright (c) 2008, 2011, 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. - -BUILDDIR = ../../.. -PACKAGE = com.sun.servicetag -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files to compile -# -AUTO_FILES_JAVA_DIRS = com/sun/servicetag - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - -SERVICETAG_LIBDIR = $(LIBDIR)/servicetag -SERVICETAG_RESOURCES_DIR = $(CLASSDESTDIR)/com/sun/servicetag/resources -FILES_copy = $(SERVICETAG_RESOURCES_DIR)/product_registration.xsd \ - $(SERVICETAG_RESOURCES_DIR)/register.html \ - $(SERVICETAG_RESOURCES_DIR)/register_ja.html \ - $(SERVICETAG_RESOURCES_DIR)/register_zh_CN.html \ - $(SERVICETAG_LIBDIR)/jdk_header.png - -# Add all properties files to the FILES_copy list -SWORDFISH_properties := $(shell \ - $(CD) $(SHARE_SRC)/classes/com/sun/servicetag/resources; \ - $(FIND) . -name 'javase_*_swordfish.properties' -print ; \ - ) -FILES_copy += $(shell \ - for f in $(SWORDFISH_properties) ; do \ - echo $(SERVICETAG_RESOURCES_DIR)/$$f ; \ - done \ -) - - -# -#OTHER_JAVACFLAGS += -Xlint:unchecked - -build: install-servicetag-lib copy-files - -copy-files: $(FILES_copy) - -$(CLASSBINDIR)/%: $(SHARE_SRC)/classes/% - $(install-file) - -$(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png - $(install-file) - $(call chmod-file, 444) - -install-servicetag-lib: - @$(RM) -rf $(SERVICETAG_LIBDIR) - $(MKDIR) $(SERVICETAG_LIBDIR) - -clean clobber:: - @$(RM) $(FILES_copy) - -.PHONY: copy-files diff -r 0a00f10abb2d -r 985b0b444f67 make/common/Defs-linux.gmk --- a/make/common/Defs-linux.gmk Wed Apr 10 10:30:17 2013 -0700 +++ b/make/common/Defs-linux.gmk Tue Jul 02 02:26:39 2013 +0100 @@ -188,15 +188,26 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this # as the default. +CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_hppa += CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_m68k += +CFLAGS_REQUIRED_mips += +CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_ppc += -m32 +CFLAGS_REQUIRED_ppc64 += -m64 +CFLAGS_REQUIRED_s390 += +CFLAGS_REQUIRED_s390x += -m64 CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN +CFLAGS_REQUIRED_sh += -mieee ifeq ($(ZERO_BUILD), true) CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) ifeq ($(ZERO_ENDIANNESS), little) @@ -286,11 +297,15 @@ CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' -# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) -ifneq ($(ARCH),alpha) +# Alpha and sh archs do not like "alpha" or "sh" defined (potential general arch cleanup issue here) +ifeq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D_$(ARCH)_ +else +ifeq ($(ARCH),sh) + CPP_ARCH_FLAGS += -D_$(ARCH)_ +else CPP_ARCH_FLAGS += -D$(ARCH) -else - CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif endif CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ diff -r 0a00f10abb2d -r 985b0b444f67 make/common/Defs-windows.gmk --- a/make/common/Defs-windows.gmk Wed Apr 10 10:30:17 2013 -0700 +++ b/make/common/Defs-windows.gmk Tue Jul 02 02:26:39 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2013, 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 @@ -433,40 +433,3 @@ -d "JDK_COPYRIGHT=$(JDK_RC_COPYRIGHT)" \ -d "JDK_NAME=$(JDK_RC_NAME)" \ -d "JDK_FVER=$(JDK_RC_FVER)" - -# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available -ifeq ($(ARCH_DATA_MODEL), 32) - ifneq ($(KERNEL), off) - # This is a hack to use until 7-Zip (and UPX) bundles can be put - # under /java/devtools. - ifndef DEPLOY_TOPDIR - DEPLOY_TOPDIR=$(JDK_TOPDIR)/../deploy - endif - # Uncomment this block to cause build failure if above assumption false - #DCHK = $(shell if [ ! -d $(DEPLOY_TOPDIR) ] ; then \ - # $(ECHO) deploy_not_a_peer_of_j2se ; \ - #fi ) - #ifeq ($(DCHK), deploy_not_a_peer_of_j2se) - # If a build failure points to control coming here it means - # it means deploy is not in the same directory - # as j2se. Java Kernel can't tolerate that for the time being. - #endif - EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(EC_TMP), true) - EXTRA_COMP_INSTALL_PATH = lib\\\\deploy\\\\lzma.dll - # Crazy but true: deploy/make/plugin/jinstall/Makefile.jkernel does - # not include deploy/make/common/Defs-windows.gmk, either directly - # or indirectly. But it does include this file, so redundantly declare - # these variables that are in deploy/make/common/Defs-windows.gmk for - # the sake of the Java Kernel part of the deploy build. Whew! - EXTRA_COMP_LIB_NAME = lzma.dll - EXTRA_COMP_PATH = $(OUTPUTDIR)/tmp/deploy/lzma/win32/obj - EXTRA_COMP_CMD_PATH = $(EXTRA_COMP_PATH)/lzma.exe - EXTRA_COMP_LIB_PATH = $(EXTRA_COMP_PATH)/$(EXTRA_COMP_LIB_NAME) - endif - endif -endif diff -r 0a00f10abb2d -r 985b0b444f67 make/common/Defs.gmk --- a/make/common/Defs.gmk Wed Apr 10 10:30:17 2013 -0700 +++ b/make/common/Defs.gmk Tue Jul 02 02:26:39 2013 +0100 @@ -431,7 +431,12 @@ # namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific # relatives. # -VPATH0.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export +ifeq ($(PLATFORM), macosx) + VPATH0.h = $(PLATFORM_SRC_MACOS)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export +else + VPATH0.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export +endif + ifdef OPENJDK VPATH.h = $(VPATH0.h) else diff -r 0a00f10abb2d -r 985b0b444f67 make/common/Library.gmk --- a/make/common/Library.gmk Wed Apr 10 10:30:17 2013 -0700 +++ b/make/common/Library.gmk Tue Jul 02 02:26:39 2013 +0100 @@ -269,6 +269,7 @@ ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) ifeq ($(PLATFORM), solaris) # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from @@ -279,19 +280,20 @@ # # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. - (set -e ; \ - $(CD) $(@D) ; \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ - ) + (set -e ; \ + $(CD) $(@D) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) else # PLATFORM != solaris - (set -e ; \ - $(CD) $(@D) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ - ) - endif # PLATFORM == solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) + endif # PLATFORM == solaris + endif # STRIP_POLICY != no_strip ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else @@ -305,12 +307,14 @@ # implied else here is no stripping at all endif endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) - (set -e ; \ - $(CD) $(@D) ; \ - $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - ) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + ) + endif endif endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS endif # ENABLE_FULL_DEBUG_SYMBOLS diff -r 0a00f10abb2d -r 985b0b444f67 make/common/Program.gmk --- a/make/common/Program.gmk Wed Apr 10 10:30:17 2013 -0700 +++ b/make/common/Program.gmk Tue Jul 02 02:26:39 2013 +0100 @@ -62,12 +62,14 @@ program: $(ACTUAL_PROGRAM) From bugzilla-daemon at icedtea.classpath.org Mon Jul 1 21:30:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 02 Jul 2013 04:30:44 +0000 Subject: [Bug 1490] New: crash on start josm Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1490 Bug ID: 1490 Summary: crash on start josm Classification: Unclassified Product: IcedTea Version: 6-1.11.5 Hardware: x86 OS: Linux Status: NEW Severity: critical Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: progserega at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 899 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=899&action=edit crash log Crash, after add new presets from inet list -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130702/b5e43bca/attachment.html From andrew at icedtea.classpath.org Mon Jul 1 21:35:54 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 02 Jul 2013 04:35:54 +0000 Subject: /hg/release/icedtea7-2.4: Update to 7u40 b31 / IcedTea 2.4.1 tag. Message-ID: changeset 27b37759ec5f in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=27b37759ec5f author: Andrew John Hughes date: Tue Jul 02 05:35:39 2013 +0100 Update to 7u40 b31 / IcedTea 2.4.1 tag. 2013-07-01 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to b31. (CORBA_CHANGESET): Update to IcedTea 2.4.1 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * hotspot.map: Update default to IcedTea 2.4.1 tag. * patches/boot/ecj-diamond.patch, * patches/boot/ecj-multicatch.patch: Add new cases. * patches/boot/ecj-stringswitch.patch: Update MethodHandleNatives patch, including adding new case. * patches/boot/tobin.patch: Update following move from sun.awt.X11 to sun.awt. * patches/rhino.patch, * patches/systemtap_gc.patch: Regenerated. diffstat: ChangeLog | 30 +++ Makefile.am | 26 +- hotspot.map | 2 +- patches/boot/ecj-diamond.patch | 60 ++++++ patches/boot/ecj-multicatch.patch | 51 +++++ patches/boot/ecj-stringswitch.patch | 345 ++++++++++++++++++++--------------- patches/boot/tobin.patch | 38 ++- patches/rhino.patch | 54 ++-- patches/systemtap_gc.patch | 54 ++-- 9 files changed, 423 insertions(+), 237 deletions(-) diffs (truncated from 1025 to 500 lines): diff -r 861abb252466 -r 27b37759ec5f ChangeLog --- a/ChangeLog Tue Jun 11 11:09:13 2013 +0100 +++ b/ChangeLog Tue Jul 02 05:35:39 2013 +0100 @@ -1,3 +1,33 @@ +2013-07-01 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to b31. + (CORBA_CHANGESET): Update to IcedTea 2.4.1 tag. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update default to IcedTea 2.4.1 tag. + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-multicatch.patch: + Add new cases. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives patch, including + adding new case. + * patches/boot/tobin.patch: + Update following move from sun.awt.X11 + to sun.awt. + * patches/rhino.patch, + * patches/systemtap_gc.patch: + Regenerated. + 2013-06-11 Andrew John Hughes * configure.ac: Bump to 2.4.1pre. diff -r 861abb252466 -r 27b37759ec5f Makefile.am --- a/Makefile.am Tue Jun 11 11:09:13 2013 +0100 +++ b/Makefile.am Tue Jul 02 05:35:39 2013 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b20 +OPENJDK_VERSION = b31 JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 71d5ec2f3dfb -JAXP_CHANGESET = 5eaf3bca7f68 -JAXWS_CHANGESET = 9d2007a13c02 -JDK_CHANGESET = 29ce11184945 -LANGTOOLS_CHANGESET = ffb1b6bc4750 -OPENJDK_CHANGESET = 9c74cb4a3ae8 +CORBA_CHANGESET = 23ae4e0e0cce +JAXP_CHANGESET = 5be6b670d08b +JAXWS_CHANGESET = c0e48fdfb695 +JDK_CHANGESET = 65d95818d79e +LANGTOOLS_CHANGESET = 91c95fd8eea8 +OPENJDK_CHANGESET = ae86c6974e8e -CORBA_SHA256SUM = 0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c -JAXP_SHA256SUM = 25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd -JAXWS_SHA256SUM = 4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456 -JDK_SHA256SUM = 13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352 -LANGTOOLS_SHA256SUM = 80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3 -OPENJDK_SHA256SUM = 4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579 +CORBA_SHA256SUM = 618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395 +JAXP_SHA256SUM = df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34 +JAXWS_SHA256SUM = 972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037 +JDK_SHA256SUM = 97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432 +LANGTOOLS_SHA256SUM = 6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561 +OPENJDK_SHA256SUM = f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -r 861abb252466 -r 27b37759ec5f hotspot.map --- a/hotspot.map Tue Jun 11 11:09:13 2013 +0100 +++ b/hotspot.map Tue Jul 02 05:35:39 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot c67fd7874b1a 34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 5f53e7717116 f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42 diff -r 861abb252466 -r 27b37759ec5f patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Tue Jun 11 11:09:13 2013 +0100 +++ b/patches/boot/ecj-diamond.patch Tue Jul 02 05:35:39 2013 +0100 @@ -6997,3 +6997,63 @@ List threads = new ArrayList(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-06-27 16:06:42.289384018 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-06-27 16:07:06.489768521 +0100 +@@ -1164,7 +1164,7 @@ + end = end.getSuperclass(); + } + +- HashSet oscNames = new HashSet<>(3); ++ HashSet oscNames = new HashSet(3); + + for (ObjectStreamClass d = this; d != null; d = d.superDesc) { + if (oscNames.contains(d.name)) { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-06-27 16:06:53.297558922 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-06-27 16:07:32.294178507 +0100 +@@ -106,7 +106,7 @@ + * Note that this only applies to createFont() from an InputStream object. + */ + private static class TempFileDeletionHook { +- private static HashMap files = new HashMap<>(); ++ private static HashMap files = new HashMap(); + + private static Thread t = null; + static void init() { +diff --git a/src/share/classes/com/sun/media/sound/AbstractLine.java b/src/share/classes/com/sun/media/sound/AbstractLine.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java +@@ -54,7 +54,7 @@ + * Contains event dispatcher per thread group. + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * Constructs a new AbstractLine. +diff --git a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +@@ -59,7 +59,7 @@ + * dispatcher instance with a factory in EventDispatcher + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * All RealTimeSequencers share this info object. +diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-06-27 20:05:19.200970932 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-06-27 20:05:33.857203747 +0100 +@@ -113,7 +113,7 @@ + SocketAddress[] saa) + { + SecurityManager sm = System.getSecurityManager(); +- Set set = new HashSet<>(saa.length); ++ Set set = new HashSet(saa.length); + for (SocketAddress sa : saa) { + set.add(getRevealedLocalAddress(sa, sm)); + } diff -r 861abb252466 -r 27b37759ec5f patches/boot/ecj-multicatch.patch --- a/patches/boot/ecj-multicatch.patch Tue Jun 11 11:09:13 2013 +0100 +++ b/patches/boot/ecj-multicatch.patch Tue Jul 02 05:35:39 2013 +0100 @@ -401,3 +401,54 @@ throw new InternalError(e.toString()); } catch (InvocationTargetException e) { Throwable t = e.getCause(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2013-06-27 15:56:57.456088537 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2013-06-27 16:02:12.857102777 +0100 +@@ -402,7 +402,13 @@ + try { + ServerNotifForwarder.checkMBeanPermission(this.mBeanServer, + candidate.getObjectName(),"addNotificationListener"); +- } catch (InstanceNotFoundException | SecurityException e) { ++ } catch (InstanceNotFoundException e) { ++ if (logger.debugOn()) { ++ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e); ++ } ++ ++nextSeq; ++ continue; ++ } catch (SecurityException e) { + if (logger.debugOn()) { + logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-06-27 15:56:27.295609027 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-06-27 16:00:59.631938678 +0100 +@@ -1024,10 +1024,10 @@ + dir, + redirects, + redirectErrorStream); +- } catch (IOException | IllegalArgumentException e) { ++ } catch (IOException e) { + String exceptionInfo = ": " + e.getMessage(); + Throwable cause = e; +- if ((e instanceof IOException) && security != null) { ++ if (security != null) { + // Can not disclose the fail reason for read-protected files. + try { + security.checkRead(prog); +@@ -1039,6 +1039,16 @@ + // It's much easier for us to create a high-quality error + // message than the low-level C code which found the problem. + throw new IOException( ++ "Cannot run program \"" + prog + "\"" ++ + (dir == null ? "" : " (in directory \"" + dir + "\")") ++ + exceptionInfo, ++ cause); ++ } catch (IllegalArgumentException e) { ++ String exceptionInfo = ": " + e.getMessage(); ++ Throwable cause = e; ++ // It's much easier for us to create a high-quality error ++ // message than the low-level C code which found the problem. ++ throw new IOException( + "Cannot run program \"" + prog + "\"" + + (dir == null ? "" : " (in directory \"" + dir + "\")") + + exceptionInfo, diff -r 861abb252466 -r 27b37759ec5f patches/boot/ecj-stringswitch.patch --- a/patches/boot/ecj-stringswitch.patch Tue Jun 11 11:09:13 2013 +0100 +++ b/patches/boot/ecj-stringswitch.patch Tue Jul 02 05:35:39 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 13:22:25.036506097 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-02 03:38:10.090272900 +0100 @@ -350,19 +350,16 @@ if (attrCommands != null) { Object lkey = Attribute.keyForLookup(ctype, name); @@ -32,8 +32,8 @@ // Find canonical instance of the requested attribute. Attribute a = Attribute.lookup(Package.attrDefs, ctype, name); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 13:22:25.048506291 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-02 03:38:10.106273156 +0100 @@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -91,8 +91,8 @@ if (logFile != null && !logFile.equals("")) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 13:22:25.052506355 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-02 03:38:10.106273156 +0100 @@ -1116,30 +1116,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -144,8 +144,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-04-04 13:22:25.056506419 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-07-02 03:38:10.106273156 +0100 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -182,9 +182,9 @@ fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-04 13:32:45.886517863 +0100 -@@ -327,12 +327,11 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-07-02 03:42:53.718781065 +0100 +@@ -328,12 +328,11 @@ Object[] appendixResult) { try { if (defc == MethodHandle.class && refKind == REF_invokeVirtual) { @@ -202,59 +202,24 @@ } } catch (Throwable ex) { if (ex instanceof LinkageError) -@@ -395,111 +394,106 @@ - static boolean isCallerSensitive(MemberName mem) { - if (!mem.isInvocable()) return false; // fields are not caller sensitive - Class defc = mem.getDeclaringClass(); -- switch (mem.getName()) { +@@ -403,122 +402,118 @@ + // this method is also called by test/sun/reflect/CallerSensitiveFinder + // to validate the hand-maintained list + private static boolean isCallerSensitiveMethod(Class defc, String method) { +- switch (method) { - case "doPrivileged": - case "doPrivilegedWithCombiner": -+ String memName = mem.getName(); -+ if ("doPrivileged".equals(memName) || -+ "doPrivilegedWithCombiner".equals(memName)) { ++ if ("doPrivileged".equals(method) || ++ "doPrivilegedWithCombiner".equals(method)) { return defc == java.security.AccessController.class; - case "checkMemberAccess": -+ } else if ("checkMemberAccess".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.SecurityManager.class); +- return defc == java.lang.SecurityManager.class; - case "getUnsafe": - return defc == sun.misc.Unsafe.class; - case "lookup": -+ } else if ("getUnsafe".equals(memName)) { -+ return defc == sun.misc.Unsafe.class; -+ } else if ("lookup".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.class; -- case "findStatic": -- case "findVirtual": -- case "findConstructor": -- case "findSpecial": -- case "findGetter": -- case "findSetter": -- case "findStaticGetter": -- case "findStaticSetter": -- case "bind": -- case "unreflect": -- case "unreflectSpecial": -- case "unreflectConstructor": -- case "unreflectGetter": -- case "unreflectSetter": -+ } else if ("findStatic".equals(memName) || -+ "findVirtual".equals(memName) || -+ "findConstructor".equals(memName) || -+ "findSpecial".equals(memName) || -+ "findGetter".equals(memName) || -+ "findSetter".equals(memName) || -+ "findStaticGetter".equals(memName) || -+ "findStaticSetter".equals(memName) || -+ "bind".equals(memName) || -+ "unreflect".equals(memName) || -+ "unreflectSpecial".equals(memName) || -+ "unreflectConstructor".equals(memName) || -+ "unreflectGetter".equals(memName) || -+ "unreflectSetter".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.Lookup.class; +- return defc == java.lang.invoke.MethodHandles.class; - case "invoke": -+ } else if ("invoke".equals(memName)) { - return defc == java.lang.reflect.Method.class; +- return defc == java.lang.reflect.Method.class; - case "get": - case "getBoolean": - case "getByte": @@ -273,33 +238,17 @@ - case "setLong": - case "setFloat": - case "setDouble": -+ } else if ("get".equals(memName) || -+ "getBoolean".equals(memName) || -+ "getByte".equals(memName) || -+ "getChar".equals(memName) || -+ "getShort".equals(memName) || -+ "getInt".equals(memName) || -+ "getFloat".equals(memName) || -+ "getDouble".equals(memName) || -+ "set".equals(memName) || -+ "setBoolean".equals(memName) || -+ "setByte".equals(memName) || -+ "setChar".equals(memName) || -+ "setShort".equals(memName) || -+ "setInt".equals(memName) || -+ "setLong".equals(memName) || -+ "setFloat".equals(memName) || -+ "setDouble".equals(memName)) { - return defc == java.lang.reflect.Field.class; +- return defc == java.lang.reflect.Field.class; - case "newInstance": -+ } else if ("newInstance".equals(memName)) { - if (defc == java.lang.reflect.Constructor.class) return true; - if (defc == java.lang.Class.class) return true; +- if (defc == java.lang.reflect.Constructor.class) return true; +- if (defc == java.lang.Class.class) return true; - break; +- case "getFields": +- return defc == java.lang.Class.class || +- defc == javax.sql.rowset.serial.SerialJavaObject.class; - case "forName": - case "getClassLoader": - case "getClasses": -- case "getFields": - case "getMethods": - case "getConstructors": - case "getDeclaredClasses": @@ -312,88 +261,178 @@ - case "getDeclaredField": - case "getDeclaredMethod": - case "getDeclaredConstructor": -+ } else if ("forName".equals(memName) || -+ "getClassLoader".equals(memName) || -+ "getClasses".equals(memName) || -+ "getFields".equals(memName) || -+ "getMethods".equals(memName) || -+ "getConstructors".equals(memName) || -+ "getDeclaredClasses".equals(memName) || -+ "getDeclaredFields".equals(memName) || -+ "getDeclaredMethods".equals(memName) || -+ "getDeclaredConstructors".equals(memName) || -+ "getField".equals(memName) || -+ "getMethod".equals(memName) || -+ "getConstructor".equals(memName) || -+ "getDeclaredField".equals(memName) || -+ "getDeclaredMethod".equals(memName) || -+ "getDeclaredConstructor".equals(memName)) { - return defc == java.lang.Class.class; +- case "getEnclosingClass": +- case "getEnclosingMethod": +- case "getEnclosingConstructor": +- return defc == java.lang.Class.class; - case "getConnection": - case "getDriver": - case "getDrivers": - case "deregisterDriver": -+ } else if ("getConnection".equals(memName) || -+ "getDriver".equals(memName) || -+ "getDrivers".equals(memName) || -+ "deregisterDriver".equals(memName)) { - return defc == java.sql.DriverManager.class; +- return defc == java.sql.DriverManager.class; - case "newUpdater": -+ } else if ("newUpdater".equals(memName)) { - if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; - if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; - if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; - break; - case "getContextClassLoader": +- return defc == java.lang.Thread.class; +- case "getPackage": +- case "getPackages": +- return defc == java.lang.Package.class; +- case "getParent": +- case "getSystemClassLoader": +- return defc == java.lang.ClassLoader.class; +- case "load": +- case "loadLibrary": +- if (defc == java.lang.Runtime.class) return true; +- if (defc == java.lang.System.class) return true; +- break; +- case "getCallerClass": +- if (defc == sun.reflect.Reflection.class) return true; +- if (defc == java.lang.System.class) return true; +- break; +- case "getCallerClassLoader": +- return defc == java.lang.ClassLoader.class; +- case "registerAsParallelCapable": +- return defc == java.lang.ClassLoader.class; +- case "getProxyClass": +- case "newProxyInstance": +- return defc == java.lang.reflect.Proxy.class; +- case "asInterfaceInstance": +- return defc == java.lang.invoke.MethodHandleProxies.class; +- case "getBundle": +- case "clearCache": +- return defc == java.util.ResourceBundle.class; +- case "getType": +- return defc == java.io.ObjectStreamField.class; +- case "forClass": +- return defc == java.io.ObjectStreamClass.class; +- case "getLogger": +- return defc == java.util.logging.Logger.class; +- case "getAnonymousLogger": +- return defc == java.util.logging.Logger.class; +- } +- return false; ++ } else if ("checkMemberAccess".equals(method)) { ++ return defc == java.lang.SecurityManager.class; ++ } else if ("getUnsafe".equals(method)) { ++ return defc == sun.misc.Unsafe.class; ++ } else if ("lookup".equals(method)) { ++ return defc == java.lang.invoke.MethodHandles.class; ++ } else if ("invoke".equals(method)) { ++ return defc == java.lang.reflect.Method.class; ++ } else if ("get".equals(method) || ++ "getBoolean".equals(method) || ++ "getByte".equals(method) || ++ "getChar".equals(method) || ++ "getShort".equals(method) || ++ "getInt".equals(method) || ++ "getLong".equals(method) || ++ "getFloat".equals(method) || ++ "getDouble".equals(method) || ++ "set".equals(method) || ++ "setBoolean".equals(method) || ++ "setByte".equals(method) || ++ "setChar".equals(method) || ++ "setShort".equals(method) || ++ "setInt".equals(method) || ++ "setLong".equals(method) || ++ "setFloat".equals(method) || ++ "setDouble".equals(method)) { ++ return defc == java.lang.reflect.Field.class; ++ } else if ("newInstance".equals(method)) { ++ if (defc == java.lang.reflect.Constructor.class) return true; ++ if (defc == java.lang.Class.class) return true; ++ } else if ("getFields".equals(method)) { ++ return defc == java.lang.Class.class || ++ defc == javax.sql.rowset.serial.SerialJavaObject.class; ++ } else if ("forName".equals(method) || ++ "getClassLoader".equals(method) || ++ "getClasses".equals(method) || ++ "getFields".equals(method) || ++ "getMethods".equals(method) || ++ "getConstructors".equals(method) || ++ "getDeclaredClasses".equals(method) || ++ "getDeclaredFields".equals(method) || From jvanek at redhat.com Tue Jul 2 06:33:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 02 Jul 2013 15:33:00 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51C85510.9000000@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> Message-ID: <51D2D68C.6080407@redhat.com> Hi! nice progress! Especially headless one working and cut news/changelog are nice improvements. General comments: - remove applications.html (but url to our set of manual reproducers with notes how and why to add new one should be mentioned somewhere) - drop notes - dropping of jamIcon is up to you, I'm for usage of it in new authors;) - refactor about - I think you can reuse some text, but it it should be read from properties - also you can reuse some parts from notes and applications, but instead of individual application proper links to icedtea web pages should be provided - also it can be worthy to include some image in main about - eg shrinken logo of splash image? Or to draw the vector from which is hardcoded? - new text have to be added to "new" about - to describe IcedTea-web properly (also worthy to mention plugin, itw-settings, homepage(s!), purpose of new tabs and so on... - actually the new colourful main about have the same importance as the new nice generated files you already provided - you can reuse already provided splash logo, or (probably better) use your own, derived one same palce as other resources. Just keep in mind that those "new logo" and current splash should be very similar. - some indentation/mark-up both for headless/head"full" versions - centre the dialogue (tehre is utility method for such a stuff) - what about renaming of Copying into GPLv2 License ? (just $0.02) - btw about, Authors, Changelog, News... All the tabs should now be read from resources too. Don't take me wrong, this is nice work and most of above are just small nits and some can be done as separated chnageset. - Big nit - redesign the dialogue completely? So it will be "nice" ? - I'm in favour hardcoded (localisable) main "about" screen and then some better swapping to (more customised to its purpose) three underlying tabs. However, unless you really wont this have low priority definitely should go as separate chnageset. - nitpickers note - see other apps about dialogues :) Itw is really few decades behind.... Code commetns inline On 06/24/2013 04:17 PM, Andrew Azores wrote: > Changelog: > > * Makefile.am: removed logic for extras.jar, added netx-html-gen stamp > * netx/net/sourceforge/jnlp/about/AboutDialog.java (main, centerDialog, createAndShowGUI, display): added tabs for new generated HTML, removed unused methods, added static display method. Moved out of extras into netx and renamed from Main to AboutDialog. > * netx/net/sourceforge/jnlp/about/HTMLPanel.java: changed imports to match refactor of AboutDialog > * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, getJNLPFile): changed way of opening About dialog to using new static display method rather than JNLP launch. Removed methods relating to old JNLP launch. > > * netx/net/sourceforge/jnlp/resources/Messages.properties: added info for javaws -about -headless > * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras > * netx/net/sourceforge/jnlp/resources/applications.html: same > * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: same > * netx/net/sourceforge/jnlp/resources/notes.html: same > * netx/net/sourceforge/jnlp/resources/notes.html: same > > Creating the HTML docs from plaintext AUTHORS, COPYING, NEWS, ChangeLog is now done in the Makefile rather than at runtime. Boot.java also now properly launches the About Dialog. > > Thanks, > > Andrew A > > > fix.patch > > > diff --git a/extra/net/sourceforge/javaws/about/Main.java b/netx/net/sourceforge/jnlp/about/AboutDialog.java > copy from extra/net/sourceforge/javaws/about/Main.java > copy to netx/net/sourceforge/jnlp/about/AboutDialog.java > --- a/extra/net/sourceforge/javaws/about/Main.java > +++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java > @@ -35,83 +35,68 @@ obligated to do so. If you do not wish > exception statement from your version. > */ > > -package net.sourceforge.javaws.about; > +package net.sourceforge.jnlp.about; > > import java.awt.BorderLayout; > import java.awt.Dimension; > -import java.awt.Toolkit; > import java.io.IOException; > +import java.net.URL; > > import javax.swing.JFrame; > import javax.swing.JPanel; > import javax.swing.JTabbedPane; > -import javax.swing.UIManager; > > +public class AboutDialog extends JPanel { > > -public class Main extends JPanel { > + JTabbedPane tabbedPane; > > - private final String notes = "/net/sourceforge/javaws/about/resources/notes.html"; > - private final String apps = "/net/sourceforge/javaws/about/resources/applications.html"; > - private final String about = "/net/sourceforge/javaws/about/resources/about.html"; > - JTabbedPane tabbedPane; > + private static final String notes_url = "/net/sourceforge/jnlp/resources/notes.html"; > + private static final String apps_url = "/net/sourceforge/jnlp/resources/applications.html"; > + private static final String about_url = "/net/sourceforge/jnlp/resources/about.html"; > + private static final String authors_url = "/net/sourceforge/jnlp/resources/AUTHORS.html"; > + private static final String changelog_url = "/net/sourceforge/jnlp/resources/ChangeLog.html"; > + private static final String copying_url = "/net/sourceforge/jnlp/resources/COPYING.html"; > + private static final String news_url = "/net/sourceforge/jnlp/resources/NEWS.html"; > > - public Main() throws IOException { > - super(new BorderLayout()); > - > - HTMLPanel notesPanel = new HTMLPanel(getClass().getResource(notes)); > - HTMLPanel appsPanel = new HTMLPanel(getClass().getResource(apps)); > - HTMLPanel aboutPanel = new HTMLPanel(getClass().getResource(about)); > - > - > - > - tabbedPane = new JTabbedPane(); > + public AboutDialog() throws IOException { > + super(new BorderLayout()); > > - tabbedPane.add("About IcedTea-Web and NetX", aboutPanel); > - tabbedPane.add("Applications", appsPanel); > - tabbedPane.add("Notes", notesPanel); > - > - tabbedPane.setPreferredSize(new Dimension(550,410)); > - add(tabbedPane, BorderLayout.CENTER); > - } > + URL res_notes = getClass().getResource(notes_url); > + URL res_about = getClass().getResource(about_url); > + URL res_apps = getClass().getResource(apps_url); > + URL res_authors = getClass().getResource(authors_url); > + URL res_changelog = getClass().getResource(changelog_url); > + URL res_copying = getClass().getResource(copying_url); > + URL res_news = getClass().getResource(news_url); > > - private static void createAndShowGUI() { > - > - try { > - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); > - } catch (Exception e) { > - } > - > - JFrame frame = new JFrame("About IcedTea-Web and NetX"); > - frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); > - Main demo = null; > - try { > - demo = new Main(); > - } catch (Exception e) { > - e.printStackTrace(); > - System.exit(1); > - } > - demo.setOpaque(true); > - frame.setContentPane(demo); > - frame.pack(); > - centerDialog(frame); > - frame.setVisible(true); > - } > - > - private static void centerDialog(JFrame frame) { > - Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); > - Dimension dialogSize = frame.getSize(); > + HTMLPanel notesPanel = new HTMLPanel(res_notes); > + HTMLPanel aboutPanel = new HTMLPanel(res_about); > + HTMLPanel appsPanel = new HTMLPanel(res_apps); > + HTMLPanel authorsPanel = new HTMLPanel(res_authors); > + HTMLPanel changelogPanel = new HTMLPanel(res_changelog); > + HTMLPanel newsPanel = new HTMLPanel(res_news); > + HTMLPanel copyPanel = new HTMLPanel(res_copying); > > - frame.setLocation((screen.width - dialogSize.width)/2, > - (screen.height - dialogSize.height)/2); > + tabbedPane = new JTabbedPane(); > + > + tabbedPane.add("About", aboutPanel); > + tabbedPane.add("Notes", notesPanel); > + tabbedPane.add("Applications", appsPanel); > + tabbedPane.add("Authors", authorsPanel); > + tabbedPane.add("Changelog", changelogPanel); > + tabbedPane.add("News", newsPanel); > + tabbedPane.add("Copying", copyPanel); Here comes the localisation of all tabs > + > + tabbedPane.setPreferredSize(new Dimension(640, 480)); > + add(tabbedPane, BorderLayout.CENTER); > } > > - public static void main(String[] args) { > - javax.swing.SwingUtilities.invokeLater(new Runnable() { > - public void run() { > - createAndShowGUI(); > - } > - }); > - } > - > + public static void display() throws IOException { around here will go the centring of dialogue > + JFrame frame = new JFrame(); > + frame.add(new AboutDialog()); > + frame.setSize(640, 480); > + frame.setVisible(true); > + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); > + } > > } > diff --git a/extra/net/sourceforge/javaws/about/HTMLPanel.java b/netx/net/sourceforge/jnlp/about/HTMLPanel.java > copy from extra/net/sourceforge/javaws/about/HTMLPanel.java > copy to netx/net/sourceforge/jnlp/about/HTMLPanel.java > --- a/extra/net/sourceforge/javaws/about/HTMLPanel.java > +++ b/netx/net/sourceforge/jnlp/about/HTMLPanel.java > @@ -35,15 +35,15 @@ obligated to do so. If you do not wish > exception statement from your version. > */ > > -package net.sourceforge.javaws.about; > +package net.sourceforge.jnlp.about; > > import java.awt.BorderLayout; > import java.io.IOException; > import java.net.URL; > > +import javax.swing.JEditorPane; > import javax.swing.JPanel; > import javax.swing.JScrollPane; > -import javax.swing.JEditorPane; > > public class HTMLPanel extends JPanel { > > diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java > --- a/netx/net/sourceforge/jnlp/runtime/Boot.java > +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java > @@ -19,6 +19,7 @@ package net.sourceforge.jnlp.runtime; > import static net.sourceforge.jnlp.runtime.Translator.R; > > import java.io.File; > +import java.io.IOException; > import java.net.URL; > import java.security.AccessController; > import java.security.PrivilegedAction; > @@ -28,9 +29,12 @@ import java.util.HashMap; > import java.util.List; > import java.util.Map; > > +import javax.swing.JFrame; > + > import net.sourceforge.jnlp.LaunchException; > import net.sourceforge.jnlp.Launcher; > import net.sourceforge.jnlp.ParserSettings; > +import net.sourceforge.jnlp.about.AboutDialog; > import net.sourceforge.jnlp.cache.CacheUtil; > import net.sourceforge.jnlp.cache.UpdatePolicy; > import net.sourceforge.jnlp.security.viewer.CertificateViewer; > @@ -62,6 +66,17 @@ public final class Boot implements Privi > + "\n" > + R("BLaunchAbout"); > > + private static final String itwInfoMessage = "" > + + name + " " + version > + + "\n" > + + R("BAboutITW") > + + "\n" > + + R("BFileInfoAuthors") > + + "\n" > + + R("BFileInfoNews") > + + "\n" > + + R("BFileInfoCopying"); here will come the indentation eg icedtea-web 1.5pre+r87c9fc859a21+ === icedtea-web wiki page: http://icedtea.classpath.org/wiki/IcedTea-Web === IcedTea web is free implementation of jnlp client and java plugin * Names and email addresses of contributors to this project can be found in the file AUTHORS. * News about this project can be found in the file NEWS. * The license of this project can be found in the file COPYING. maybe more full path to this files can be mentioned. Also the man page and -help swithc can be mentioned just nits moreower. nice as it is! > + > private static final String miniLicense = "\n" > + " netx - an open-source JNLP client.\n" > + " Copyright (C) 2001-2003 Jon A. Maxwell (JAM)\n" > @@ -137,8 +152,21 @@ public final class Boot implements Privi > System.exit(0); > } > > - if (null != getOption("-about")) > - System.out.println(aboutMessage); > + if (null != getOption("-about")) { > + if (null != getOption("-headless")) { > + System.out.println(itwInfoMessage); > + System.exit(0); > + } else { > + System.out.println(aboutMessage); > + try { > + AboutDialog.display(); > + return; > + } catch (IOException e) { > + System.out.println(R("BLaunchAboutFailure")); > + e.printStackTrace(); > + } > + } > + } I would probably go by more sure way: if (null != getOption("-about")) { System.out.println(itwInfoMessage); if (null != getOption("-headless")) { System.exit(0); } else { // System.out.println(aboutMessage); - this should now not be necessary when itwInfoMessage is showed for both? try { AboutDialog.display(); return; } catch (Exception e) { System.out.println(R("BLaunchAboutFailure")); throw new RuntimeException(e); //let it die quicly } } } > > if (null != getOption("-verbose")) > JNLPRuntime.setDebug(true); > @@ -222,33 +250,6 @@ public final class Boot implements Privi > } > ypiiyahee! > /** > - * Returns the location of the about.jnlp file or null if this file > - * does not exist. > - */ > - private static String getAboutFile() { > - ClassLoader cl = Boot.class.getClassLoader(); > - if (cl == null) { > - cl = ClassLoader.getSystemClassLoader(); > - } > - try { > - //extracts full path to about.jnlp > - String s = cl.getResource("net/sourceforge/jnlp/runtime/Boot.class").toString(); > - s=s.substring(0,s.indexOf("!")); > - s=s.substring(s.indexOf(":")+1); > - s=s.substring(s.indexOf(":")+1); > - s="file://"+s.replace("netx.jar","about.jnlp"); > - if (JNLPRuntime.isDebug()){ > - System.out.println("Using " + s + " as about.jnlp URL"); > - } > - > - return s; > - } catch (Exception e) { > - e.printStackTrace(); > - return null; > - } > - } > - > - /** > * Returns the url of file to open; does not return if no file was > * specified, or if the file location was invalid. > */ > @@ -256,15 +257,6 @@ public final class Boot implements Privi > > String location = getJNLPFile(); > > - // override -jnlp with aboutFile > - if (getOption("-about") != null) { > - location = getAboutFile(); > - if (location == null) > - fatalError(R("RNoAboutJnlp")); > - } else { > - location = getJNLPFile(); > - } > - > if (location == null) { > System.out.println(helpMessage); > System.exit(1); > > > Makefile.am.patch > > > diff --git a/Makefile.am b/Makefile.am > --- a/Makefile.am > +++ b/Makefile.am > @@ -5,9 +5,6 @@ export TOP_BUILD_DIR = $(abs_top_builddi > export NETX_DIR = $(abs_top_builddir)/netx.build > export NETX_SRCDIR = $(abs_top_srcdir)/netx > export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources > -export NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources > -export NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources > - Why this empty lien removal? > export REPORT_STYLES_DIRNAME=report-styles > > export TESTS_SRCDIR=$(abs_top_srcdir)/tests > @@ -132,6 +129,7 @@ export JDK_UPDATE_VERSION=50 > export PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java > > export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \ > + net.sourceforge.jnlp.about \ > net.sourceforge.jnlp.cache net.sourceforge.jnlp.config \ > net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \ > net.sourceforge.jnlp.runtime net.sourceforge.jnlp.security \ > @@ -184,9 +182,6 @@ endif > > export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION) > > -export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \ > - itweb-settings.desktop.in $(top_srcdir)/tests > - > # reproducers `D`shortcuts > export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) > export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws) > @@ -216,12 +211,12 @@ edit_launcher_script = sed \ > # Top-Level Targets > # ================= > > -all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \ > +all-local: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \ > javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop > > check-local: $(RHINO_TESTS) $(JUNIT_TESTS) > > -clean-local: clean-netx clean-plugin clean-liveconnect clean-extra \ > +clean-local: clean-netx clean-plugin clean-liveconnect \ > clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests clean-bootstrap-directory > if [ -e stamps ] ; then \ > rmdir stamps ; \ > @@ -241,13 +236,11 @@ endif > ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar > ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png > ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) > - ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar > ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) > > install-data-local: > - ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 > + ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 There slipped empty chars to the end of the line. This is not allowed. > ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1 > - ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) > if ENABLE_DOCS > ${mkinstalldirs} $(DESTDIR)$(htmldir) > (cd ${abs_top_builddir}/docs/netx; \ > @@ -269,7 +262,6 @@ uninstall-local: > rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar > rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar > rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp > - rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar > rm -f $(DESTDIR)$(mandir)/man1/javaws.1 > rm -f $(DESTDIR)$(bindir)/$(javaws) > rm -f $(DESTDIR)$(bindir)/$(itweb_settings) > @@ -453,7 +445,53 @@ if !HAVE_JAVA7 > sed -i '/VariableX509TrustManagerJDK7/ d' $@ > endif > > -stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp > +stamps/netx-html-gen.stamp: > + (cd $$NETX_SRCDIR/..; \ > + mkdir -p html-gen; \ > + cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ > + cd html-gen/; \ > + for FILE in NEWS AUTHORS COPYING ChangeLog; \ > + do \ > + sed -e "s/\t//g" -e "s/\&/\&/g" -e "s/ /\ \ /g" -e "s//\>/g" -e "s/$$/
/g" "./$$FILE"> "./$$FILE.html"; \ > + done; \ > + sed -i '4i
' AUTHORS.html; \ > + echo "
">> AUTHORS.html; \ > + for FILE in NEWS.html ChangeLog.html; \ > + do \ > + mv $$FILE "$$FILE.old"; \ > + COUNTER=0; \ > + while read LINE; \ > + do \ > + if [[ $$FILE == "NEWS.html" ]]; \ > + then \ > + if [[ $$LINE =~ New\ in\ release* ]]; \ > + then \ > + COUNTER=$$(( $$COUNTER + 1 )); \ > + fi; \ > + if [[ $$COUNTER -gt 2 ]]; \ > + then \ > + break; \ > + fi; \ > + else \ > + if [[ $$LINE =~ [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}* ]]; \ > + then \ > + COUNTER=$$(( $$COUNTER + 1 )); \ > + fi; \ > + if [[ $$COUNTER -gt 10 ]]; \ > + then \ > + break; \ > + fi; \ > + fi; \ > + echo "$$LINE">> $$FILE; \ > + done< "$$FILE.old"; \ > + rm $$FILE.old; \ > + done) > + ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR) > + rm -r $(NETX_SRCDIR)/../html-gen/ > + mkdir -p stamps > + touch $@ > + well well well.. this is THE CODE :) My deepes credits that this works :) If you will smuggle some markup into this, then it would be nice, and it will be alowed to go in. There is strong disadvantage that you can not use internalisation. Also the miantainability of this code is quite pure. Anyway this cango in with markup, assuming it works. The idea how it can be done by different way - just note - fdifferent - not better. You can have soem small class in net.sourceforge.jnlp.about, which will have main class. This method will be already compiled with rest of netx in time of generation, so you will be able to run this class. This class can serve as small program - transformer from txt fiels into html file. You will have much more fredom in generation, and it will be much more readable, and localisation would be possible to be used (maybe [me do not insists]). But will be maybe rocket luncher instead of cross bow... Also I'm not sure how it willbe transparrent for others... Actually jsut crossed across my mind that all this "localisation" leads back to you "runtime" generation which I really do not wont to allow. So please do not follow blindly mi nits in this review. > +stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp > mkdir -p $(NETX_DIR) > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > -d $(NETX_DIR) \ > @@ -489,37 +527,13 @@ clean-netx: > rm -f stamps/netx-dist.stamp > rm -f netx-source-files.txt > rm -f stamps/netx.stamp > + rm -f stamps/netx-html-gen.stamp > + rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html > > clean-desktop-files: > rm -f javaws.desktop > rm -f itweb-settings.desktop > > -# extras -- used to create about.jar for javaws. > -extra-source-files.txt: > - find $(abs_top_srcdir)/extra -name '*.java' | sort> $@ > - > -stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp > - mkdir -p extra-lib > - $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \ > - -sourcepath $(abs_top_srcdir)/extra -cp netx.build \ > - -bootclasspath $(RUNTIME) @extra-source-files.txt > - (cd $(NETX_EXTRA_DIR); \ > - for files in $$(find . -type f); \ > - do \ > - ${INSTALL_DATA} -D $${files} \ > - $(NETX_EXTRA_DIST_DIR)/$${files}; \ > - done) > - mkdir -p stamps > - touch $@ > - > -clean-extra: > - rm -rf extra-lib > - rm -f stamps/extra-class-files.stamp > - rm -f extra-source-files.txt > - > -extra-lib/about.jar: stamps/extra-class-files.stamp > - $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; > - > launcher.build/$(javaws): launcher/launchers.in > mkdir -p launcher.build > MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\ > @@ -851,7 +865,7 @@ stamps/copy-reproducers-resources.stamp: > $(MAKE) ; \ > mv $(SOFTKILLER) $(TESTS_DIR)/ > > -stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \ > +stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \ > javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \ > stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public $(TESTS_DIR)/softkiller \ > stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\ > @@ -896,7 +910,7 @@ clean-custom-reproducers: junit-jnlp-dis > #although this targets will indeed create symbolic links to enable > #icedtea-web plugin inside browser it is intended for testing purposes > if ENABLE_PLUGIN > -stamps/user-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp \ > +stamps/user-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp \ > launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) > if [ $(MOZILLA_FAMILY_TEST) ] ; then \ > if [ -e $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ] ; then \ > @@ -926,7 +940,7 @@ restore-user-links: > rm -f stamps/user-links.stamp ; \ > fi > > -stamps/global-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \ > +stamps/global-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \ > stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) > if [ $(MOZILLA_FAMILY_TEST) ] ; then \ > dir="$(MOZILLA_GLOBAL32_PLUGINDIR)" ; \ > > > resources.patch > > > diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties > @@ -138,6 +138,7 @@ PBadHeapSize=Invalid value for heap size > > # Runtime > BLaunchAbout=Launching about window... > +BLaunchAboutFailure=Was not able to launch About window > BNeedsFile=Must specify a .jnlp file > RNoAboutJnlp=Unable to find about.jnlp > BFileLoc=JNLP file location > @@ -172,6 +173,10 @@ RProxyFirefoxOptionNotImplemented=Browse > RBrowserLocationPromptTitle=Browser Location > RBrowserLocationPromptMessage=Specify Browser Location > RBrowserLocationPromptMessageWithReason=Specify Browser Location (the browser command "{0}" is invalid). > +BAboutITW=icedtea-web wiki page:http://icedtea.classpath.org/wiki/IcedTea-Web > +BFileInfoAuthors=Names and email addresses of contributors to this project can be found in the file AUTHORS. > +BFileInfoCopying=The license of this project can be found in the file COPYING. > +BFileInfoNews=News about this project can be found in the file NEWS. > > # Boot options, message should be shorter than this ----------------> > BOUsage=javaws [-run-options] Just remebering: > diff --git a/extra/net/sourceforge/javaws/about/resources/about.html b/netx/net/sourceforge/jnlp/resources/about.html > copy from extra/net/sourceforge/javaws/about/resources/about.html will be reworked > copy to netx/net/sourceforge/jnlp/resources/about.html > diff --git a/extra/net/sourceforge/javaws/about/resources/applications.html b/netx/net/sourceforge/jnlp/resources/applications.html > copy from extra/net/sourceforge/javaws/about/resources/applications.html will be dropped > copy to netx/net/sourceforge/jnlp/resources/applications.html > diff --git a/extra/net/sourceforge/javaws/about/resources/jamIcon.jpg b/netx/net/sourceforge/jnlp/resources/jamIcon.jpg will be usded in different tab > copy from extra/net/sourceforge/javaws/about/resources/jamIcon.jpg > copy to netx/net/sourceforge/jnlp/resources/jamIcon.jpg > diff --git a/netx/net/sourceforge/jnlp/resources/notes.html b/netx/net/sourceforge/jnlp/resources/notes.html will be dropped, and some lines from it reused in main about. > new file mode 100644 > --- /dev/null > +++ b/netx/net/sourceforge/jnlp/resources/notes.html dev/null?? I thought this is also copied. Anyway worthy of being dropepd (authors are now on two palces!) and some lines, (nearly whole bottom but NOT ALL) reused.... > @@ -0,0 +1,99 @@ > + > + > + > + Release Notes > + > + > +
> + > + > + > + > + > + > + > +
> + > + > + > + > + > + > + > + > + > +
> + Jam Icon > +
> +
> +
> + Lillian Angel
> + Deepak Bhole
> + Danesh Dadachanji
> + Adam Domurad
> + Thomas Fitzsimmons
> + Andrew John Hughes
> + Matthias Klose
> + Francis Kung
> + Omair Majid
> + Jon A. Maxwell
> + Thomas Meyer
> + Saad Mohammad
> + Andrew Su
> + Joshua Sumali
> + Jiri Vanek
> + Mark Wielaard
> + Man Lung Wong
> +
> +
> +
> +
> +Release Notes > +
> + > + > + > + > + > + > + > + > + > + > + > + > + > +

> + NetX on IcedTea: Security Support > +
    > +
  • Full signed application support
  • > +
  • User trusted certificates support
  • > +
  • Some JNLP API Services implemented
  • > +
  • Improved unsigned application sandboxing with JNLP API
  • > +
> +

> + Version 0.5: Refines multi-app capabilities + native code support > +
    > +
  • Released under LGPL.
  • > +
  • Separate event queue, look and feel, etc for each application.
  • > +
  • Native code support.
  • > +
  • Supports headless mode.
  • > +
  • Internationalized messages.
  • > +
  • Uses NanoXML parser.
  • > +
  • Minor changes listed on project web site...
  • > +
> + > +
> + Home page of IcedTea-Web: > + > + http://icedtea.classpath.org/wiki/IcedTea-Web > +
> + Please visit also the SourceForge site > + > + http://jnlp.sourceforge.net/netx/index.html > + > + and the IcedTea site > + http://iced-tea.org > + for more information.

> + > + Really nice wok! I'm galad to see it grow! J. From bugzilla-daemon at icedtea.classpath.org Tue Jul 2 13:14:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 02 Jul 2013 20:14:25 +0000 Subject: [Bug 1491] New: java3d fails - firefox - (also jmol stops at first picture, if any) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1491 Bug ID: 1491 Summary: java3d fails - firefox - (also jmol stops at first picture, if any) Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: univ at lavabit.com CC: unassigned at icedtea.classpath.org Created attachment 900 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=900&action=edit java3d error - on top in firefox OS: Arch x86_64 firefox: 22.0-1 jre7-openjdk: 7.u40_2.4.0-1 icedtea-web-java7: 1.4-1 I'm using sage notebook (sagemath.org) to plot in 3d: point3d((1,1,1),viewer='java3d') I's not working. It shows an error line on top in firefox with the error i attached I'll also upload "ICEDTEAPLUGIN_DEBUG=true firefox 2>&1 | tee plugin.log" -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130702/b353ad30/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jul 2 13:17:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 02 Jul 2013 20:17:27 +0000 Subject: [Bug 1491] java3d fails - firefox - (also jmol stops at first picture, if any) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1491 --- Comment #1 from univ at lavabit.com --- Created attachment 901 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=901&action=edit ICEDTEAPLUGIN_DEBUG=true firefox 2>&1 | tee plugin.log -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130702/f54d0bb1/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jul 2 13:33:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 02 Jul 2013 20:33:21 +0000 Subject: [Bug 1491] java3d fails - firefox - (also jmol stops at first picture, if any) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1491 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole at redhat.com |jvanek at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130702/930a8644/attachment.html From adomurad at redhat.com Tue Jul 2 14:16:23 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 02 Jul 2013 17:16:23 -0400 Subject: Status 2013-07-02 Message-ID: <51D34327.2030607@redhat.com> Last week: - Working on more advanced unit test setup for icedtea-web C++ side. This enables unit testing things that require the collaboration of Java and C++ side. Working quite well :-) - Worked on https://bugzilla.redhat.com/show_bug.cgi?id=976897, investigated and found a fix. Unfortunately have to pass the buck since I will be on vacation. - Posted & pushed 'Fix potential NPE on GetValue message' - Unit tests for this and other messages in progress -- On PTO for 3 weeks, next working day will be the 25th. From ptisnovs at icedtea.classpath.org Wed Jul 3 01:35:42 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 03 Jul 2013 08:35:42 +0000 Subject: /hg/gfx-test: Another ten new tests added into BitBltUsingBgColo... Message-ID: changeset cdc1cbe75b64 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=cdc1cbe75b64 author: Pavel Tisnovsky date: Wed Jul 03 10:39:16 2013 +0200 Another ten new tests added into BitBltUsingBgColor test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 150 +++++++++++++++++++++ 2 files changed, 155 insertions(+), 0 deletions(-) diffs (172 lines): diff -r bb5ab798f6a9 -r cdc1cbe75b64 ChangeLog --- a/ChangeLog Fri Jun 28 10:56:15 2013 +0200 +++ b/ChangeLog Wed Jul 03 10:39:16 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-03 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Another ten new tests added into BitBltUsingBgColor test suite. + 2013-06-28 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltCropImage.java: diff -r bb5ab798f6a9 -r cdc1cbe75b64 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jun 28 10:56:15 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jul 03 10:39:16 2013 +0200 @@ -2410,6 +2410,156 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.white. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.black. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.blue. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.green. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.cyan. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.magenta. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.yellow. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.white. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.black. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.black); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Wed Jul 3 01:40:27 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 03 Jul 2013 08:40:27 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset 758296dad6ac in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=758296dad6ac author: Pavel Tisnovsky date: Wed Jul 03 10:44:03 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into SimpleBindingsClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/SimpleBindingsClassTest.java | 62 +++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diffs (119 lines): diff -r 0ab476c8dfd1 -r 758296dad6ac ChangeLog --- a/ChangeLog Fri Jun 28 10:53:30 2013 +0200 +++ b/ChangeLog Wed Jul 03 10:44:03 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-03 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into SimpleBindingsClassTest. + 2013-06-28 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r 0ab476c8dfd1 -r 758296dad6ac src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Fri Jun 28 10:53:30 2013 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Wed Jul 03 10:44:03 2013 +0200 @@ -52,6 +52,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.SimpleBindings; import javax.script.Bindings; @@ -285,6 +287,7 @@ */ protected void testGetConstructors() { // map of constructors which should exists + @SuppressWarnings("unused") Map testedConstructors = null; Map testedConstructors_jdk6 = new HashMap(); Map testedConstructors_jdk7 = new HashMap(); @@ -332,6 +335,7 @@ */ protected void testGetDeclaredConstructors() { // map of constructors which should exists + @SuppressWarnings("unused") Map testedConstructors = null; Map testedConstructors_jdk6 = new HashMap(); Map testedConstructors_jdk7 = new HashMap(); @@ -1033,12 +1037,15 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -1193,6 +1200,61 @@ } /** + * Test for method javax.script.SimpleBindings.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.simpleBindingsClass.getGenericSuperclass(); + assertNotNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.SimpleBindings.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + "interface javax.script.Bindings", + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // get the right array of field signatures + String[] genericInterfaceNames = null; + switch (getJavaVersion()) { + case 6: + genericInterfaceNames = genericInterfaceNames_jdk6; + break; + case 7: + genericInterfaceNames = genericInterfaceNames_jdk7; + break; + case 8: + genericInterfaceNames = genericInterfaceNames_jdk8; + break; + } + + // get all generic interfaces + Type[] genericInterfaces = this.simpleBindingsClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(1, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length); + + // and transform the array into a list of field names + List interfacesAsString = new ArrayList(); + for (Type genericInterface : genericInterfaces) { + interfacesAsString.add(genericInterface.toString()); + } + + // check if all required interfaces really exists + for (String interfaceThatShouldExists : genericInterfaceNames) { + assertTrue(interfacesAsString.contains(interfaceThatShouldExists), + "interface " + interfaceThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.SimpleBindings */ @SuppressWarnings("cast") From omajid at icedtea.classpath.org Wed Jul 3 20:41:17 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 04 Jul 2013 03:41:17 +0000 Subject: /hg/release/icedtea6-1.11: 2 new changesets Message-ID: changeset d59bbf7333e0 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d59bbf7333e0 author: Omair Majid date: Mon Jul 01 21:05:04 2013 -0400 Backport additional fixes. Additional fixes were applied to jdk7u as part of the security release. This patch includes a subset of them. 2013-07-01 Omair Majid * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, * patches/openjdk/8009217-fix_test_compile.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8009610-blacklist_malware_certificate.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011992-MlibOpsTest_failed.patch, * patches/openjdk/8012112-MlibOpsTest_fails.patch, * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, * patches/openjdk/8012933-appcontext_disposed_too_early.patch, * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014427-raster_regresssion.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * patches/ecj/override.patch: Add new hunk for BufferedImage. * NEWS: Update with backports. changeset d146c22f9e46 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d146c22f9e46 author: Omair Majid date: Wed Jul 03 23:28:46 2013 -0400 Additional fixes that go along with the security update Backport additional fixes from 7 that went along with the security update. 2013-07-03 Omair Majid * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8009996-emitter_bean.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010727-empty_logger_name.patch, * patches/openjdk/8010939-logmanager_deadlock.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014718-remove_logging_suntoolkit.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * NEWS: Update with fixes. diffstat: ChangeLog | 64 + Makefile.am | 54 +- NEWS | 54 +- patches/ecj/override.patch | 11 + patches/openjdk/6541350-tz_display_names_l10n.patch | 300 + patches/openjdk/6821191-tz_display_names_l10n.patch | 125 + patches/openjdk/6977550-tzdata2010l.patch | 1208 ++++ patches/openjdk/6996686-tzdata2010o.patch | 93 + patches/openjdk/7017800-tzdata2011b.patch | 254 + patches/openjdk/7027387-tzdata2011d.patch | 502 + patches/openjdk/7033174-tzdata2011e.patch | 117 + patches/openjdk/7039469-tzdata2011g.patch | 116 + patches/openjdk/7090843-tzdata2011j.patch | 1228 ++++ patches/openjdk/7103108-tzdata2011l.patch | 1593 +++++ patches/openjdk/7103405-correct_display_names.patch | 118 + patches/openjdk/7104126-headers_tzdata.patch | 530 + patches/openjdk/7158483-tzdata2012c.patch | 1436 ++++ patches/openjdk/7188114-alternate_command_line_parser.patch | 611 ++ patches/openjdk/7198570-tzdata2012f.patch | 841 ++ patches/openjdk/7199143-OCSP_timeout.patch | 53 + patches/openjdk/8002070-remove_logger_stack_search.patch | 152 + patches/openjdk/8002070-remove_logger_stack_search_2.patch | 546 + patches/openjdk/8002225-tzdata2012i.patch | 261 + patches/openjdk/8006120-server_jre.patch | 60 + patches/openjdk/8006536-remove_trailing_slashes.patch | 43 + patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch | 68 + patches/openjdk/8009217-fix_test_compile.patch | 91 + patches/openjdk/8009463-space_and_final_backslash.patch | 33 + patches/openjdk/8009610-blacklist_malware_certificate.patch | 64 + patches/openjdk/8009987-tzdata2013b.patch | 2165 +++++++ patches/openjdk/8009996-emitter_bean.patch | 27 + patches/openjdk/8010118-caller_sensitive.patch | 2950 ++++++++++ patches/openjdk/8010213-set_socketoptions_windows.patch | 29 + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch | 345 + patches/openjdk/8010727-empty_logger_name.patch | 99 + patches/openjdk/8010939-logmanager_deadlock.patch | 264 + patches/openjdk/8011139-revise_checking_getenclosingclass.patch | 58 + patches/openjdk/8011154-awt_regresssion.patch | 20 + patches/openjdk/8011313-OCSP_timeout_wrong_value.patch | 31 + patches/openjdk/8011990-logger_test_urls.patch | 55 + patches/openjdk/8011992-MlibOpsTest_failed.patch | 89 + patches/openjdk/8012112-MlibOpsTest_fails.patch | 51 + patches/openjdk/8012243-serial_regression.patch | 42 + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch | 480 + patches/openjdk/8012933-appcontext_disposed_too_early.patch | 153 + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 + patches/openjdk/8013380-handle_renames.patch | 107 + patches/openjdk/8013380-logger_stack_walk_glassfish.patch | 936 +++ patches/openjdk/8014205-blank_swing_dialogs_windows.patch | 146 + patches/openjdk/8014427-raster_regresssion.patch | 20 + patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch | 149 + patches/openjdk/8014676-javadebugger_space_in_paths.patch | 32 + patches/openjdk/8014718-remove_logging_suntoolkit.patch | 112 + patches/openjdk/8014745-logger_stack_walk_switch.patch | 199 + patches/openjdk/8014968-OCSP_timeout_default.patch | 19 + 55 files changed, 19260 insertions(+), 2 deletions(-) diffs (truncated from 19500 to 500 lines): diff -r ea7bce0f610a -r d146c22f9e46 ChangeLog --- a/ChangeLog Wed Jun 26 15:10:59 2013 -0400 +++ b/ChangeLog Wed Jul 03 23:28:46 2013 -0400 @@ -1,3 +1,67 @@ +2013-07-03 Omair Majid + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8009996-emitter_bean.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010727-empty_logger_name.patch, + * patches/openjdk/8010939-logmanager_deadlock.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014718-remove_logging_suntoolkit.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch: + New file. Backport from icedtea/openjdk 7. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * NEWS: Update with fixes. + +2013-07-01 Omair Majid + + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, + * patches/openjdk/8009217-fix_test_compile.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8009610-blacklist_malware_certificate.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, + * patches/openjdk/8011154-awt_regresssion.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011992-MlibOpsTest_failed.patch, + * patches/openjdk/8012112-MlibOpsTest_fails.patch, + * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, + * patches/openjdk/8012933-appcontext_disposed_too_early.patch, + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014427-raster_regresssion.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. + Backport from icedtea/openjdk 7. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/override.patch: Add new hunk for BufferedImage. + * NEWS: Update with backports. + 2013-06-26 Chris Phillips * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/7158805-nested_subroutine_rewriting.patch diff -r ea7bce0f610a -r d146c22f9e46 Makefile.am --- a/Makefile.am Wed Jun 26 15:10:59 2013 -0400 +++ b/Makefile.am Wed Jul 03 23:28:46 2013 -0400 @@ -619,7 +619,59 @@ patches/jaxws-tempfiles-ioutils-6.patch \ patches/object-factory-cl-internal.patch \ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ - patches/openjdk/7171223-strict_aliasing.patch + patches/openjdk/7171223-strict_aliasing.patch \ + patches/openjdk/7188114-alternate_command_line_parser.patch \ + patches/openjdk/7199143-OCSP_timeout.patch \ + patches/openjdk/8006120-server_jre.patch \ + patches/openjdk/8006536-remove_trailing_slashes.patch \ + patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \ + patches/openjdk/8009217-fix_test_compile.patch \ + patches/openjdk/8009463-space_and_final_backslash.patch \ + patches/openjdk/8009610-blacklist_malware_certificate.patch \ + patches/openjdk/8010213-set_socketoptions_windows.patch \ + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \ + patches/openjdk/8011154-awt_regresssion.patch \ + patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \ + patches/openjdk/8011992-MlibOpsTest_failed.patch \ + patches/openjdk/8012112-MlibOpsTest_fails.patch \ + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ + patches/openjdk/8012933-appcontext_disposed_too_early.patch \ + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8014205-blank_swing_dialogs_windows.patch \ + patches/openjdk/8014427-raster_regresssion.patch \ + patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch \ + patches/openjdk/8014676-javadebugger_space_in_paths.patch \ + patches/openjdk/8014968-OCSP_timeout_default.patch \ + patches/openjdk/8002070-remove_logger_stack_search.patch \ + patches/openjdk/8002070-remove_logger_stack_search_2.patch \ + patches/openjdk/8010118-caller_sensitive.patch \ + patches/openjdk/8010727-empty_logger_name.patch \ + patches/openjdk/8010939-logmanager_deadlock.patch \ + patches/openjdk/8011990-logger_test_urls.patch \ + patches/openjdk/8013380-logger_stack_walk_glassfish.patch \ + patches/openjdk/8013380-handle_renames.patch \ + patches/openjdk/8014745-logger_stack_walk_switch.patch \ + patches/openjdk/8012243-serial_regression.patch \ + patches/openjdk/8014718-remove_logging_suntoolkit.patch \ + patches/openjdk/8011139-revise_checking_getenclosingclass.patch \ + patches/openjdk/8009996-emitter_bean.patch \ + patches/openjdk/6541350-tz_display_names_l10n.patch \ + patches/openjdk/6821191-tz_display_names_l10n.patch \ + patches/openjdk/6977550-tzdata2010l.patch \ + patches/openjdk/6996686-tzdata2010o.patch \ + patches/openjdk/7017800-tzdata2011b.patch \ + patches/openjdk/7027387-tzdata2011d.patch \ + patches/openjdk/7033174-tzdata2011e.patch \ + patches/openjdk/7039469-tzdata2011g.patch \ + patches/openjdk/7090843-tzdata2011j.patch \ + patches/openjdk/7103108-tzdata2011l.patch \ + patches/openjdk/7104126-headers_tzdata.patch \ + patches/openjdk/7103405-correct_display_names.patch \ + patches/openjdk/7158483-tzdata2012c.patch \ + patches/openjdk/7198570-tzdata2012f.patch \ + patches/openjdk/8002225-tzdata2012i.patch \ + patches/openjdk/8009987-tzdata2013b.patch + if WITH_RHINO ICEDTEA_PATCHES += \ diff -r ea7bce0f610a -r d146c22f9e46 NEWS --- a/NEWS Wed Jun 26 15:10:59 2013 -0400 +++ b/NEWS Wed Jul 03 23:28:46 2013 -0400 @@ -11,7 +11,59 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.11.12 (2013-06-XX): +New in release 1.11.12 (2013-07-XX): +* Security fixes +* Backports + - S6541350: TimeZone display names localization + - S6821191: Timezone display name localization + - S6977550: (tz) Support tzdata2010l + - S6996686: (tz) Support tzdata2010o + - S7017800: (tz) Support tzdata2011b + - S7027387: (tz) Support tzdata2011d + - S7033174: (tz) Support tzdata2011e + - S7039469: (tz) Support tzdata2011g + - S7090843: (tz) Support tzdata2011j + - S7103108: (tz) Support tzdata2011l + - S7103405: Correct display names for Pacific/Apia timezone + - S7104126: Insert openjdk copyright header back into TZdata files + - S7158483: (tz) Support tzdata2012c + - S7198570: (tz) Support tzdata2012f + - S7188114: (launcher) need an alternate command line parser for Windows + - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node + - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout + - S8002070: Remove the stack search for a resource bundle for Logger to use + - S8002225: (tz) Support tzdata2012i + - S8006120: Provide "Server JRE" for 7u train + - S8006536: [launcher] removes trailing slashes on arguments + - S8009165: Fix for 8006435 needs revision + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. + - S8009610: Blacklist certificate used with malware. + - S8009987: (tz) Support tzdata2013b + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive + - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010939: Deadlock in LogManager + - S8011139: (reflect) Revise checking in getEnclosingClass + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined + - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup + - S8014205: Most of the Swing dialogs are blank on one win7 MUI + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement + - S8014676: Java debugger may fail to run + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + - S8014745: Provide a switch to allow stack walk search of resource bundle + - S8014968: OCSP and CRL connection timeout is set to four hours by default New in release 1.11.11 (2013-04-24): diff -r ea7bce0f610a -r d146c22f9e46 patches/ecj/override.patch --- a/patches/ecj/override.patch Wed Jun 26 15:10:59 2013 -0400 +++ b/patches/ecj/override.patch Wed Jul 03 23:28:46 2013 -0400 @@ -310,3 +310,14 @@ public final void close() { open = false; synchronized (AbstractMidiDevice.this.traRecLock) { +diff -ruN openjdk-ecj.orig/jdk/src/share/classes/java/awt/image/BufferedImage.java openjdk-ecj/jdk/src/share/classes/java/awt/image/BufferedImage.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/awt/image/BufferedImage.java 2013-07-01 13:03:32.946070591 -0400 ++++ openjdk-ecj/jdk/src/share/classes/java/awt/image/BufferedImage.java 2013-07-01 13:33:55.905426035 -0400 +@@ -810,7 +810,6 @@ + new PrivilegedAction() + { + +- @Override + public Boolean run() { + final ClassLoader std = System.class.getClassLoader(); + diff -r ea7bce0f610a -r d146c22f9e46 patches/openjdk/6541350-tz_display_names_l10n.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6541350-tz_display_names_l10n.patch Wed Jul 03 23:28:46 2013 -0400 @@ -0,0 +1,300 @@ +# HG changeset patch +# User yhuang +# Date 1261700777 28800 +# Node ID 1397ae8dc558c9128d84818afc9ec55d23714c35 +# Parent 7bf839e2e9ce58d5f205280bf5a06f00227f2240 +6541350: TimeZone display names localization +Reviewed-by: yhuang, peytoia + +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java +@@ -83,8 +83,8 @@ + "Zentrale Sommerzeit", "CDT"}; + String CTT[] = new String[] {"Chinesische Normalzeit", "CST", + "Chinesische Sommerzeit", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", ++ "Kubanische Sommerzeit", "CDT"}; + String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST", + "Zentrale Sommerzeit (Northern Territory)", "CST"}; + String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST", ++ "Zentral-Westliche Sommerzeit (Australien)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java +@@ -83,8 +83,8 @@ + "Hora de verano Central", "CDT"}; + String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST", + "Hora de verano de China", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST", ++ "Hora de verano de Cuba", "CDT"}; + String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST", + "Hora de verano Central (territorio del Norte)", "CST"}; + String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT", +@@ -595,8 +595,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST", ++ "Hora de verano de Australia Central y Occidental", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java +@@ -83,8 +83,8 @@ + "Heure avanc\u00e9e du Centre", "CDT"} ; + String CTT[] = new String[] {"Heure normale de Chine", "CST", + "Heure avanc\u00e9e de Chine", "CDT"} ; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"Heure standard de Cuba", "CST", ++ "Heure d'\u00e9t\u00e9 de Cuba", "CDT"}; + String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST", + "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"}; + String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST", ++ "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java +@@ -83,8 +83,8 @@ + "Ora legale USA centrale", "CDT"}; + String CTT[] = new String[] {"Ora solare della Cina", "CST", + "Ora legale della Cina", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"Ora solare Cuba", "CST", ++ "Ora legale Cuba", "CDT"}; + String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST", + "Ora estiva centrale (Territori del Nord)", "CST"}; + String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST", ++ "Ora estiva Australia centrorientale", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java +@@ -83,8 +83,8 @@ + "\u4e2d\u90e8\u590f\u6642\u9593", "CDT"}; + String CTT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "CST", + "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST", ++ "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"}; + String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST", + "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"}; + String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST", ++ "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java +@@ -83,8 +83,8 @@ + "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; + String CTT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "CST", + "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST", ++ "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; + String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST", + "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"}; + String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST", ++ "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java +@@ -45,8 +45,8 @@ + protected final Object[][] getContents() { + String ACT[] = new String[] {"Acre, normaltid", "ACT", + "Acre, sommartid", "ACST"}; +- String ADELAIDE[] = new String[] {"Central Standard Time (S\u00f6dra Australien)", "CST", +- "Central Summer Time (S\u00f6dra Australien)", "CST"}; ++ String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST", ++ "Central sommartid (S\u00f6dra Australien)", "CST"}; + String AGT[] = new String[] {"Argentina, normaltid", "ART", + "Argentina, sommartid", "ARST"}; + String AKST[] = new String[] {"Alaska, normaltid", "AKST", +@@ -61,10 +61,10 @@ + "Atlantisk sommartid", "ADT"}; + String BDT[] = new String[] {"Bangladesh, normaltid", "BDT", + "Bangladesh, sommartid", "BDST"}; +- String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST", +- "Eastern Summer Time (Queensland)", "EST"}; +- String BROKEN_HILL[] = new String[] {"Central Standard Time (S\u00f6dra Australien/Nya Sydwales)", "CST", +- "Central Summer Time (S\u00f6dra Australien/Nya Sydwales)", "CST"}; ++ String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST", ++ "\u00d6stlig sommartid (Queensland)", "EST"}; ++ String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST", ++ "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"}; + String BRT[] = new String[] {"Brasilien, normaltid", "BRT", + "Brasilien, sommartid", "BRST"}; + String BTT[] = new String[] {"Bhutan, normaltid", "BTT", +@@ -83,10 +83,10 @@ + "Central sommartid", "CDT"}; + String CTT[] = new String[] {"Kina, normaltid", "CST", + "Kina, sommartid", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; +- String DARWIN[] = new String[] {"Central Standard Time (Nordterritoriet)", "CST", +- "Central Summer Time (Nordterritoriet)", "CST"}; ++ String CUBA[] = new String[] {"Kuba, normaltid", "CST", ++ "Kuba, sommartid", "CDT"}; ++ String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST", ++ "Central sommartid (Nordterritoriet)", "CST"}; + String DUBLIN[] = new String[] {"Greenwichtid", "GMT", + "Irland, sommartid", "IST"}; + String EAT[] = new String[] {"\u00d6stafrikansk tid", "EAT", +@@ -99,8 +99,8 @@ + "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"}; + String EST[] = new String[] {"Eastern, normaltid", "EST", + "Eastern, sommartid", "EDT"}; +- String EST_NSW[] = new String[] {"Eastern Standard Time (Nya Sydwales)", "EST", +- "Eastern Summer Time (Nya Sydwales)", "EST"}; ++ String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST", ++ "Eastern, sommartid (Nya Sydwales)", "EST"}; + String GHMT[] = new String[] {"Ghana, normaltid", "GMT", + "Ghana, sommartid", "GHST"}; + String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT", +@@ -163,10 +163,10 @@ + "Salomon\u00f6arna, sommartid", "SBST"}; + String SGT[] = new String[] {"Singapore, normaltid", "SGT", + "Singapore, sommartid", "SGST"}; +- String SLST[] = new String[] {"Greenwich Mean Time", "GMT", ++ String SLST[] = new String[] {"Greenwichtid", "GMT", + "Sierra Leone, sommartid", "SLST"}; +- String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmanien)", "EST", +- "Eastern Summer Time (Tasmanien)", "EST"}; ++ String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST", ++ "Eastern, sommartid (Tasmanien)", "EST"}; + String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT", + "Turkmenistan, sommartid", "TMST"}; + String TRUT[] = new String[] {"Truk, normaltid", "TRUT", +@@ -181,16 +181,16 @@ + "V\u00e4steuropeisk sommartid", "WEST"}; + String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT", + "V\u00e4stindonesisk sommartid", "WIST"}; +- String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST", +- "Western Summer Time (Australien)", "WST"}; ++ String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST", ++ "V\u00e4stlig sommartid (Australien)", "WST"}; + String SAMOA[] = new String[] {"Samoa, normaltid", "SST", + "Samoa, sommartid", "SDT"}; + String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", + "V\u00e4stsamoansk sommartid", "WSST"}; + String ChST[] = new String[] {"Chamorro, normaltid", "ChST", + "Chamorro, sommartid", "ChDT"}; +- String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", +- "Eastern Summer Time (Victoria)", "EST"}; ++ String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST", ++ "\u00d6stlig sommartid (Victoria)", "EST"}; + String UTC[] = new String[] {"Koordinerad universell tid", "UTC", + "Koordinerad universell tid", "UTC"}; + String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST", ++ "Central v\u00e4stlig sommartid (Australien)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java +@@ -83,8 +83,8 @@ + "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT"}; + String CTT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "CST", + "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST", ++ "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"}; + String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST", + "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"}; + String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST", ++ "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java +@@ -83,8 +83,8 @@ From ptisnovs at icedtea.classpath.org Thu Jul 4 03:59:05 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 04 Jul 2013 10:59:05 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltCropImage. Message-ID: changeset 0012ad8bfa59 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0012ad8bfa59 author: Pavel Tisnovsky date: Thu Jul 04 13:02:34 2013 +0200 Eight new tests added into BitBltCropImage. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltCropImage.java | 168 ++++++++++++++++++++++++ 2 files changed, 173 insertions(+), 0 deletions(-) diffs (190 lines): diff -r cdc1cbe75b64 -r 0012ad8bfa59 ChangeLog --- a/ChangeLog Wed Jul 03 10:39:16 2013 +0200 +++ b/ChangeLog Thu Jul 04 13:02:34 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-04 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltCropImage.java: + Eight new tests added into BitBltCropImage. + 2013-07-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r cdc1cbe75b64 -r 0012ad8bfa59 src/org/gfxtest/testsuites/BitBltCropImage.java --- a/src/org/gfxtest/testsuites/BitBltCropImage.java Wed Jul 03 10:39:16 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltCropImage.java Thu Jul 04 13:02:34 2013 +0200 @@ -416,6 +416,174 @@ } /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_INDEXED. No crop is performed to that image. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteIndexedNoCrop(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_INDEXED. Image is cropped so only north-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteIndexedCropNW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, + BitmapCropRegions.CROP_REGION_NW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_INDEXED. Image is cropped so only north-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteIndexedCropNE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, + BitmapCropRegions.CROP_REGION_NE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_INDEXED. Image is cropped so only south-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteIndexedCropSW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, + BitmapCropRegions.CROP_REGION_SW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_INDEXED. Image is cropped so only south-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteIndexedCropSE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, + BitmapCropRegions.CROP_REGION_SE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_GRAY. No crop is performed to that image. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteGrayNoCrop(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_GRAY. Image is cropped so only north-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteGrayCropNW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, + BitmapCropRegions.CROP_REGION_NW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_GRAY. Image is cropped so only north-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteGrayCropNE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, + BitmapCropRegions.CROP_REGION_NE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_GRAY. Image is cropped so only south-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteGrayCropSW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, + BitmapCropRegions.CROP_REGION_SW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_BYTE_GRAY. Image is cropped so only south-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeByteGrayCropSE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, + BitmapCropRegions.CROP_REGION_SE); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. * No crop is performed to that image. * @param image From ptisnovs at icedtea.classpath.org Thu Jul 4 04:05:29 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 04 Jul 2013 11:05:29 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset a6b644899da0 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a6b644899da0 author: Pavel Tisnovsky date: Thu Jul 04 13:09:05 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into CompilableClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/CompilableClassTest.java | 59 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diffs (102 lines): diff -r 758296dad6ac -r a6b644899da0 ChangeLog --- a/ChangeLog Wed Jul 03 10:44:03 2013 +0200 +++ b/ChangeLog Thu Jul 04 13:09:05 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-04 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into CompilableClassTest. + 2013-07-03 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r 758296dad6ac -r a6b644899da0 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Wed Jul 03 10:44:03 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Thu Jul 04 13:09:05 2013 +0200 @@ -52,6 +52,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.Compilable; import javax.script.ScriptEngineManager; @@ -794,12 +796,15 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -954,6 +959,60 @@ } /** + * Test for method javax.script.Compilable.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.compilableClass.getGenericSuperclass(); + assertNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.Compilable.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // get the right array of field signatures + String[] genericInterfaceNames = null; + switch (getJavaVersion()) { + case 6: + genericInterfaceNames = genericInterfaceNames_jdk6; + break; + case 7: + genericInterfaceNames = genericInterfaceNames_jdk7; + break; + case 8: + genericInterfaceNames = genericInterfaceNames_jdk8; + break; + } + + // get all generic interfaces + Type[] genericInterfaces = this.compilableClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length); + + // and transform the array into a list of field names + List interfacesAsString = new ArrayList(); + for (Type genericInterface : genericInterfaces) { + interfacesAsString.add(genericInterface.toString()); + } + + // check if all required interfaces really exists + for (String interfaceThatShouldExists : genericInterfaceNames) { + assertTrue(interfacesAsString.contains(interfaceThatShouldExists), + "interface " + interfaceThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.Compilable */ @SuppressWarnings("cast") From bugzilla-daemon at icedtea.classpath.org Fri Jul 5 03:19:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 05 Jul 2013 10:19:39 +0000 Subject: [Bug 1491] java3d fails - firefox - (also jmol stops at first picture, if any) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1491 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |xerxes at zafena.se Resolution|--- |INVALID --- Comment #2 from Xerxes R?nby --- It appears the "Sun" Java3D and "Sun" JOGL jars are missing on the sagenb server: Note that these files are missing and return error 404: http://alpha.sagenb.org/java/sage3d/sun-libs/j3dcore.jar http://alpha.sagenb.org/java/sage3d/sun-libs/gluegen-rt.jar When Sun got aquired by Oracle, developement of Java3D and JOGL stopped. Official statements by Oracle are found inside their support forum and JIRA bugtracker: http://www.java.net/forum/topic/javadesktop/java-desktop-technologies/java-3d/unsigned-entry-j3dcorejar#comment-818570 https://java.net/jira/browse/JAVA3D-667 The Java3D and JOGL project got forked and now Java3D and JOGL are maintained by the JogAmp community: http://labb.zafena.se/?p=656 http://gouessej.wordpress.com/2012/08/01/java-3d-est-de-retour-java-3d-is-back/ I will close this bug as INVALID since it is caused by missing jar files on the sagenb server. I suggest you inform the sagemath project that the Java3D and JOGL files are missing on the server and that there now exist an updated community maintained version that sagemath can use. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130705/12dfb8e5/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Jul 5 03:38:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 05 Jul 2013 10:38:50 +0000 Subject: [Bug 1490] crash on start josm In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1490 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se --- Comment #1 from Xerxes R?nby --- Which version of josm did you use? I noted you launched josm using a system installed /usr/share/josm/lib/josm.jar Maybe you need to file a bugreport with your linux distribution? I tested to launch josm (version 5990) using icedtea-web 1.2.3 and it http://josm.openstreetmap.de/download/josm.jnlp And it start up correctly. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130705/025ba93a/attachment.html From aazores at redhat.com Fri Jul 5 13:53:30 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 05 Jul 2013 16:53:30 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51D2D68C.6080407@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> Message-ID: <51D7324A.6060605@redhat.com> I made a fresh set of patches attached here because my workspace was getting a little dirty and also out of date. Changelog is the same for each patch file though. The new one, "last.patch," just removes all the old extras.jar stuff essentially. All the more important changes are still in the other patches, same as last time. On 07/02/2013 09:33 AM, Jiri Vanek wrote: > Hi! > nice progress! Especially headless one working and cut news/changelog > are nice improvements. > > General comments: > - remove applications.html (but url to our set of manual reproducers > with notes how and why to add new one should be mentioned somewhere) > - drop notes > - dropping of jamIcon is up to you, I'm for usage of it in new > authors;) It's back, I think it does make the Authors page look nicer :) > - refactor about > - I think you can reuse some text, but it it should be read from > properties > - also you can reuse some parts from notes and applications, but > instead of individual application proper links to icedtea web pages > should be provided > - also it can be worthy to include some image in main about - eg > shrinken logo of splash image? Or to draw the vector from which is > hardcoded? > - new text have to be added to "new" about - to describe > IcedTea-web properly (also worthy to mention plugin, itw-settings, > homepage(s!), purpose of new tabs and so on... > - actually the new colourful main about have the same importance as > the new nice generated files you already provided > - you can reuse already provided splash logo, or (probably > better) use your own, derived one same palce as other resources. Just > keep in mind that those "new logo" and current splash should be very > similar. Added some more to it, but not sure what else to do here. > - some indentation/mark-up both for headless/head"full" versions Added! > - centre the dialogue (tehre is utility method for such a stuff) This too :) > - what about renaming of Copying into GPLv2 License ? (just $0.02) I like this suggestion. I've renamed it to just "GPLv2" so that the tab's name isn't too long compared to others. > - btw about, Authors, Changelog, News... All the tabs should now be > read from resources too. > > Don't take me wrong, this is nice work and most of above are just > small nits and some can be done as separated chnageset. > > - Big nit - redesign the dialogue completely? So it will be "nice" ? > - I'm in favour hardcoded (localisable) main "about" screen and > then some better swapping to (more customised to its purpose) three > underlying tabs. However, unless you really wont this have low > priority definitely should go as separate chnageset. > - nitpickers note - see other apps about dialogues :) Itw is really > few decades behind.... Changed it up quite a bit in this version but not sure how much better it really is. I think it looks nicer at least. It doesn't handle resizing quite as nicely anymore however and I'm really not a Swing guru (or any kind of UI for that matter) and am not sure what to do about it. > > > around here will go the centring of dialogue It's in there now, somewhere. :) > >> + JFrame frame = new JFrame(); >> + frame.add(new AboutDialog()); >> + frame.setSize(640, 480); >> + frame.setVisible(true); >> + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); >> + } >> >> + private static final String itwInfoMessage = "" >> + + name + " " + version >> + + "\n" >> + + R("BAboutITW") >> + + "\n" >> + + R("BFileInfoAuthors") >> + + "\n" >> + + R("BFileInfoNews") >> + + "\n" >> + + R("BFileInfoCopying"); > > here will come the indentation eg > icedtea-web 1.5pre+r87c9fc859a21+ > === icedtea-web wiki page: > http://icedtea.classpath.org/wiki/IcedTea-Web === > IcedTea web is free implementation of jnlp client and java plugin > * Names and email addresses of contributors to this project can be > found in the file AUTHORS. > * News about this project can be found in the file NEWS. > * The license of this project can be found in the file COPYING. > > maybe more full path to this files can be mentioned. Also the man page > and -help swithc can be mentioned > > just nits moreower. nice as it is! Indentation for the "headless" message tweaked and some more info added in Messages.properties for this. > > > >> + >> private static final String miniLicense = "\n" >> + " netx - an open-source JNLP client.\n" >> + " Copyright (C) 2001-2003 Jon A. Maxwell (JAM)\n" >> @@ -137,8 +152,21 @@ public final class Boot implements Privi >> System.exit(0); >> } >> >> - if (null != getOption("-about")) >> - System.out.println(aboutMessage); >> + if (null != getOption("-about")) { >> + if (null != getOption("-headless")) { >> + System.out.println(itwInfoMessage); >> + System.exit(0); >> + } else { >> + System.out.println(aboutMessage); >> + try { >> + AboutDialog.display(); >> + return; >> + } catch (IOException e) { >> + System.out.println(R("BLaunchAboutFailure")); >> + e.printStackTrace(); >> + } >> + } >> + } > > I would probably go by more sure way: > > if (null != getOption("-about")) { > System.out.println(itwInfoMessage); > if (null != getOption("-headless")) { > System.exit(0); > } else { > // System.out.println(aboutMessage); - this should now > not be necessary when itwInfoMessage is showed for both? > try { > AboutDialog.display(); > return; > } catch (Exception e) { > System.out.println(R("BLaunchAboutFailure")); > throw new RuntimeException(e); //let it die quicly > } > } > } > Good idea as well, this also got changed. > > >> install-data-local: >> - ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 >> + ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 > > There slipped empty chars to the end of the line. This is not allowed. Fixed, thank you for catching this! >> -stamps/netx.stamp: netx-source-files.txt >> stamps/bootstrap-directory.stamp >> +stamps/netx-html-gen.stamp: >> + (cd $$NETX_SRCDIR/..; \ >> + mkdir -p html-gen; \ >> + cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ >> + cd html-gen/; \ >> + for FILE in NEWS AUTHORS COPYING ChangeLog; \ >> + do \ >> + sed -e "s/\t//g" -e "s/\&/\&/g" -e "s/ >> /\ \ /g" -e "s//\>/g" -e "s/$$/
/g" >> "./$$FILE"> "./$$FILE.html"; \ >> + done; \ >> + sed -i '4i
' AUTHORS.html; \ >> + echo "
">> AUTHORS.html; \ >> + for FILE in NEWS.html ChangeLog.html; \ >> + do \ >> + mv $$FILE "$$FILE.old"; \ >> + COUNTER=0; \ >> + while read LINE; \ >> + do \ >> + if [[ $$FILE == "NEWS.html" ]]; \ >> + then \ >> + if [[ $$LINE =~ New\ in\ release* ]]; \ >> + then \ >> + COUNTER=$$(( $$COUNTER + 1 )); \ >> + fi; \ >> + if [[ $$COUNTER -gt 2 ]]; \ >> + then \ >> + break; \ >> + fi; \ >> + else \ >> + if [[ $$LINE =~ >> [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}* ]]; \ >> + then \ >> + COUNTER=$$(( $$COUNTER + 1 )); \ >> + fi; \ >> + if [[ $$COUNTER -gt 10 ]]; \ >> + then \ >> + break; \ >> + fi; \ >> + fi; \ >> + echo "$$LINE">> $$FILE; \ >> + done< "$$FILE.old"; \ >> + rm $$FILE.old; \ >> + done) >> + ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html >> $(NETX_RESOURCE_DIR) >> + rm -r $(NETX_SRCDIR)/../html-gen/ >> + mkdir -p stamps >> + touch $@ >> + > > > well well well.. this is THE CODE :) My deepes credits that this works :) > If you will smuggle some markup into this, then it would be nice, and > it will be alowed to go in. > There is strong disadvantage that you can not use internalisation. > Also the miantainability of this code is quite pure. > > > Anyway this cango in with markup, assuming it works. This grew a little more now... email addresses, eg , get turned into "mailto" links now. Actually since it is HTML-escaped first, it would be "<aazores at redhat.com>" that gets turned into a mailto. Similarly, http(s) URLs are automatically turned into hyperlinks. I've done both of those because I had hyperlinks added to the new about.html, and added the ability to click these in HTMLPanel.java. It seemed natural to have the rest of the tabs also contain clickable content. > > > The idea how it can be done by different way - just note - fdifferent > - not better. > > You can have soem small class in net.sourceforge.jnlp.about, which > will have main class. This method will be already compiled with rest > of netx in time of generation, so you will be able to run this class. > This class can serve as small program - transformer from txt fiels > into html file. > You will have much more fredom in generation, and it will be much more > readable, and localisation would be possible to be used (maybe [me do > not insists]). But will be maybe rocket luncher instead of cross bow... > Also I'm not sure how it willbe transparrent for others... > > Actually jsut crossed across my mind that all this "localisation" > leads back to you "runtime" generation which I really do not wont to > allow. So please do not follow blindly mi nits in this review. Maybe there would still be a way to localize the content, but I don't know how to do it really. Applying it to the generated HTML sounds sketchy, but applying it to the plaintext beforehand sounds like a pretty major change compared to the current way it works, which as you can see is basically just a bunch of sed commands. > > > > Really nice wok! > I'm galad to see it grow! > > J. Thank you :) Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 14793 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130705/460ff4e6/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: last.patch Type: text/x-patch Size: 14558 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130705/460ff4e6/last.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Makefile.am.patch Type: text/x-patch Size: 8742 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130705/460ff4e6/Makefile.am.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: resources.patch Type: text/x-patch Size: 6629 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130705/460ff4e6/resources.patch From bugzilla-daemon at icedtea.classpath.org Sun Jul 7 13:54:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 07 Jul 2013 20:54:39 +0000 Subject: [Bug 1492] New: icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Bug ID: 1492 Summary: icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: FreeBSD Status: NEW Severity: normal Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: np at ibu.de CC: unassigned at icedtea.classpath.org Under any browser of (chrome, firefox-22.0,1, opera-12.15) icedtea-web does not work with openjdk-7.25.15. Any web page with a java applet causes to call java and it breaks with this error: openjdk version "1.7.0_25" OpenJDK Runtime Environment (build 1.7.0_25-b15) OpenJDK 64-Bit Server VM (build 23.21-b01, mixed mode) java.lang.NullPointerException at javax.swing.SwingUtilities.appContextGet(SwingUtilities.java:1861) at javax.swing.SwingUtilities.getSharedOwnerFrame(SwingUtilities.java:1831) at javax.swing.JWindow.(JWindow.java:185) at javax.swing.JWindow.(JWindow.java:137) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.(JNLPSecurityManager.java:121) at net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:232) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:252) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:270) at sun.applet.PluginMain.main(PluginMain.java:109) Something very bad happened. I don't know what to do, so I am going to exit :( /usr/ports/java/icedtea-web/work/icedtea-web-1.4/plugin/icedteanp/IcedTeaNPPlugin.cc:1029: thread 0x80f9cf430: Error: Failed to read line from input channel NOTE: child process received `Goodbye', closing down -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130707/90dd07c8/attachment.html From gnu.andrew at redhat.com Mon Jul 8 01:08:37 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 8 Jul 2013 04:08:37 -0400 (EDT) Subject: /hg/release/icedtea6-1.11: 2 new changesets In-Reply-To: References: Message-ID: <211663194.374316.1373270917028.JavaMail.root@redhat.com> ----- Original Message ----- > changeset d59bbf7333e0 in /hg/release/icedtea6-1.11 > details: > http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d59bbf7333e0 > author: Omair Majid > date: Mon Jul 01 21:05:04 2013 -0400 > > Backport additional fixes. > > Additional fixes were applied to jdk7u as part of the security release. > This patch includes a subset of them. > > 2013-07-01 Omair Majid > > * patches/openjdk/7188114-alternate_command_line_parser.patch, > * patches/openjdk/7199143-OCSP_timeout.patch, > * patches/openjdk/8006120-server_jre.patch, > * patches/openjdk/8006536-remove_trailing_slashes.patch, > * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, > * patches/openjdk/8009217-fix_test_compile.patch, > * patches/openjdk/8009463-space_and_final_backslash.patch, > * patches/openjdk/8009610-blacklist_malware_certificate.patch, > * patches/openjdk/8010213-set_socketoptions_windows.patch, > * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, > * patches/openjdk/8011154-awt_regresssion.patch, > * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, > * patches/openjdk/8011992-MlibOpsTest_failed.patch, > * patches/openjdk/8012112-MlibOpsTest_fails.patch, > * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, > * patches/openjdk/8012933-appcontext_disposed_too_early.patch, > * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, > * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, > * patches/openjdk/8014427-raster_regresssion.patch, > * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, > * patches/openjdk/8014676-javadebugger_space_in_paths.patch, > * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. > Backport from icedtea/openjdk 7. > * Makefile.am (ICEDTEA_PATCHES): Apply the above. > * patches/ecj/override.patch: Add new hunk for BufferedImage. > * NEWS: Update with backports. > Is there a reason for including all these backports in a security release? Were regressions apparent? I didn't like having to include them in 7 as it was, but it was upstream did and many of them are for the JSR292 @CallerSensitive backport that doesn't apply to 6. The timezone fixes are pretty safe (and probably overdue), but I'd rather the rest went into HEAD first if possible. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gnu.andrew at redhat.com Mon Jul 8 01:10:05 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 8 Jul 2013 04:10:05 -0400 (EDT) Subject: CACAO 1.6.1 released In-Reply-To: <51D17D0F.2050003@ubuntu.com> References: <51D17D0F.2050003@ubuntu.com> Message-ID: <1309667817.375722.1373271005322.JavaMail.root@redhat.com> ----- Original Message ----- > On 06/29/13 18:00, Stefan Ring wrote: > > This is a snapshot release. > > although this is a snapshot, please could you update the icedtea1 and > icedtea2 > trunks to use this snapshot? > > thanks, Matthias > > > +1 And IcedTea 3.x :) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gnu.andrew at redhat.com Mon Jul 8 01:16:37 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 8 Jul 2013 04:16:37 -0400 (EDT) Subject: OpenJDK zero build In-Reply-To: <1372628847.28517.YahooMailNeo@web163902.mail.gq1.yahoo.com> References: <1372628847.28517.YahooMailNeo@web163902.mail.gq1.yahoo.com> Message-ID: <110484736.381767.1373271397489.JavaMail.root@redhat.com> ----- Original Message ----- > Hi, > > This seemed like an appropriate alias for this question. Please redirect me > if it isn't. There is zero-dev at openjdk.java.net for Zero. This mailing list is primarily for IcedTea, but will do. > > I'm trying to build the OpenJDK (specifically Hotspot) with only a C++ > interpreter ?(which I understand is the jvmgzero target) like I would a > regular OpenJDK build (i.e. not using icedtea) but can't get it to work. > > This is the command I'm using to build > $ ZERO_ARCHDEF=amd64 ZERO_LIBARCH=amd64 ZERO_ENDIANNESS=little > ZERO_ARCHFLAG="-m64" ARCH_DATA_MODEL=64 ZERO_BUILD=true ... make jvmgzero > Did you not run jdk/make/jdk_generic_profile.sh? It sets these variables for you. I always just use the default target. > ? > With this I could get to the linking stage, but it failed complaining that > multiple ffi symbols were missing. This I could fix, trivially, by adding an > -lffi switch in the Makefile. > > This let me link and create test_gamma, which however hangs every time I run > it [1]. > > Given it didn't work out of the box I wonder if building zero outside of > icedtea is even supported? If it is, could someone tell me the exact set of > flags I'd use to get a working build? > You don't say anything about what version you're using. I've built Zero using plain OpenJDK (i.e. the hard way) a few times in the past, but I believe there have been issues with recent versions in 7u. On x86_64 GNU/Linux, I haven't been able to build it with or without IcedTea with any HotSpot later than the one in 2.1.x. > Thanks. > -- > > > Krishna S > skrsn at yahoo.com > > [1]?http://pastebin.com/NeDq06cc -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gnu.andrew at redhat.com Mon Jul 8 01:21:22 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 8 Jul 2013 04:21:22 -0400 (EDT) Subject: [patch] update the jamvm patch for at least 2.3.10 In-Reply-To: <51D17CBE.6010209@ubuntu.com> References: <51D17CBE.6010209@ubuntu.com> Message-ID: <2097065116.385391.1373271682781.JavaMail.root@redhat.com> ----- Original Message ----- > In the 2.3.10 release, the jamvm patch needs an update. Didn't check the > other > releases. Updated patch attached. > > Matthias > > Any idea why these changes are needed? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From andrew at icedtea.classpath.org Mon Jul 8 06:41:04 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 08 Jul 2013 13:41:04 +0000 Subject: /hg/release/icedtea7-2.4: 5 new changesets Message-ID: changeset 6a58091e7912 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=6a58091e7912 author: Andrew John Hughes date: Fri Jul 05 20:51:33 2013 +0100 Update NEWS with changes up to 7u40 b31. 2013-07-05 Andrew John Hughes * NEWS: Add latest security fixes and other changes brought in when syncing with 7u40 b31. Set release date. changeset 79cec0b41195 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=79cec0b41195 author: Andrew John Hughes date: Fri Jul 05 20:53:49 2013 +0100 Add Red Hat bugzilla references. 2013-06-25 Andrew John Hughes * NEWS: Add Red Hat bugzilla references. changeset adfc8db6360f in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=adfc8db6360f author: Andrew John Hughes date: Fri Jun 28 01:30:06 2013 -0500 Turn off system LCMS by default and warn if enabled, as it is unlikely to have the latest security updates. 2013-06-28 Andrew John Hughes * acinclude.m4: (IT_WITH_HOTSPOT_BUILD): Define once. (IT_CHECK_FOR_LCMS): Turn system LCMS off by default and warn if enabled as it is unlikely to have the new security fixes. * configure.ac: Drop IT_ENABLE_ZERO_BUILD; called by IT_WITH_HOTSPOT_BUILD. changeset 3fbc8efc5df2 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=3fbc8efc5df2 author: Andrew John Hughes date: Fri Jul 05 20:55:48 2013 +0100 Prepare for 2.4.1 release. 2013-07-05 Andrew John Hughes * configure.ac: Set version to 2.4.1. changeset 147a05b3f7e9 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=147a05b3f7e9 author: Andrew John Hughes date: Mon Jul 08 14:40:44 2013 +0100 Added tag icedtea-2.4.1 for changeset 3fbc8efc5df2 diffstat: .hgtags | 1 + ChangeLog | 24 ++++ NEWS | 321 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- acinclude.m4 | 7 +- configure.ac | 3 +- 5 files changed, 349 insertions(+), 7 deletions(-) diffs (425 lines): diff -r 27b37759ec5f -r 147a05b3f7e9 .hgtags --- a/.hgtags Tue Jul 02 05:35:39 2013 +0100 +++ b/.hgtags Mon Jul 08 14:40:44 2013 +0100 @@ -36,3 +36,4 @@ 60c41b88775a8043ff4922278eb0e801c330e8fe icedtea-2.3-branchpoint d0b14be8cbf8a705a3bec6cf8828b982405b059c icedtea-2.4-branchpoint c753600d9acfbbf87a5b201dde78068fb43f54d4 icedtea-2.4.0 +3fbc8efc5df22013d6834b2ab3e4cf3aa581a35a icedtea-2.4.1 diff -r 27b37759ec5f -r 147a05b3f7e9 ChangeLog --- a/ChangeLog Tue Jul 02 05:35:39 2013 +0100 +++ b/ChangeLog Mon Jul 08 14:40:44 2013 +0100 @@ -1,3 +1,27 @@ +2013-07-05 Andrew John Hughes + + * configure.ac: Set version to 2.4.1. + +2013-06-28 Andrew John Hughes + + * acinclude.m4: + (IT_WITH_HOTSPOT_BUILD): Define once. + (IT_CHECK_FOR_LCMS): Turn system LCMS off by default + and warn if enabled as it is unlikely to have + the new security fixes. + * configure.ac: Drop IT_ENABLE_ZERO_BUILD; called + by IT_WITH_HOTSPOT_BUILD. + +2013-06-25 Andrew John Hughes + + * NEWS: Add Red Hat bugzilla references. + +2013-07-05 Andrew John Hughes + + * NEWS: Add latest security fixes and other + changes brought in when syncing with 7u40 b31. + Set release date. + 2013-07-01 Andrew John Hughes * Makefile.am: diff -r 27b37759ec5f -r 147a05b3f7e9 NEWS --- a/NEWS Tue Jul 02 05:35:39 2013 +0100 +++ b/NEWS Mon Jul 08 14:40:44 2013 +0100 @@ -12,7 +12,324 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.4.1 (2013-06-XX): +New in release 2.4.1 (2013-07-05): + +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only) + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008607: Better input checking in JMX + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009008: Better manage management-api + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009057, CVE-2013-2448: Improve MIDI event handling + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change + - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields + - S8009654: Improve stability of cmsnamed + - S8010209, CVE-2013-2460: Better provision of factories + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* OpenJDK + - S2223192: [macosx] "opposite" seems always null in focus events + - S4504275: CORBA boolean type unions do not generate compilable code from idlj + - S6337518: Null Arrow Button Throws Exception in BasicComboBoxUI + - S6429204: (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps + - S6436314: Vector could be created with appropriate size in DefaultComboBoxModel + - S6443505: Ideal() function for CmpLTMask + - S6470730: Disconnect button leads to wrong popup message + - S6725714: par compact - add a table to speed up bitmap searches + - S6761744: Hotspot crashes if process size limit is exceeded + - S6843375: Debuggee VM crashes performing mark-sweep-compact + - S7038105: File.isHidden() should return true for pagefile.sys and hiberfil.sys + - S7053526: Upgrade JDK 8 to use Little CMS 2.4 + - S7056447: test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java fails in agentvm + - S7066063: CMS: "Conservation Principle" assert failed + - S7068740: If you wrap a JTable in a JLayer you can't use the page up and page down cmds + - S7105030: [TEST_BUG] [macosx] The tests never finishes + - S7109087: gc/7072527/TestFullGCCount.java fails when GC is set in command-line + - S7109977: [macosx] MixingInHwPanel.java test fails on Mac trying to click in the reserved corner + - S7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option + - S7124520: [macosx] re:6373505 Toolkit.getScreenResolution() != GraphicsConfiguration.getNormalizingTransform() + - S7132378: Race in FutureTask if used with explicit set ( not Runnable ) + - S7142919: TEST_BUG: java/nio/channels/AsyncCloseAndInterrupt.java failing intermittently [sol11] + - S7151823: The test incorrectly recognizing OS + - S7152798: TEST_BUG: sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java does not compile + - S7152866: Tests not run because they are missing the @run tag + - S7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0 + - S7158350: [macosx] Strange results of SwingUIText printing + - S7160084: javac fails to compile an apparently valid class/interface combination + - S7163898: add isLoggable() check to doLog() + - S7164256: EnumMap clone doesn't clear the entrySet keeping a reference to the original Map + - S7174966: With OCSP enabled on Java 7 get error 'Wrong key usage' with Comodo certificate + - S7176220: 'Full GC' events miss date stamp information occasionally + - S7176479: G1: JVM crashes on T5-8 system with 1.5 TB heap + - S7179050: [macosx] Make LWAWT be able to run on AppKit thread + - S7179353: try-with-resources fails to compile with generic exception parameters + - S7181710: [macosx] jawt_md.h shipped with jdk is outdated + - S7183520: [macosx]Unable to print out the defined page for 2D_PrintingTiger/JTablePrintPageRangesTest + - S7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1) + - S7184908: TEST_BUG: [macosx] closed/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java fails + - S7184945: [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47 + - S7186737: Unable to allocate bit maps or card tables for parallel gc for the requested heap + - S7190897: (fs) Files.isWritable method returns false when the path is writable (win) + - S7194902: [macosx] closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed since jdk8b49 + - S7196080: assert(max_heap >= InitialHeapSize) in arguments.cpp + - S7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact + - S7197666: java -d64 -version core dumps in a box with lots of memory + - S7198229: Painting during resizing of the frame should be more smooth + - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout + - S8000435: [macosx] Button painting error under Java 7 on Mac + - S8000450: Restrict access to com/sun/corba/se/impl package + - S8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters + - S8000629: [macosx] Blurry rendering with Java 7 on Retina display + - S8000973: SA on windows thread inspection is broken + - S8002070: Remove the stack search for a resource bundle for Logger to use + - S8002308: [macosx] 7198229 should be applied to the user action only + - S8002390: (zipfs) Problems moving files between zip file systems + - S8003169: [macosx] JVM crash after disconnecting from projector + - S8003173: [macosx] Fullscreen on Mac leaves an empty rectangle + - S8003268: SharedRuntime::generate_native_wrapper doesn't save all registers across runtime tracing calls for JNI critical native methods + - S8003992: File and other classes in java.io do not handle embedded nulls properly + - S8004821: Graphics2D.drawPolygon() fails with IllegalPathStateException + - S8004866: [macosx] HiDPI support in Aqua L&F + - S8005032: G1: Cleanup serial reference processing closures in concurrent marking + - S8005405: [macosx] Drag and Drop: wrong animation when dropped outside any drop target. + - S8005527: [TEST_BUG] console.sh failed Automatically with exit code 1. + - S8005555: TEST_BUG: java/io/Serializable/accessConstants/AccessConstants.java should be removed + - S8005956: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block + - S8005997: [macosx] Printer Dialog opens an additional title bar + - S8006008: Memory leak in hotspot/src/share/vm/adlc/archDesc.cpp + - S8006014: Memory leak in hotspot/src/share/vm/adlc/dfa.cpp + - S8006016: Memory leak at hotspot/src/share/vm/adlc/output_c.cpp + - S8006242: G1: WorkerDataArray::verify() too strict for double calculations + - S8006328: Improve robustness of sound classes + - S8006423: SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67) + - S8006611: Improve scripting + - S8006634: Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler + - S8006894: G1: Number of marking threads missing from PrintFlagsFinal output + - S8007028: java/util/NavigableMap/LockStep hit assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr + - S8007036: G1: Too many old regions added to last mixed GC + - S8007150: Event based tracing is missing truncated field in stack trace content type + - S8007221: G1: concurrent phase durations do not state the time units ("secs") + - S8007333: [launcher] removes multiple back slashes + - S8007458: [findbugs] One more beans issue, with ReflectionUtils + - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo + - S8007703: Remove com.sun.servicetag API + - S8008289: DefaultButtonModel instance keeps stale listeners in html FormView + - S8008301: G1: guarantee(satb_mq_set.completed_buffers_num() == 0) failure + - S8008366: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar + - S8008391: Incorrect metadata for event based tracing + - S8008454: test/runtime/NMT/PrintNMTStatistics is broken + - S8008535: JDK7 Printing : CJK and Latin Text in a string overlap + - S8008660: Failure in 2D Queue Flusher thread on Mac + - S8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently + - S8008744: Rework part of fix for JDK-6741606 + - S8008804: file descriptor leak in src/windows/native/java/net/DualStackPlainSocketImpl.c + - S8008916: G1: Evacuation failed tracing event + - S8009012: [macosx] DisplayChangedListener is not implemented in LWWindowPeer/CGraphicsEnvironment + - S8009125: Add NMT tests for Virtual Memory operations + - S8009152: A number of jtreg tests need review/improvement + - S8009199: Printed text become garbage on Mac OSX + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009259: TEST_BUG: sun/misc/Cleaner/exitOnThrow.sh failing intermittently + - S8009302: Mac OS X: JVM crash on infinite recursion on Appkit Thread + - S8009536: G1: Apache Lucene hang during reference processing + - S8009638: Wrong comment for PL in LocaleISOData, 1989 forward Poland is Republic of Poland + - S8009751: (se) Selector spin when select, close and interestOps(0) invoked at same time (lnx) + - S8009911: [macosx] SWT app freeze when going full screen using Java 7 on Mac + - S8009928: PSR:PERF Increase default string table size + - S8009940: G1: assert(_finger == _heap_end) failed, concurrentMark.cpp:809 + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 + - S8010009: [macosx] Unable type into online word games on MacOSX + - S8010090: GC ID has the wrong type + - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive + - S8010151: nsk/regression/b6653214 fails "assert(snapshot != NULL) failed: Worker should not be started" + - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build + - S8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level + - S8010399: Test8009761.java "Failed: init recursive calls: 5498. After deopt 5494". + - S8010437: guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset + - S8010463: G1: Crashes with -UseTLAB and heap verification + - S8010514: G1: Concurrent mode failure tracing event + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010721: In JDK7 the menu bar disappears when a Dialog is shown + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010770: Zero: back port of 8000780 to HS24 broke JSR 292 + - S8010780: G1: Eden occupancy/capacity output wrong after a full GC + - S8010913: compiler/6863420 often exceeds timeout + - S8010927: Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy + - S8011102: Clear AVX registers after return from JNI call + - S8011128: (fs) Files.createDirectory fails if the resolved path is exactly 248 characters long + - S8011139: (reflect) Revise checking in getEnclosingClass + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011161: NMT: Memory leak when encountering out of memory error while initializing memory snapshot + - S8011186: [TEST_BUG] java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java failed on windows 8 + - S8011200: (coll) Optimize empty HashMap and ArrayList + - S8011218: Kitchensink hanged, likely NMT is to blame + - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined + - S8011380: FX dependency on PlatformLogger broken by 8010309 + - S8011425: NPE in TestObjectCountAfterGCEvent.java on Linux32 + - S8011557: Improve reflection utility classes + - S8011653: Upgrade to JAXP 1.5 + - S8011686: [macosx] AWT accidentally disables the NSApplicationDelegate of SWT, causing loss of OS X integration functionality + - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. + - S8011806: 7u25-b05 hotspot fastdebug build failure + - S8011882: Replace spin loops as back off when suspending + - S8011891: The vm/gc/heap/heap_summary_after_gc event for CMS contains old data + - S8011901: Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas + - S8011947: new hotspot build - hs24-b41 + - S8011952: Missing ResourceMarks in TraceMethodHandles + - S8011968: Kitchensink crashed with SIGSEGV in MemBaseline::baseline + - S8011986: [corba] idlj generates read/write union helper methods that throw wrong exception in some cases + - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012004: JInternalFrame not being finalized after closing + - S8012019: (fc) Thread.interrupt triggers hang in FileChannelImpl.pread (win) + - S8012037: Test8009761.java "Failed: init recursive calls: 7224. After deopt 58824" + - S8012044: Give more information about self-suppression from Throwable.addSuppressed + - S8012082: SASL: auth-conf negotiated, but unencrypted data is accepted, reset to unencrypt + - S8012086: The object count event should only send events for instances occupying more than 0.5% of the heap + - S8012102: CollectedHeap::ensure_parsability is not always called during heap inspection + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012182: Add information about class loading and unloading to event based tracing framework + - S8012210: Make TracingTime available when INCLUDE_TRACE = 0 + - S8012212: Want to link against kstat on solaris x86 as well as sparc + - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 + - S8012265: VM often crashes on solaris with a lot of memory + - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus + - S8012335: G1: Fix bug with compressed oops in template interpreter on x86 and sparc. + - S8012381: [macosx] Collation selection ignored when printing on MacOSX + - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win] + - S8012455: Missing time and date stamps for PrintGCApplicationConcurrentTime and PrintGCApplicationStoppedTime + - S8012558: new hotspot build - hs24-b42 + - S8012586: [x11] Modal dialogs for fullscreen window may show behind its owner + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012683: Remove unused, obsolete ObjectFactory classes + - S8012714: Assign the unique traceid directly to the Klass upon creation + - S8012715: G1: GraphKit accesses PtrQueue::_index as int but is size_t + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint + - S8013117: Thread-local trace_buffer has wrong type and name + - S8013120: NMT: Kitchensink crashes with assert(next_region == NULL || !next_region->is_committed_region()) failed: Sanity check + - S8013140: Heap corruption with NetworkInterface.getByInetAddress() and long i/f name + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8013214: BigApps fails due to 'fatal error: Illegal threadstate encountered: 6' + - S8013226: new hotspot build - hs24-b43 + - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout + - S8013370: Null pointer exception when adding more than 9 accelators to a JMenuBar + - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup + - S8013398: Adjust number of stack guard pages on systems with large memory page size + - S8013416: Java Bean Persistence with XMLEncoder + - S8013557: XMLEncoder in 1.7 can't encode objects initialized in no argument constructor + - S8013651: NMT: reserve/release sequence id's in incorrect order due to race + - S8013799: new hotspot build - hs24-b44 + - S8013810: PrintServiceLookup.lookupPrintServices() does not return consistent result + - S8013827: File.createTempFile hangs with temp file starting with 'com1.4' + - S8013900: More warnings compiling jaxp. + - S8013917: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites + - S8013934: Garbage collection event for CMS has wrong cause for System.gc() + - S8014048: Online user guide of jconsole points incorrect link + - S8014129: makefile changes to allow integration of new features + - S8014189: JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis() + - S8014196: ktab creates a file with zero kt_vno + - S8014205: Most of the Swing dialogs are blank on one win7 MUI + - S8014278: new hotspot build - hs24-b45 + - S8014326: [OSX] All libjvm symbols are exported + - S8014408: G1: crashes with assert assert(prev_committed_card_num == _committed_max_card_num) failed + - S8014411: Decrease lock order rank for event tracing locks + - S8014420: Default JDP address does not match the one assigned by IANA + - S8014423: [macosx] The scrollbar's block increment performs incorrectly + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014478: EnableTracing: output from multiple threads may be mixed together + - S8014611: reserve_and_align() assumptions are invalid on windows + - S8014669: arch specific flags not passed to some link commands + - S8014676: Java debugger may fail to run + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + - S8014721: TEST_BUG: java/awt/TrayIcon/DragEventSource/DragEventSource.java fails with java.lang.UnsupportedOperationException + - S8014724: Broken 7u-dev build + - S8014745: Provide a switch to allow stack walk search of resource bundle + - S8014759: new hotspot build - hs24-b46 + - S8014811: loopTransform.cpp assert(cmp_end->in(2) == limit) failed + - S8014821: Regression: Focus issues with Oracle WebCenter Capture applet + - S8014863: Line break calculations in Java 7 are incorrect + - S8014891: Redundant setting of external access properties in setFeatures + - S8014924: JToolTip#setTipText() sometimes (very often) not repaints component. + - S8014941: make jdk7u40 the default jprt release for hs24 + - S8014968: OCSP and CRL connection timeout is set to four hours by default + - S8014969: Use open man pages for non commercial builds + - S8015016: Improve JAXP 1.5 error message + - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker + - S8015303: [macosx] Application launched via custom URL Scheme does not receive URL + - S8015304: new hotspot build - hs24-b47 + - S8015334: Memory leak when kerning is used on Windows. + - S8015375: Edits to text components hang for clipboard access + - S8015556: [macosx] surrogate pairs do not render properly. + - S8015604: JDP packets containing ideographic characters are broken + - S8015606: Text is not rendered correctly if destination buffer is custom + - S8015683: object_count_after_gc should have the same timestamp for all events + - S8015689: new hotspot build - hs24-b48 + - S8015972: Refactor the sending of the object count after GC event + - S8016046: (process) Strict validation of input should be security manager case only [win]. + - S8016063: getFinalAttributes should use FindClose + - S8016065: Write regression test for 7167142 + - S8016077: new hotspot build - hs24-b49 + - S8016153: Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized. + - S8016170: GC id variable in gcTrace.cpp should use typedef GCId + - S8016187: assert(nbits == 32 || (-(1 << nbits-1) <= x && x < ( 1 << nbits-1))) failed: value out of range + - S8016556: G1: Use ArrayAllocator for BitMaps + - S8016566: new hotspot build - hs24-b50 + - S8016735: Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check + - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 New in release 2.4.0 (2013-06-09): @@ -222,7 +539,7 @@ - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - S7151348: Build breaks due to warning clean up in sun.rmi.*(7146763) - S7151427: Fix the potential memory leak in error handling code in X11SurfaceData.c - - S7151434: java -jar -XX crashes java launcher + - S7151434, RH969884: java -jar -XX crashes java launcher - S7151532: DCmd for hotspot native memory tracking - S7152007: Fix warnings in sun/rmi/rmic - S7152031: Hotspot needs updated xawt path [macosx] diff -r 27b37759ec5f -r 147a05b3f7e9 acinclude.m4 --- a/acinclude.m4 Tue Jul 02 05:35:39 2013 +0100 +++ b/acinclude.m4 Mon Jul 08 14:40:44 2013 +0100 @@ -940,7 +940,7 @@ AC_SUBST([GCJ]) ]) -AC_DEFUN([IT_WITH_HOTSPOT_BUILD], +AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD], [ AC_REQUIRE([IT_ENABLE_ZERO_BUILD]) DEFAULT_BUILD="default" @@ -1937,15 +1937,16 @@ [ AC_MSG_CHECKING([whether to use the system LCMS install]) AC_ARG_ENABLE([system-lcms], - [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])], + [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])], [ ENABLE_SYSTEM_LCMS="${enableval}" ], [ - ENABLE_SYSTEM_LCMS="yes" + ENABLE_SYSTEM_LCMS="no" ]) AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then + AC_MSG_WARN([System LCMS may not have the latest security updates]) dnl Check for LCMS2 headers and libraries. PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) if test "x${LCMS2_FOUND}" = xno diff -r 27b37759ec5f -r 147a05b3f7e9 configure.ac --- a/configure.ac Tue Jul 02 05:35:39 2013 +0100 +++ b/configure.ac Mon Jul 08 14:40:44 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.4.1pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.4.1], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) @@ -175,7 +175,6 @@ IT_ENABLE_WERROR IT_ENABLE_JAR_COMPRESSION IT_SET_SHARK_BUILD -IT_ENABLE_ZERO_BUILD IT_CHECK_ADDITIONAL_VMS IT_WITH_VERSION_SUFFIX From gnu_andrew at member.fsf.org Mon Jul 8 07:19:32 2013 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 8 Jul 2013 15:19:32 +0100 Subject: [SECURITY] IcedTea 2.4.1 for OpenJDK 7 Released! Message-ID: <20130708141932.GA19901@carrie.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. This release updates our OpenJDK 7 support to include the latest security updates. As mentioned in the notes for the 2.4.0 release, we also continue to track the upcoming u40 release upstream and this update synchronises IcedTea with 7u40 b31. The security fixes are as follows: * S6741606, CVE-2013-2407: Integrate Apache Santuario * S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls * S7170730, CVE-2013-2451: Improve Windows network stack support. * S8000638, CVE-2013-2450: Improve deserialization * S8000642, CVE-2013-2446: Better handling of objects for transportation * S8001032: Restrict object access * S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers * S8001034, CVE-2013-1500: Memory management improvements * S8001038, CVE-2013-2444: Resourcefully handle resources * S8001043: Clarify definition restrictions * S8001308: Update display of applet windows * S8001309: Better handling of annotation interfaces * S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost * S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only) * S8003703, CVE-2013-2412: Update RMI connection dialog box * S8004288, CVE-2013-2449: (fs) Files.probeContentType problems * S8004584: Augment applet contextualization * S8005007: Better glyph processing * S8006328, CVE-2013-2448: Improve robustness of sound classes * S8006611: Improve scripting * S8007467: Improve robustness of JMX internal APIs * S8007471: Improve MBean notifications * S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes * S8007925: Improve cmsStageAllocLabV2ToV4curves * S8007926: Improve cmsPipelineDup * S8007927: Improve cmsAllocProfileSequenceDescription * S8007929: Improve CurvesAlloc * S8008120, CVE-2013-2457: Improve JMX class checking * S8008124, CVE-2013-2453: Better compliance testing * S8008128: Better API coherence for JMX * S8008132, CVE-2013-2456: Better serialization support * S8008585: Better JMX data handling * S8008593: Better URLClassLoader resource management * S8008603: Improve provision of JMX providers * S8008607: Better input checking in JMX * S8008611: Better handling of annotations in JMX * S8008615: Improve robustness of JMX internal APIs * S8008623: Better handling of MBeanServers * S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 * S8008982: Adjust JMX for underlying interface changes * S8009004: Better implementation of RMI connections * S8009008: Better manage management-api * S8009013: Better handling of T2K glyphs * S8009034: Improve resulting notifications in JMX * S8009038: Improve JMX notification support * S8009057, CVE-2013-2448: Improve MIDI event handling * S8009067: Improve storing keys in KeyStore * S8009071, CVE-2013-2459: Improve shape handling * S8009235: Improve handling of TSA data * S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change * S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields * S8009654: Improve stability of cmsnamed * S8010209, CVE-2013-2460: Better provision of factories * S8011243, CVE-2013-2470: Improve ImagingLib * S8011248, CVE-2013-2471: Better Component Rasters * S8011253, CVE-2013-2472: Better Short Component Rasters * S8011257, CVE-2013-2473: Better Byte Component Rasters * S8012375, CVE-2013-1571: Improve Javadoc framing * S8012421: Better positioning of PairPositioning * S8012438, CVE-2013-2463: Better image validation * S8012597, CVE-2013-2465: Better image channel verification * S8012601, CVE-2013-2469: Better validation of image layouts * S8014281, CVE-2013-2461: Better checking of XML signature * S8015997: Additional improvement in Javadoc framing IcedTea includes the usual IcedTea patches to allow builds against system libraries and to support more esoteric architectures. In these releases, use of the system version of LCMS is disabled by default to ensure the most secure version is used. Before using the system version, please ensure it is version 2.5 or above, or it has the S8007925, S8007926, S8007927, S8007929 and S8009654 updates listed above. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. Note that the unusually large number of OpenJDK changes is due to the upstream synchronisation mentioned above. What's New? =========== New in release 2.4.1 (2013-07-05): * Security fixes - S6741606, CVE-2013-2407: Integrate Apache Santuario - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls - S7170730, CVE-2013-2451: Improve Windows network stack support. - S8000638, CVE-2013-2450: Improve deserialization - S8000642, CVE-2013-2446: Better handling of objects for transportation - S8001032: Restrict object access - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers - S8001034, CVE-2013-1500: Memory management improvements - S8001038, CVE-2013-2444: Resourcefully handle resources - S8001043: Clarify definition restrictions - S8001308: Update display of applet windows - S8001309: Better handling of annotation interfaces - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only) - S8003703, CVE-2013-2412: Update RMI connection dialog box - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems - S8004584: Augment applet contextualization - S8005007: Better glyph processing - S8006328, CVE-2013-2448: Improve robustness of sound classes - S8006611: Improve scripting - S8007467: Improve robustness of JMX internal APIs - S8007471: Improve MBean notifications - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes - S8007925: Improve cmsStageAllocLabV2ToV4curves - S8007926: Improve cmsPipelineDup - S8007927: Improve cmsAllocProfileSequenceDescription - S8007929: Improve CurvesAlloc - S8008120, CVE-2013-2457: Improve JMX class checking - S8008124, CVE-2013-2453: Better compliance testing - S8008128: Better API coherence for JMX - S8008132, CVE-2013-2456: Better serialization support - S8008585: Better JMX data handling - S8008593: Better URLClassLoader resource management - S8008603: Improve provision of JMX providers - S8008607: Better input checking in JMX - S8008611: Better handling of annotations in JMX - S8008615: Improve robustness of JMX internal APIs - S8008623: Better handling of MBeanServers - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 - S8008982: Adjust JMX for underlying interface changes - S8009004: Better implementation of RMI connections - S8009008: Better manage management-api - S8009013: Better handling of T2K glyphs - S8009034: Improve resulting notifications in JMX - S8009038: Improve JMX notification support - S8009057, CVE-2013-2448: Improve MIDI event handling - S8009067: Improve storing keys in KeyStore - S8009071, CVE-2013-2459: Improve shape handling - S8009235: Improve handling of TSA data - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields - S8009654: Improve stability of cmsnamed - S8010209, CVE-2013-2460: Better provision of factories - S8011243, CVE-2013-2470: Improve ImagingLib - S8011248, CVE-2013-2471: Better Component Rasters - S8011253, CVE-2013-2472: Better Short Component Rasters - S8011257, CVE-2013-2473: Better Byte Component Rasters - S8012375, CVE-2013-1571: Improve Javadoc framing - S8012421: Better positioning of PairPositioning - S8012438, CVE-2013-2463: Better image validation - S8012597, CVE-2013-2465: Better image channel verification - S8012601, CVE-2013-2469: Better validation of image layouts - S8014281, CVE-2013-2461: Better checking of XML signature - S8015997: Additional improvement in Javadoc framing * OpenJDK - S2223192: [macosx] "opposite" seems always null in focus events - S4504275: CORBA boolean type unions do not generate compilable code from idlj - S6337518: Null Arrow Button Throws Exception in BasicComboBoxUI - S6429204: (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps - S6436314: Vector could be created with appropriate size in DefaultComboBoxModel - S6443505: Ideal() function for CmpLTMask - S6470730: Disconnect button leads to wrong popup message - S6725714: par compact - add a table to speed up bitmap searches - S6761744: Hotspot crashes if process size limit is exceeded - S6843375: Debuggee VM crashes performing mark-sweep-compact - S7038105: File.isHidden() should return true for pagefile.sys and hiberfil.sys - S7053526: Upgrade JDK 8 to use Little CMS 2.4 - S7056447: test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java fails in agentvm - S7066063: CMS: "Conservation Principle" assert failed - S7068740: If you wrap a JTable in a JLayer you can't use the page up and page down cmds - S7105030: [TEST_BUG] [macosx] The tests never finishes - S7109087: gc/7072527/TestFullGCCount.java fails when GC is set in command-line - S7109977: [macosx] MixingInHwPanel.java test fails on Mac trying to click in the reserved corner - S7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option - S7124520: [macosx] re:6373505 Toolkit.getScreenResolution() != GraphicsConfiguration.getNormalizingTransform() - S7132378: Race in FutureTask if used with explicit set ( not Runnable ) - S7142919: TEST_BUG: java/nio/channels/AsyncCloseAndInterrupt.java failing intermittently [sol11] - S7151823: The test incorrectly recognizing OS - S7152798: TEST_BUG: sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java does not compile - S7152866: Tests not run because they are missing the @run tag - S7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0 - S7158350: [macosx] Strange results of SwingUIText printing - S7160084: javac fails to compile an apparently valid class/interface combination - S7163898: add isLoggable() check to doLog() - S7164256: EnumMap clone doesn't clear the entrySet keeping a reference to the original Map - S7174966: With OCSP enabled on Java 7 get error 'Wrong key usage' with Comodo certificate - S7176220: 'Full GC' events miss date stamp information occasionally - S7176479: G1: JVM crashes on T5-8 system with 1.5 TB heap - S7179050: [macosx] Make LWAWT be able to run on AppKit thread - S7179353: try-with-resources fails to compile with generic exception parameters - S7181710: [macosx] jawt_md.h shipped with jdk is outdated - S7183520: [macosx]Unable to print out the defined page for 2D_PrintingTiger/JTablePrintPageRangesTest - S7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1) - S7184908: TEST_BUG: [macosx] closed/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java fails - S7184945: [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47 - S7186737: Unable to allocate bit maps or card tables for parallel gc for the requested heap - S7190897: (fs) Files.isWritable method returns false when the path is writable (win) - S7194902: [macosx] closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed since jdk8b49 - S7196080: assert(max_heap >= InitialHeapSize) in arguments.cpp - S7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact - S7197666: java -d64 -version core dumps in a box with lots of memory - S7198229: Painting during resizing of the frame should be more smooth - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout - S8000435: [macosx] Button painting error under Java 7 on Mac - S8000450: Restrict access to com/sun/corba/se/impl package - S8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters - S8000629: [macosx] Blurry rendering with Java 7 on Retina display - S8000973: SA on windows thread inspection is broken - S8002070: Remove the stack search for a resource bundle for Logger to use - S8002308: [macosx] 7198229 should be applied to the user action only - S8002390: (zipfs) Problems moving files between zip file systems - S8003169: [macosx] JVM crash after disconnecting from projector - S8003173: [macosx] Fullscreen on Mac leaves an empty rectangle - S8003268: SharedRuntime::generate_native_wrapper doesn't save all registers across runtime tracing calls for JNI critical native methods - S8003992: File and other classes in java.io do not handle embedded nulls properly - S8004821: Graphics2D.drawPolygon() fails with IllegalPathStateException - S8004866: [macosx] HiDPI support in Aqua L&F - S8005032: G1: Cleanup serial reference processing closures in concurrent marking - S8005405: [macosx] Drag and Drop: wrong animation when dropped outside any drop target. - S8005527: [TEST_BUG] console.sh failed Automatically with exit code 1. - S8005555: TEST_BUG: java/io/Serializable/accessConstants/AccessConstants.java should be removed - S8005956: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block - S8005997: [macosx] Printer Dialog opens an additional title bar - S8006008: Memory leak in hotspot/src/share/vm/adlc/archDesc.cpp - S8006014: Memory leak in hotspot/src/share/vm/adlc/dfa.cpp - S8006016: Memory leak at hotspot/src/share/vm/adlc/output_c.cpp - S8006242: G1: WorkerDataArray::verify() too strict for double calculations - S8006328: Improve robustness of sound classes - S8006423: SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67) - S8006611: Improve scripting - S8006634: Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler - S8006894: G1: Number of marking threads missing from PrintFlagsFinal output - S8007028: java/util/NavigableMap/LockStep hit assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr - S8007036: G1: Too many old regions added to last mixed GC - S8007150: Event based tracing is missing truncated field in stack trace content type - S8007221: G1: concurrent phase durations do not state the time units ("secs") - S8007333: [launcher] removes multiple back slashes - S8007458: [findbugs] One more beans issue, with ReflectionUtils - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo - S8007703: Remove com.sun.servicetag API - S8008289: DefaultButtonModel instance keeps stale listeners in html FormView - S8008301: G1: guarantee(satb_mq_set.completed_buffers_num() == 0) failure - S8008366: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar - S8008391: Incorrect metadata for event based tracing - S8008454: test/runtime/NMT/PrintNMTStatistics is broken - S8008535: JDK7 Printing : CJK and Latin Text in a string overlap - S8008660: Failure in 2D Queue Flusher thread on Mac - S8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently - S8008744: Rework part of fix for JDK-6741606 - S8008804: file descriptor leak in src/windows/native/java/net/DualStackPlainSocketImpl.c - S8008916: G1: Evacuation failed tracing event - S8009012: [macosx] DisplayChangedListener is not implemented in LWWindowPeer/CGraphicsEnvironment - S8009125: Add NMT tests for Virtual Memory operations - S8009152: A number of jtreg tests need review/improvement - S8009199: Printed text become garbage on Mac OSX - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 - S8009259: TEST_BUG: sun/misc/Cleaner/exitOnThrow.sh failing intermittently - S8009302: Mac OS X: JVM crash on infinite recursion on Appkit Thread - S8009536: G1: Apache Lucene hang during reference processing - S8009638: Wrong comment for PL in LocaleISOData, 1989 forward Poland is Republic of Poland - S8009751: (se) Selector spin when select, close and interestOps(0) invoked at same time (lnx) - S8009911: [macosx] SWT app freeze when going full screen using Java 7 on Mac - S8009928: PSR:PERF Increase default string table size - S8009940: G1: assert(_finger == _heap_end) failed, concurrentMark.cpp:809 - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 - S8010009: [macosx] Unable type into online word games on MacOSX - S8010090: GC ID has the wrong type - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive - S8010151: nsk/regression/b6653214 fails "assert(snapshot != NULL) failed: Worker should not be started" - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build - S8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level - S8010399: Test8009761.java "Failed: init recursive calls: 5498. After deopt 5494". - S8010437: guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset - S8010463: G1: Crashes with -UseTLAB and heap verification - S8010514: G1: Concurrent mode failure tracing event - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod - S8010721: In JDK7 the menu bar disappears when a Dialog is shown - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance - S8010770: Zero: back port of 8000780 to HS24 broke JSR 292 - S8010780: G1: Eden occupancy/capacity output wrong after a full GC - S8010913: compiler/6863420 often exceeds timeout - S8010927: Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy - S8011102: Clear AVX registers after return from JNI call - S8011128: (fs) Files.createDirectory fails if the resolved path is exactly 248 characters long - S8011139: (reflect) Revise checking in getEnclosingClass - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows - S8011161: NMT: Memory leak when encountering out of memory error while initializing memory snapshot - S8011186: [TEST_BUG] java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java failed on windows 8 - S8011200: (coll) Optimize empty HashMap and ArrayList - S8011218: Kitchensink hanged, likely NMT is to blame - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined - S8011380: FX dependency on PlatformLogger broken by 8010309 - S8011425: NPE in TestObjectCountAfterGCEvent.java on Linux32 - S8011557: Improve reflection utility classes - S8011653: Upgrade to JAXP 1.5 - S8011686: [macosx] AWT accidentally disables the NSApplicationDelegate of SWT, causing loss of OS X integration functionality - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. - S8011806: 7u25-b05 hotspot fastdebug build failure - S8011882: Replace spin loops as back off when suspending - S8011891: The vm/gc/heap/heap_summary_after_gc event for CMS contains old data - S8011901: Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas - S8011947: new hotspot build - hs24-b41 - S8011952: Missing ResourceMarks in TraceMethodHandles - S8011968: Kitchensink crashed with SIGSEGV in MemBaseline::baseline - S8011986: [corba] idlj generates read/write union helper methods that throw wrong exception in some cases - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 - S8012004: JInternalFrame not being finalized after closing - S8012019: (fc) Thread.interrupt triggers hang in FileChannelImpl.pread (win) - S8012037: Test8009761.java "Failed: init recursive calls: 7224. After deopt 58824" - S8012044: Give more information about self-suppression from Throwable.addSuppressed - S8012082: SASL: auth-conf negotiated, but unencrypted data is accepted, reset to unencrypt - S8012086: The object count event should only send events for instances occupying more than 0.5% of the heap - S8012102: CollectedHeap::ensure_parsability is not always called during heap inspection - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris - S8012182: Add information about class loading and unloading to event based tracing framework - S8012210: Make TracingTime available when INCLUDE_TRACE = 0 - S8012212: Want to link against kstat on solaris x86 as well as sparc - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 - S8012265: VM often crashes on solaris with a lot of memory - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus - S8012335: G1: Fix bug with compressed oops in template interpreter on x86 and sparc. - S8012381: [macosx] Collation selection ignored when printing on MacOSX - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win] - S8012455: Missing time and date stamps for PrintGCApplicationConcurrentTime and PrintGCApplicationStoppedTime - S8012558: new hotspot build - hs24-b42 - S8012586: [x11] Modal dialogs for fullscreen window may show behind its owner - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer - S8012683: Remove unused, obsolete ObjectFactory classes - S8012714: Assign the unique traceid directly to the Klass upon creation - S8012715: G1: GraphKit accesses PtrQueue::_index as int but is size_t - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 - S8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint - S8013117: Thread-local trace_buffer has wrong type and name - S8013120: NMT: Kitchensink crashes with assert(next_region == NULL || !next_region->is_committed_region()) failed: Sanity check - S8013140: Heap corruption with NetworkInterface.getByInetAddress() and long i/f name - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() - S8013214: BigApps fails due to 'fatal error: Illegal threadstate encountered: 6' - S8013226: new hotspot build - hs24-b43 - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout - S8013370: Null pointer exception when adding more than 9 accelators to a JMenuBar - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup - S8013398: Adjust number of stack guard pages on systems with large memory page size - S8013416: Java Bean Persistence with XMLEncoder - S8013557: XMLEncoder in 1.7 can't encode objects initialized in no argument constructor - S8013651: NMT: reserve/release sequence id's in incorrect order due to race - S8013799: new hotspot build - hs24-b44 - S8013810: PrintServiceLookup.lookupPrintServices() does not return consistent result - S8013827: File.createTempFile hangs with temp file starting with 'com1.4' - S8013900: More warnings compiling jaxp. - S8013917: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites - S8013934: Garbage collection event for CMS has wrong cause for System.gc() - S8014048: Online user guide of jconsole points incorrect link - S8014129: makefile changes to allow integration of new features - S8014189: JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis() - S8014196: ktab creates a file with zero kt_vno - S8014205: Most of the Swing dialogs are blank on one win7 MUI - S8014278: new hotspot build - hs24-b45 - S8014326: [OSX] All libjvm symbols are exported - S8014408: G1: crashes with assert assert(prev_committed_card_num == _committed_max_card_num) failed - S8014411: Decrease lock order rank for event tracing locks - S8014420: Default JDP address does not match the one assigned by IANA - S8014423: [macosx] The scrollbar's block increment performs incorrectly - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 - S8014478: EnableTracing: output from multiple threads may be mixed together - S8014611: reserve_and_align() assumptions are invalid on windows - S8014669: arch specific flags not passed to some link commands - S8014676: Java debugger may fail to run - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 - S8014721: TEST_BUG: java/awt/TrayIcon/DragEventSource/DragEventSource.java fails with java.lang.UnsupportedOperationException - S8014724: Broken 7u-dev build - S8014745: Provide a switch to allow stack walk search of resource bundle - S8014759: new hotspot build - hs24-b46 - S8014811: loopTransform.cpp assert(cmp_end->in(2) == limit) failed - S8014821: Regression: Focus issues with Oracle WebCenter Capture applet - S8014863: Line break calculations in Java 7 are incorrect - S8014891: Redundant setting of external access properties in setFeatures - S8014924: JToolTip#setTipText() sometimes (very often) not repaints component. - S8014941: make jdk7u40 the default jprt release for hs24 - S8014968: OCSP and CRL connection timeout is set to four hours by default - S8014969: Use open man pages for non commercial builds - S8015016: Improve JAXP 1.5 error message - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker - S8015303: [macosx] Application launched via custom URL Scheme does not receive URL - S8015304: new hotspot build - hs24-b47 - S8015334: Memory leak when kerning is used on Windows. - S8015375: Edits to text components hang for clipboard access - S8015556: [macosx] surrogate pairs do not render properly. - S8015604: JDP packets containing ideographic characters are broken - S8015606: Text is not rendered correctly if destination buffer is custom - S8015683: object_count_after_gc should have the same timestamp for all events - S8015689: new hotspot build - hs24-b48 - S8015972: Refactor the sending of the object count after GC event - S8016046: (process) Strict validation of input should be security manager case only [win]. - S8016063: getFinalAttributes should use FindClose - S8016065: Write regression test for 7167142 - S8016077: new hotspot build - hs24-b49 - S8016153: Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized. - S8016170: GC id variable in gcTrace.cpp should use typedef GCId - S8016187: assert(nbits == 32 || (-(1 << nbits-1) <= x && x < ( 1 << nbits-1))) failed: value out of range - S8016556: G1: Use ArrayAllocator for BitMaps - S8016566: new hotspot build - hs24-b50 - S8016735: Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 The tarball can be downloaded from: http://icedtea.classpath.org/download/source/icedtea-2.4.1.tar.gz SHA256 checksum: 65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a icedtea-2.4.1.tar.gz The tarball is accompanied by a digital signature available at: http://icedtea.classpath.org/download/source/icedtea-2.4.1.tar.gz.sig This is produced using my public key. See details below. PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 The following people helped with these releases: * Andrew Hughes (synchronisation with upstream and release management) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.4.1.tar.gz $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.4.1/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/0068d8b3/attachment.bin From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:26:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:26:17 +0000 Subject: [Bug 1490] crash on start josm In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1490 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|critical |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/50e94321/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:27:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:27:24 +0000 Subject: [Bug 1487] com.sun.xml.messaging.saaj issues in latest release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1487 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Andrew John Hughes --- You should file a bug with Fedora. They don't use IcedTea for their OpenJDK 7 RPMs. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/c7597206/attachment.html From aph at redhat.com Mon Jul 8 07:27:23 2013 From: aph at redhat.com (Andrew Haley) Date: Mon, 08 Jul 2013 15:27:23 +0100 Subject: AArch64 port first release Message-ID: <51DACC4B.7000502@redhat.com> I'm pleased to announce our first release of Java for the ARMv8 64-bit architecture. This is a whole new port, completely unrelated to to the 32-bit ARM JDK. http://en.wikipedia.org/wiki/AArch64#ARMv8_and_64-bit Project status: This port is still very much a work in progress, but it passes its tests and it's good enough to run most Java programs. It is not complete. We're missing support for optional features such as biased locking and JVMTI. Also, it's rather scrappy in some places and the code could be more efficient and more idiomatic in many other places. Patches welcome! The template interpreter and the C1 compiler are done. The C2 compiler is still at a rather early stage. You don't need an ARMv8 to test and run the port. We've written a small simulator that links into the JVM, so you can run this port just like native Java on any 64-bit x86 GNU/Linux system. We also provide advanced debugging capabilities via a set of GDB extensions. This provides the best interactive debugging environment that I have ever seen for a Java VM. You also can run on ARM's Fast Model if you prefer. We've provided full build instructions, but we'll help you if you get stuck. We want people to try it out. I feel that I have to end with an apology. When I started this port I wanted it to be an exemplary free software project: open discussion, open development, and the free exchange of ideas. It hasn't worked out that way. We needed very detailed technical information about the ARMv8 architecture long before it was made public, and ARM were kind enough to give us what we needed. However, there was a caveat: we couldn't make it public. So, we've been in stealth mode until a few weeks ago. My thanks go out to the legal teams who worked hard to make this release possible. Also, a big shout to Mark Reinhold for sorting out all the crazy problems we had with OpenJDK's source code repository. http://hg.openjdk.java.net/aarch64-port/jdk8/raw-file/tip/README.aarch64 Web: http://openjdk.java.net/projects/aarch64-port/ Mailing list: http://mail.openjdk.java.net/mailman/listinfo/aarch64-port-dev Andrew. From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:29:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:29:06 +0000 Subject: [Bug 1480] My server has crashed for this error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1480 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #889|application/octet-stream |text/plain mime type| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/ed902aae/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:30:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:30:48 +0000 Subject: [Bug 1480] My server has crashed for this error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1480 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Hardware|x86 |x86_64 Version|unspecified |2.1.6 OS|Windows |Linux --- Comment #1 from Andrew John Hughes --- How do we reproduce this failure? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/2529f2cd/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:32:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:32:28 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1397 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/5c1e5418/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:32:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:32:28 +0000 Subject: [Bug 1397] [IcedTea6] Remove needed for override patch by building source/target 6 throughout In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1397 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1272 Target Milestone|--- |6-1.13.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/876cd111/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:33:07 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:33:07 +0000 Subject: [Bug 1398] Current Minecraft (v 1.5.1) under current CentOS 6 and current OpenJDK crashes with backtrace In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1398 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #858|application/octet-stream |text/plain mime type| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/5b320340/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:34:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:34:18 +0000 Subject: [Bug 1398] Current Minecraft (v 1.5.1) under current CentOS 6 and current OpenJDK crashes with backtrace In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1398 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Version|unspecified |6-1.11.9 Resolution|--- |INVALID --- Comment #1 from Andrew John Hughes --- This is a bug in the native code called by the application. Please contact its developers. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/b1b06bec/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:35:15 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:35:15 +0000 Subject: [Bug 1399] SIGSEGV (0xb) in libjvm In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1399 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #859|application/octet-stream |text/plain mime type| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/a26ad56a/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:39:19 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:39:19 +0000 Subject: [Bug 1399] SIGSEGV (0xb) in libjvm In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1399 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Hardware|x86 |x86_64 Version|unspecified |6-1.7.4 Resolution|--- |INVALID OS|Windows |Linux --- Comment #1 from Andrew John Hughes --- This version is no longer supported. Please reopen if you can reliably reproduce this crash on a supported release (1.11.x or 1.12.x). -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/9bff8b67/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:41:55 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:41:55 +0000 Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|gnu.andrew at redhat.com |omajid at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/b7cc1ea2/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 07:42:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 14:42:21 +0000 Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com Version|8-hg |7-hg -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/50ac8cde/attachment.html From omajid at redhat.com Mon Jul 8 07:44:31 2013 From: omajid at redhat.com (Omair Majid) Date: Mon, 08 Jul 2013 10:44:31 -0400 Subject: /hg/release/icedtea6-1.11: 2 new changesets In-Reply-To: <211663194.374316.1373270917028.JavaMail.root@redhat.com> References: <211663194.374316.1373270917028.JavaMail.root@redhat.com> Message-ID: <51DAD04F.408@redhat.com> On 07/08/2013 04:08 AM, Andrew Hughes wrote: > ----- Original Message ----- >> changeset d59bbf7333e0 in /hg/release/icedtea6-1.11 >> details: >> http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d59bbf7333e0 >> author: Omair Majid >> date: Mon Jul 01 21:05:04 2013 -0400 >> >> Backport additional fixes. >> >> Additional fixes were applied to jdk7u as part of the security release. >> This patch includes a subset of them. >> >> 2013-07-01 Omair Majid >> >> * patches/openjdk/7188114-alternate_command_line_parser.patch, >> * patches/openjdk/7199143-OCSP_timeout.patch, >> * patches/openjdk/8006120-server_jre.patch, >> * patches/openjdk/8006536-remove_trailing_slashes.patch, >> * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, >> * patches/openjdk/8009217-fix_test_compile.patch, >> * patches/openjdk/8009463-space_and_final_backslash.patch, >> * patches/openjdk/8009610-blacklist_malware_certificate.patch, >> * patches/openjdk/8010213-set_socketoptions_windows.patch, >> * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, >> * patches/openjdk/8011154-awt_regresssion.patch, >> * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, >> * patches/openjdk/8011992-MlibOpsTest_failed.patch, >> * patches/openjdk/8012112-MlibOpsTest_fails.patch, >> * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, >> * patches/openjdk/8012933-appcontext_disposed_too_early.patch, >> * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, >> * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, >> * patches/openjdk/8014427-raster_regresssion.patch, >> * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, >> * patches/openjdk/8014676-javadebugger_space_in_paths.patch, >> * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. >> Backport from icedtea/openjdk 7. >> * Makefile.am (ICEDTEA_PATCHES): Apply the above. >> * patches/ecj/override.patch: Add new hunk for BufferedImage. >> * NEWS: Update with backports. >> > > Is there a reason for including all these backports in a security release? Were > regressions apparent? Some fixes, such as 8011992 and 8012112 seem to be bug fixes that go on top of a security fix (8011243). This makes me think they are fixes for regressions caused by the security update. Shall I only include those patches that we know fixes a known regression? Or does including these patches make sense? > I didn't like having to include them in 7 as it was, but it > was upstream did and many of them are for the JSR292 @CallerSensitive backport > that doesn't apply to 6. You are right, the JSR292 bits of @CallerSensitive does not apply to 6. On the other hand, most of the non-JSR292 changes do apply. My motivation for adding this now was that there is a >99% chance that future fixes that touch these methods will force us to backport this to 6 too. So I figured we might as well add it now. I will backout the @CallerSensitive patch as you suggest and add it to HEAD instead. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at redhat.com Mon Jul 8 08:11:55 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 08 Jul 2013 17:11:55 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51D7324A.6060605@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> Message-ID: <51DAD6BB.5080500@redhat.com> On 07/05/2013 10:53 PM, Andrew Azores wrote: > I made a fresh set of patches attached here because my workspace was getting a little dirty and also out of date. Changelog is the same for each patch file though. The new one, "last.patch," just removes all the old extras.jar stuff essentially. All the more important changes are still in the other patches, same as last time. > > > It's back, I think it does make the Authors page look nicer :) nice! Please double check after push that images are as should be ( I had some issues with older patch command) > ... > Added some more to it, but not sure what else to do here. >> - some indentation/mark-up both for headless/head"full" versions > > Added! Looks excellent! Two minor nits - I would like to have icedtea-web homepage url and removed license header (sorry) in headless about and.. see general comments below > >> - centre the dialogue (tehre is utility method for such a stuff) > > This too :) This looks like it is not here (or is not working). The - public static void centerWindowsToCurrentScreen(Window w) { from net.sourceforge.jnlp.util.ScreenFinder should do the trick. > >> - what about renaming of Copying into GPLv2 License ? (just $0.02) > > I like this suggestion. I've renamed it to just "GPLv2" so that the tab's name isn't too long compared to others. New about dialog is nearly perfect !-) > >> - btw about, Authors, Changelog, News... All the tabs should now be read from resources too. >> >> Don't take me wrong, this is nice work and most of above are just small nits and some can be done as separated chnageset. >> >> - Big nit - redesign the dialogue completely? So it will be "nice" ? >> - I'm in favour hardcoded (localisable) main "about" screen and then some better swapping to (more customised to its purpose) three underlying tabs. However, unless you really wont this have low priority definitely should go as separate chnageset. >> - nitpickers note - see other apps about dialogues :) Itw is really few decades behind.... > > Changed it up quite a bit in this version but not sure how much better it really is. I think it looks nicer at least. It doesn't handle resizing quite as nicely anymore however and I'm really not a Swing guru (or any kind of UI for that matter) and am not sure what to do about it. good job! Dialogue is much nicer, and higligting is perfect. the only nit is the license header in headless mode. I'm for dropping it (tbh I have not found in code where it come from :) > ...ability of this code is quite pure. >> >> >> Anyway this cango in with markup, assuming it works. > > This grew a little more now... email addresses, eg , get turned into "mailto" links now. Actually since it is HTML-escaped first, it would be "<aazores at redhat.com>" that gets turned into a mailto. Similarly, http(s) URLs are automatically turned into hyperlinks. I've done both of those because I had hyperlinks added to the new about.html, and added the ability to click these in HTMLPanel.java. It seemed natural to have the rest of the tabs also contain clickable content. A bit?? You are quite powerful make/sed/bash magican. Feature will prove how bullet proof this code is ;) You have included some comments, and it is really *appreciated* . Maybe even more comments will be nice (eg split the greate regex on start of target [to several lines with individual comments?]?) > >> >> .,... > > Maybe there would still be a way to localize the content, but I don't know how to do it really. Applying it to the generated HTML sounds sketchy, but applying it to the plaintext beforehand sounds like a pretty major change compared to the current way it works, which as you can see is basically just a bunch of sed commands. nvm any more:) New dialogue is really nice! Still several general comments: - drop license header in headless mode. It does not looks nice. Sorry:( - the mentioning of COPYING file is more then enough - add icedtea-web homepage url in headless about. - you have duplicated the splash image. Tats wrong :) But as you did it, I would recomand to shrink it (so the source iamge have the same size as result image), fill Iced (by some iced-blue) and make web more dark - visible) - my $0.002 +1 for having it a bit bigger then now O:) - please update changelog for next round - localisation! aboutPanel = new HTMLPanel(res_about, "About"); + authorsPanel = new HTMLPanel(res_authors, "Authors"); + newsPanel = new HTMLPanel(res_news, "News"); + changelogPanel = new HTMLPanel(res_changelog, "Changelog"); + copyingPanel = new HTMLPanel(res_copying, "GPLv2"); - several tests is depending on about.jar or other affected stuff You will have to fix those:( - see: grep about -ir tests/ tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: testResourceCaching("net/sourceforge/jnlp/about/Main.class"); tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: testResourceCaching("net/sourceforge/jnlp/about/Main.class"); tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: testResourceCaching("net/sourceforge/jnlp/about/resources/about.html"); tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: testResourceCaching("net/sourceforge/jnlp/about/resources/about.html"); tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); ^^ Here and here ?? you will have to create soem jar via jar and javac api. tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFile.java: JAR_URL = new URL("http://icedtea.classpath.org/netx/about.jar"); tests/test-extensions/net/sourceforge/jnlp/ContentReader.java: //mostly compaling when assassin kill the process about StreamClosed tests/reproducers/simple/LocalesTest/testcases/LocalesTestTest.java: "BOAbout", Thsi one expects the BOAbout to be printed, but it looks like you have dropped this "ssentence" To code itself I do not have any more objections and we are getting close to finish! tahnx J. From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 09:38:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 16:38:32 +0000 Subject: [Bug 1466] [IcedTea6] OpenJDK 6 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1466 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.11.12 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/12523c7a/attachment.html From andrew at icedtea.classpath.org Mon Jul 8 09:50:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 08 Jul 2013 16:50:00 +0000 Subject: /hg/release/icedtea7-2.4: Start 2.4.2 release cycle. Message-ID: changeset 3d95198cf8be in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=3d95198cf8be author: Andrew John Hughes date: Mon Jul 08 17:49:52 2013 +0100 Start 2.4.2 release cycle. 2013-07-08 Andrew John Hughes * configure.ac: Bump to 2.4.2pre. * NEWS: Add 2.4.2 section. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 147a05b3f7e9 -r 3d95198cf8be ChangeLog --- a/ChangeLog Mon Jul 08 14:40:44 2013 +0100 +++ b/ChangeLog Mon Jul 08 17:49:52 2013 +0100 @@ -1,3 +1,8 @@ +2013-07-08 Andrew John Hughes + + * configure.ac: Bump to 2.4.2pre. + * NEWS: Add 2.4.2 section. + 2013-07-05 Andrew John Hughes * configure.ac: Set version to 2.4.1. diff -r 147a05b3f7e9 -r 3d95198cf8be NEWS --- a/NEWS Mon Jul 08 14:40:44 2013 +0100 +++ b/NEWS Mon Jul 08 17:49:52 2013 +0100 @@ -12,6 +12,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.4.2 (2013-XX-XX): + New in release 2.4.1 (2013-07-05): * Security fixes diff -r 147a05b3f7e9 -r 3d95198cf8be configure.ac --- a/configure.ac Mon Jul 08 14:40:44 2013 +0100 +++ b/configure.ac Mon Jul 08 17:49:52 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.4.1], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.4.2pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 09:51:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 16:51:51 +0000 Subject: [Bug 1411] openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh test failure In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1411 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #2 from Andrew John Hughes --- This should be fixed by the sync with upstream u25 in 2.3.10: http://blog.fuseyism.com/index.php/2013/06/28/security-icedtea-2-3-10-for-openjdk-7-released/ -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/b8deed4b/attachment.html From andrew at icedtea.classpath.org Mon Jul 8 10:02:20 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 08 Jul 2013 17:02:20 +0000 Subject: /hg/icedtea7: Add release notes for latest 2.x security updates. Message-ID: changeset 6b8afdb43912 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=6b8afdb43912 author: Andrew John Hughes date: Mon Jul 08 18:02:07 2013 +0100 Add release notes for latest 2.x security updates. 2013-07-08 Andrew John Hughes * configure.ac: Bump to 2.4.2pre. * NEWS: Add 2.4.2 section. diffstat: ChangeLog | 5 + NEWS | 774 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 778 insertions(+), 1 deletions(-) diffs (truncated from 803 to 500 lines): diff -r 7b39d0b37add -r 6b8afdb43912 ChangeLog --- a/ChangeLog Tue Jun 11 10:44:39 2013 +0100 +++ b/ChangeLog Mon Jul 08 18:02:07 2013 +0100 @@ -1,3 +1,8 @@ +2013-06-11 Andrew John Hughes + + * NEWS: Add release notes for 2.1.9, 2.2.9, + 2.3.10 and 2.4.1 + 2013-06-11 Andrew John Hughes * NEWS: Update 2.4.0 following release diff -r 7b39d0b37add -r 6b8afdb43912 NEWS --- a/NEWS Tue Jun 11 10:44:39 2013 +0100 +++ b/NEWS Mon Jul 08 18:02:07 2013 +0100 @@ -14,6 +14,778 @@ New in release 2.5.0 (2012-XX-XX): +New in release 2.4.1 (2013-07-05): + +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only) + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008607: Better input checking in JMX + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009008: Better manage management-api + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009057, CVE-2013-2448: Improve MIDI event handling + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change + - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields + - S8009654: Improve stability of cmsnamed + - S8010209, CVE-2013-2460: Better provision of factories + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* OpenJDK + - S2223192: [macosx] "opposite" seems always null in focus events + - S4504275: CORBA boolean type unions do not generate compilable code from idlj + - S6337518: Null Arrow Button Throws Exception in BasicComboBoxUI + - S6429204: (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps + - S6436314: Vector could be created with appropriate size in DefaultComboBoxModel + - S6443505: Ideal() function for CmpLTMask + - S6470730: Disconnect button leads to wrong popup message + - S6725714: par compact - add a table to speed up bitmap searches + - S6761744: Hotspot crashes if process size limit is exceeded + - S6843375: Debuggee VM crashes performing mark-sweep-compact + - S7038105: File.isHidden() should return true for pagefile.sys and hiberfil.sys + - S7053526: Upgrade JDK 8 to use Little CMS 2.4 + - S7056447: test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java fails in agentvm + - S7066063: CMS: "Conservation Principle" assert failed + - S7068740: If you wrap a JTable in a JLayer you can't use the page up and page down cmds + - S7105030: [TEST_BUG] [macosx] The tests never finishes + - S7109087: gc/7072527/TestFullGCCount.java fails when GC is set in command-line + - S7109977: [macosx] MixingInHwPanel.java test fails on Mac trying to click in the reserved corner + - S7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option + - S7124520: [macosx] re:6373505 Toolkit.getScreenResolution() != GraphicsConfiguration.getNormalizingTransform() + - S7132378: Race in FutureTask if used with explicit set ( not Runnable ) + - S7142919: TEST_BUG: java/nio/channels/AsyncCloseAndInterrupt.java failing intermittently [sol11] + - S7151823: The test incorrectly recognizing OS + - S7152798: TEST_BUG: sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java does not compile + - S7152866: Tests not run because they are missing the @run tag + - S7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0 + - S7158350: [macosx] Strange results of SwingUIText printing + - S7160084: javac fails to compile an apparently valid class/interface combination + - S7163898: add isLoggable() check to doLog() + - S7164256: EnumMap clone doesn't clear the entrySet keeping a reference to the original Map + - S7174966: With OCSP enabled on Java 7 get error 'Wrong key usage' with Comodo certificate + - S7176220: 'Full GC' events miss date stamp information occasionally + - S7176479: G1: JVM crashes on T5-8 system with 1.5 TB heap + - S7179050: [macosx] Make LWAWT be able to run on AppKit thread + - S7179353: try-with-resources fails to compile with generic exception parameters + - S7181710: [macosx] jawt_md.h shipped with jdk is outdated + - S7183520: [macosx]Unable to print out the defined page for 2D_PrintingTiger/JTablePrintPageRangesTest + - S7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1) + - S7184908: TEST_BUG: [macosx] closed/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java fails + - S7184945: [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47 + - S7186737: Unable to allocate bit maps or card tables for parallel gc for the requested heap + - S7190897: (fs) Files.isWritable method returns false when the path is writable (win) + - S7194902: [macosx] closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed since jdk8b49 + - S7196080: assert(max_heap >= InitialHeapSize) in arguments.cpp + - S7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact + - S7197666: java -d64 -version core dumps in a box with lots of memory + - S7198229: Painting during resizing of the frame should be more smooth + - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout + - S8000435: [macosx] Button painting error under Java 7 on Mac + - S8000450: Restrict access to com/sun/corba/se/impl package + - S8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters + - S8000629: [macosx] Blurry rendering with Java 7 on Retina display + - S8000973: SA on windows thread inspection is broken + - S8002070: Remove the stack search for a resource bundle for Logger to use + - S8002308: [macosx] 7198229 should be applied to the user action only + - S8002390: (zipfs) Problems moving files between zip file systems + - S8003169: [macosx] JVM crash after disconnecting from projector + - S8003173: [macosx] Fullscreen on Mac leaves an empty rectangle + - S8003268: SharedRuntime::generate_native_wrapper doesn't save all registers across runtime tracing calls for JNI critical native methods + - S8003992: File and other classes in java.io do not handle embedded nulls properly + - S8004821: Graphics2D.drawPolygon() fails with IllegalPathStateException + - S8004866: [macosx] HiDPI support in Aqua L&F + - S8005032: G1: Cleanup serial reference processing closures in concurrent marking + - S8005405: [macosx] Drag and Drop: wrong animation when dropped outside any drop target. + - S8005527: [TEST_BUG] console.sh failed Automatically with exit code 1. + - S8005555: TEST_BUG: java/io/Serializable/accessConstants/AccessConstants.java should be removed + - S8005956: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block + - S8005997: [macosx] Printer Dialog opens an additional title bar + - S8006008: Memory leak in hotspot/src/share/vm/adlc/archDesc.cpp + - S8006014: Memory leak in hotspot/src/share/vm/adlc/dfa.cpp + - S8006016: Memory leak at hotspot/src/share/vm/adlc/output_c.cpp + - S8006242: G1: WorkerDataArray::verify() too strict for double calculations + - S8006328: Improve robustness of sound classes + - S8006423: SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67) + - S8006611: Improve scripting + - S8006634: Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler + - S8006894: G1: Number of marking threads missing from PrintFlagsFinal output + - S8007028: java/util/NavigableMap/LockStep hit assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr + - S8007036: G1: Too many old regions added to last mixed GC + - S8007150: Event based tracing is missing truncated field in stack trace content type + - S8007221: G1: concurrent phase durations do not state the time units ("secs") + - S8007333: [launcher] removes multiple back slashes + - S8007458: [findbugs] One more beans issue, with ReflectionUtils + - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo + - S8007703: Remove com.sun.servicetag API + - S8008289: DefaultButtonModel instance keeps stale listeners in html FormView + - S8008301: G1: guarantee(satb_mq_set.completed_buffers_num() == 0) failure + - S8008366: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar + - S8008391: Incorrect metadata for event based tracing + - S8008454: test/runtime/NMT/PrintNMTStatistics is broken + - S8008535: JDK7 Printing : CJK and Latin Text in a string overlap + - S8008660: Failure in 2D Queue Flusher thread on Mac + - S8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently + - S8008744: Rework part of fix for JDK-6741606 + - S8008804: file descriptor leak in src/windows/native/java/net/DualStackPlainSocketImpl.c + - S8008916: G1: Evacuation failed tracing event + - S8009012: [macosx] DisplayChangedListener is not implemented in LWWindowPeer/CGraphicsEnvironment + - S8009125: Add NMT tests for Virtual Memory operations + - S8009152: A number of jtreg tests need review/improvement + - S8009199: Printed text become garbage on Mac OSX + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009259: TEST_BUG: sun/misc/Cleaner/exitOnThrow.sh failing intermittently + - S8009302: Mac OS X: JVM crash on infinite recursion on Appkit Thread + - S8009536: G1: Apache Lucene hang during reference processing + - S8009638: Wrong comment for PL in LocaleISOData, 1989 forward Poland is Republic of Poland + - S8009751: (se) Selector spin when select, close and interestOps(0) invoked at same time (lnx) + - S8009911: [macosx] SWT app freeze when going full screen using Java 7 on Mac + - S8009928: PSR:PERF Increase default string table size + - S8009940: G1: assert(_finger == _heap_end) failed, concurrentMark.cpp:809 + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 + - S8010009: [macosx] Unable type into online word games on MacOSX + - S8010090: GC ID has the wrong type + - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive + - S8010151: nsk/regression/b6653214 fails "assert(snapshot != NULL) failed: Worker should not be started" + - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build + - S8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level + - S8010399: Test8009761.java "Failed: init recursive calls: 5498. After deopt 5494". + - S8010437: guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset + - S8010463: G1: Crashes with -UseTLAB and heap verification + - S8010514: G1: Concurrent mode failure tracing event + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010721: In JDK7 the menu bar disappears when a Dialog is shown + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010770: Zero: back port of 8000780 to HS24 broke JSR 292 + - S8010780: G1: Eden occupancy/capacity output wrong after a full GC + - S8010913: compiler/6863420 often exceeds timeout + - S8010927: Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy + - S8011102: Clear AVX registers after return from JNI call + - S8011128: (fs) Files.createDirectory fails if the resolved path is exactly 248 characters long + - S8011139: (reflect) Revise checking in getEnclosingClass + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011161: NMT: Memory leak when encountering out of memory error while initializing memory snapshot + - S8011186: [TEST_BUG] java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java failed on windows 8 + - S8011200: (coll) Optimize empty HashMap and ArrayList + - S8011218: Kitchensink hanged, likely NMT is to blame + - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined + - S8011380: FX dependency on PlatformLogger broken by 8010309 + - S8011425: NPE in TestObjectCountAfterGCEvent.java on Linux32 + - S8011557: Improve reflection utility classes + - S8011653: Upgrade to JAXP 1.5 + - S8011686: [macosx] AWT accidentally disables the NSApplicationDelegate of SWT, causing loss of OS X integration functionality + - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. + - S8011806: 7u25-b05 hotspot fastdebug build failure + - S8011882: Replace spin loops as back off when suspending + - S8011891: The vm/gc/heap/heap_summary_after_gc event for CMS contains old data + - S8011901: Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas + - S8011947: new hotspot build - hs24-b41 + - S8011952: Missing ResourceMarks in TraceMethodHandles + - S8011968: Kitchensink crashed with SIGSEGV in MemBaseline::baseline + - S8011986: [corba] idlj generates read/write union helper methods that throw wrong exception in some cases + - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012004: JInternalFrame not being finalized after closing + - S8012019: (fc) Thread.interrupt triggers hang in FileChannelImpl.pread (win) + - S8012037: Test8009761.java "Failed: init recursive calls: 7224. After deopt 58824" + - S8012044: Give more information about self-suppression from Throwable.addSuppressed + - S8012082: SASL: auth-conf negotiated, but unencrypted data is accepted, reset to unencrypt + - S8012086: The object count event should only send events for instances occupying more than 0.5% of the heap + - S8012102: CollectedHeap::ensure_parsability is not always called during heap inspection + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012182: Add information about class loading and unloading to event based tracing framework + - S8012210: Make TracingTime available when INCLUDE_TRACE = 0 + - S8012212: Want to link against kstat on solaris x86 as well as sparc + - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 + - S8012265: VM often crashes on solaris with a lot of memory + - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus + - S8012335: G1: Fix bug with compressed oops in template interpreter on x86 and sparc. + - S8012381: [macosx] Collation selection ignored when printing on MacOSX + - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win] + - S8012455: Missing time and date stamps for PrintGCApplicationConcurrentTime and PrintGCApplicationStoppedTime + - S8012558: new hotspot build - hs24-b42 + - S8012586: [x11] Modal dialogs for fullscreen window may show behind its owner + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012683: Remove unused, obsolete ObjectFactory classes + - S8012714: Assign the unique traceid directly to the Klass upon creation + - S8012715: G1: GraphKit accesses PtrQueue::_index as int but is size_t + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint + - S8013117: Thread-local trace_buffer has wrong type and name + - S8013120: NMT: Kitchensink crashes with assert(next_region == NULL || !next_region->is_committed_region()) failed: Sanity check + - S8013140: Heap corruption with NetworkInterface.getByInetAddress() and long i/f name + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8013214: BigApps fails due to 'fatal error: Illegal threadstate encountered: 6' + - S8013226: new hotspot build - hs24-b43 + - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout + - S8013370: Null pointer exception when adding more than 9 accelators to a JMenuBar + - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup + - S8013398: Adjust number of stack guard pages on systems with large memory page size + - S8013416: Java Bean Persistence with XMLEncoder + - S8013557: XMLEncoder in 1.7 can't encode objects initialized in no argument constructor + - S8013651: NMT: reserve/release sequence id's in incorrect order due to race + - S8013799: new hotspot build - hs24-b44 + - S8013810: PrintServiceLookup.lookupPrintServices() does not return consistent result + - S8013827: File.createTempFile hangs with temp file starting with 'com1.4' + - S8013900: More warnings compiling jaxp. + - S8013917: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites + - S8013934: Garbage collection event for CMS has wrong cause for System.gc() + - S8014048: Online user guide of jconsole points incorrect link + - S8014129: makefile changes to allow integration of new features + - S8014189: JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis() + - S8014196: ktab creates a file with zero kt_vno + - S8014205: Most of the Swing dialogs are blank on one win7 MUI + - S8014278: new hotspot build - hs24-b45 + - S8014326: [OSX] All libjvm symbols are exported + - S8014408: G1: crashes with assert assert(prev_committed_card_num == _committed_max_card_num) failed + - S8014411: Decrease lock order rank for event tracing locks + - S8014420: Default JDP address does not match the one assigned by IANA + - S8014423: [macosx] The scrollbar's block increment performs incorrectly + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014478: EnableTracing: output from multiple threads may be mixed together + - S8014611: reserve_and_align() assumptions are invalid on windows + - S8014669: arch specific flags not passed to some link commands + - S8014676: Java debugger may fail to run + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + - S8014721: TEST_BUG: java/awt/TrayIcon/DragEventSource/DragEventSource.java fails with java.lang.UnsupportedOperationException + - S8014724: Broken 7u-dev build + - S8014745: Provide a switch to allow stack walk search of resource bundle + - S8014759: new hotspot build - hs24-b46 + - S8014811: loopTransform.cpp assert(cmp_end->in(2) == limit) failed + - S8014821: Regression: Focus issues with Oracle WebCenter Capture applet + - S8014863: Line break calculations in Java 7 are incorrect + - S8014891: Redundant setting of external access properties in setFeatures + - S8014924: JToolTip#setTipText() sometimes (very often) not repaints component. + - S8014941: make jdk7u40 the default jprt release for hs24 + - S8014968: OCSP and CRL connection timeout is set to four hours by default + - S8014969: Use open man pages for non commercial builds + - S8015016: Improve JAXP 1.5 error message + - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker + - S8015303: [macosx] Application launched via custom URL Scheme does not receive URL + - S8015304: new hotspot build - hs24-b47 + - S8015334: Memory leak when kerning is used on Windows. + - S8015375: Edits to text components hang for clipboard access + - S8015556: [macosx] surrogate pairs do not render properly. + - S8015604: JDP packets containing ideographic characters are broken + - S8015606: Text is not rendered correctly if destination buffer is custom + - S8015683: object_count_after_gc should have the same timestamp for all events + - S8015689: new hotspot build - hs24-b48 + - S8015972: Refactor the sending of the object count after GC event + - S8016046: (process) Strict validation of input should be security manager case only [win]. + - S8016063: getFinalAttributes should use FindClose + - S8016065: Write regression test for 7167142 + - S8016077: new hotspot build - hs24-b49 + - S8016153: Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized. + - S8016170: GC id variable in gcTrace.cpp should use typedef GCId + - S8016187: assert(nbits == 32 || (-(1 << nbits-1) <= x && x < ( 1 << nbits-1))) failed: value out of range + - S8016556: G1: Use ArrayAllocator for BitMaps + - S8016566: new hotspot build - hs24-b50 + - S8016735: Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check + - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 + +New in release 2.2.9 (2013-06-29): + +* New features + - PR1378: Add AArch64 support to Zero +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008607: Better input checking in JMX + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009008: Better manage management-api + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009057, CVE-2013-2448: Improve MIDI event handling + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change + - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields + - S8009654: Improve stability of cmsnamed + - S8010209, CVE-2013-2460: Better provision of factories + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* Bug fixes + - S7053526: Upgrade JDK 8 to use Little CMS 2.4 + - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage + - S7142091: [macosx] RFE: Refactoring of peer initialization/disposing + - S7142596: RMI JPRT tests are failing + - S7150345: [macosx] Can't type into applets + - S7151434, RH969884: java -jar -XX crashes java launcher + - S7156191: [macosx] Can't type into applet demos in Pivot + - S7156194: [macosx] Can't type non-ASCII characters into applets + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S7174718: [macosx] Regression in 7u6 b12: PopupFactory leaks DefaultFrames. + - S7188114: (launcher) need an alternate command line parser for Windows + - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node + - S7198570: (tz) Support tzdata2012f + - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout + - S8001161: mac: EmbeddedFrame doesn't become active window + - S8002070: Remove the stack search for a resource bundle for Logger to use + - S8002225: (tz) Support tzdata2012i + - S8005932: Java 7 on mac os x only provides text clipboard formats + - S8006120: Provide "Server JRE" for 7u train + - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X + - S8006536: [launcher] removes trailing slashes on arguments + - S8009165: Fix for 8006435 needs revision + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. + - S8009610: Blacklist certificate used with malware. + - S8009987: (tz) Support tzdata2013b + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8010009: [macosx] Unable type into online word games on MacOSX + - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive + - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010939: Deadlock in LogManager + - S8011139: (reflect) Revise checking in getEnclosingClass + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined + - S8011557: Improve reflection utility classes + - S8011806: 7u25-b05 hotspot fastdebug build failure + - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 + - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus + - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win] + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout + - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup + - S8014205: Most of the Swing dialogs are blank on one win7 MUI + - S8014423: [macosx] The scrollbar's block increment performs incorrectly + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement + - S8014676: Java debugger may fail to run + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + - S8014745: Provide a switch to allow stack walk search of resource bundle + - S8014968: OCSP and CRL connection timeout is set to four hours by default + +New in release 2.1.9 (2013-06-29): + +* New features + - PR1378: Add AArch64 support to Zero +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 10:30:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 08 Jul 2013 17:30:26 +0000 Subject: [Bug 1487] com.sun.xml.messaging.saaj issues in latest release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1487 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com --- Comment #3 from Deepak Bhole --- We do not use IcedTea in Fedora. We do use the forest however and it may be worth creating a separate forest component for the future. In any case, this matter is a duplicate of an already reported issue: https://bugzilla.redhat.com/show_bug.cgi?id=977979 Thank you for the excellent bug report, it was quite helpful in tracking down the issue. It has now been fixed in Fedora and RHEL. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130708/502e1212/attachment.html From omajid at icedtea.classpath.org Mon Jul 8 12:05:24 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 08 Jul 2013 19:05:24 +0000 Subject: /hg/release/icedtea6-1.12: 5 new changesets Message-ID: changeset 08ce3247b5b0 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=08ce3247b5b0 author: Andrew John Hughes date: Sat Jun 22 16:38:24 2013 -0500 Add 2013/06/18 security patches. 2013-06-22 Andrew John Hughes * patches/idresolver_fix.patch: Removed. Part of 6469266. * Makefile.am: (SECURITY_PATCHES): Add new ones. (SPECIAL_SECURITY_PATCH_1): Renamed from SPECIAL_SECURITY_PATCH. (SPECIAL_SECURITY_PATCH_2): Add 8009071, which needs to be applied after some AWT backports. (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES as must be applied before 8004584. Add 7171223 to end. * patches/openjdk/6307603-xrender-01.patch, * patches/openjdk/6469266-xmlsec_1.4.2.patch, * patches/openjdk/6656651-windows_lcd_glyphs.patch, * patches/openjdk/6786028-wcag_bold_tags.patch, * patches/openjdk/6786682-wcag_lang.patch, * patches/openjdk/6786688-wcag_table.patch, * patches/openjdk/6786690-wcag_dl.patch, * patches/openjdk/6802694-no_deprecated.patch, * patches/openjdk/6851834-restructure.patch, * patches/openjdk/6888167-medialib_memory_leaks.patch, * patches/openjdk/6961178-doclet_xml.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7006270-regressions.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7171223-strict_aliasing.patch, * patches/openjdk/7195301-no_instanceof_node.patch, * patches/security/20130618/6741606-apache_santuario.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/7170730-windows_network_stack.patch, * patches/security/20130618/8000638-improve_deserialization.patch, * patches/security/20130618/8000642-better_transportation_handling.patch, * patches/security/20130618/8001032-restrict_object_access-corba.patch, * patches/security/20130618/8001032-restrict_object_access-jdk.patch, * patches/security/20130618/8001033-refactor_address_handling.patch, * patches/security/20130618/8001034-memory_management.patch, * patches/security/20130618/8001038-resourcefully_handle_resources.patch, * patches/security/20130618/8001043-clarify_definition_restrictions.patch, * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, * patches/security/20130618/8001318-6_fixup.patch, * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, * patches/security/20130618/8001330-checking_order_improvement.patch, * patches/security/20130618/8001330-improve_checking_order.patch, * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, * patches/security/20130618/8004584-augment_applet_contextualization.patch, * patches/security/20130618/8005007-better_glyph_processing.patch, * patches/security/20130618/8006328-6_fixup.patch, * patches/security/20130618/8006328-sound_class_robustness.patch, * patches/security/20130618/8006611-improve_scripting.patch, * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, * patches/security/20130618/8007471-6_fixup.patch, * patches/security/20130618/8007471-improve_mbean_notifications.patch, * patches/security/20130618/8007812-getenclosingmethod.patch, * patches/security/20130618/8008120-improve_jmx_class_checking.patch, * patches/security/20130618/8008124-better_compliance_testing.patch, * patches/security/20130618/8008128-better_jmx_api_coherence.patch, * patches/security/20130618/8008132-better_serialization.patch, * patches/security/20130618/8008585-jmx_data_handling.patch, * patches/security/20130618/8008593-better_urlclassloader.patch, * patches/security/20130618/8008603-jmx_provider_provision.patch, * patches/security/20130618/8008611-6_fixup.patch, * patches/security/20130618/8008611-jmx_annotations.patch, * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, * patches/security/20130618/8008623-mbeanserver_handling.patch, * patches/security/20130618/8008744-6741606_rework.patch, * patches/security/20130618/8008982-jmx_interface_changes.patch, * patches/security/20130618/8009004-rmi_connection_improvement.patch, * patches/security/20130618/8009013-t2k_glyphs.patch, * patches/security/20130618/8009034-jmx_notification_improvement.patch, * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, * patches/security/20130618/8009067-improve_key_storing.patch, * patches/security/20130618/8009071-improve_shape_handling.patch, * patches/security/20130618/8009235-improve_tsa_data_handling.patch, * patches/security/20130618/8009554-serialjavaobject.patch, * patches/security/20130618/8011243-improve_imaginglib.patch, * patches/security/20130618/8011248-better_component_rasters.patch, * patches/security/20130618/8011253-better_short_component_rasters.patch, * patches/security/20130618/8011257-better_byte_component_rasters.patch, * patches/security/20130618/8011557-improve_reflection.patch, * patches/security/20130618/8012375-javadoc_framing.patch, * patches/security/20130618/8012421-better_positioning.patch, * patches/security/20130618/8012438-better_image_validation.patch, * patches/security/20130618/8012597-better_image_channel_validation.patch, * patches/security/20130618/8012601-better_layout_validation.patch, * patches/security/20130618/8014281-better_xml_signature_checking.patch, * patches/security/20130618/8015997-more_javadoc_framing.patch, * patches/security/20130618/diamond_fix.patch, * patches/security/20130618/handle_npe.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/security/20130618/javac_issue.patch, * patches/security/20130618/langtools_generics.patch, * patches/security/20130618/langtools_merge-01.patch, * patches/security/20130618/langtools_merge-02.patch, * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. * patches/apache-xml-internal-fix-bug-38655.patch: Remove. changeset c152bd08c25e in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=c152bd08c25e author: Andrew John Hughes date: Tue Jun 25 15:07:59 2013 +0100 Correct issues found in building security patches. 2013-06-24 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move 8009071 after library patch. * NEWS: Correct bug ID referenced for OJ3. * patches/ecj/needs-6.patch: Add cases for javax.sound and javax.management, due to @Override annotations in the security patches. * patches/openjdk/6307603-xrender-01.patch: Regenerated again as wrong last time. * patches/security/20130618/8009071-improve_shape_handling.patch: Include sizecalc.h in gif_lib.h. changeset 698ae40e2dc4 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=698ae40e2dc4 author: Omair Majid date: Wed Jun 26 10:47:13 2013 -0400 Fix patches to work with patch tools that can not handle renames 2013-06-26 Omair Majid * Makefile.am: (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and patches/openjdk/6851834-handle_renames.patch * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't rename files using extended-diff-style. * patches/openjdk/6990754-handle_renames.patch: New file. Contains the rename portion of 6990754 since some patch programs can not handle renames. * patches/openjdk/6851834-restructure.patch: Don't rename files using extended-diff-style. * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename porition of 6851834 since some patch programs can not handle renames. changeset 1413106f03ad in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=1413106f03ad author: Omair Majid date: Wed Jun 26 13:45:20 2013 -0400 Drop unnecessary patch for S8009554 2013-06-26 Omair Majid Severin Gehwolf * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/8009554-serialjavaobject.patch. * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This was adding redundant permission check changeset a6de0621a57b in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=a6de0621a57b author: chrisphi date: Wed Jun 26 15:10:59 2013 -0400 Summary: Backport 20130618 sec fixes 7158805 and 8001330 added patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch added patches/security/20130618/8001330-checking_order_improvement-it6.patch changed ChangeLog changed Makefile.am diffstat: ChangeLog | 169 +- Makefile.am | 96 +- NEWS | 2 +- patches/apache-xml-internal-fix-bug-38655.patch | 11 - patches/ecj/needs-6.patch | 24 + patches/idresolver_fix.patch | 194 - patches/openjdk/6307603-xrender-01.patch | 239 +- patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 ++++++++ patches/openjdk/6656651-windows_lcd_glyphs.patch | 938 + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 4 +- patches/openjdk/6786028-wcag_bold_tags.patch | 2914 + patches/openjdk/6786682-wcag_lang.patch | 274 + patches/openjdk/6786688-wcag_table.patch | 2828 + patches/openjdk/6786690-wcag_dl.patch | 3230 + patches/openjdk/6802694-no_deprecated.patch | 601 + patches/openjdk/6851834-handle_renames.patch | 605 + patches/openjdk/6851834-restructure.patch | 26853 ++++++++++ patches/openjdk/6888167-medialib_memory_leaks.patch | 134 + patches/openjdk/6961178-doclet_xml.patch | 1989 + patches/openjdk/6980681-corba_deadlock.patch | 7 - patches/openjdk/6990754-handle_renames.patch | 925 + patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18949 +++++++ patches/openjdk/7006270-regressions.patch | 299 + patches/openjdk/7008809-report_class_in_arraystoreexception.patch | 189 + patches/openjdk/7014851-unused_parallel_compaction_code.patch | 810 + patches/openjdk/7017732-move_static_fields_to_class.patch | 3079 + patches/openjdk/7036747-elfstringtable.patch | 130 + patches/openjdk/7086585-flexible_field_injection.patch | 3424 + patches/openjdk/7162902-corba_fixes.patch | 21 - patches/openjdk/7171223-strict_aliasing.patch | 25 + patches/openjdk/7195301-no_instanceof_node.patch | 86 + patches/security/20130618/6741606-apache_santuario.patch | 8110 +++ patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 743 + patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 448 + patches/security/20130618/7170730-windows_network_stack.patch | 1057 + patches/security/20130618/8000638-improve_deserialization.patch | 26 + patches/security/20130618/8000642-better_transportation_handling.patch | 808 + patches/security/20130618/8001032-restrict_object_access-corba.patch | 544 + patches/security/20130618/8001032-restrict_object_access-jdk.patch | 21 + patches/security/20130618/8001033-refactor_address_handling.patch | 119 + patches/security/20130618/8001034-memory_management.patch | 78 + patches/security/20130618/8001038-resourcefully_handle_resources.patch | 236 + patches/security/20130618/8001043-clarify_definition_restrictions.patch | 92 + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch | 36 + patches/security/20130618/8001318-6_fixup.patch | 114 + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch | 470 + patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 + patches/security/20130618/8001330-checking_order_improvement.patch | 380 + patches/security/20130618/8001330-improve_checking_order.patch | 97 + patches/security/20130618/8003703-update_rmi_connection_dialog.patch | 131 + patches/security/20130618/8004584-augment_applet_contextualization.patch | 322 + patches/security/20130618/8005007-better_glyph_processing.patch | 118 + patches/security/20130618/8006328-6_fixup.patch | 31 + patches/security/20130618/8006328-sound_class_robustness.patch | 6936 ++ patches/security/20130618/8006611-improve_scripting.patch | 78 + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch | 108 + patches/security/20130618/8007471-6_fixup.patch | 25 + patches/security/20130618/8007471-improve_mbean_notifications.patch | 89 + patches/security/20130618/8007812-getenclosingmethod.patch | 89 + patches/security/20130618/8008120-improve_jmx_class_checking.patch | 332 + patches/security/20130618/8008124-better_compliance_testing.patch | 20 + patches/security/20130618/8008128-better_jmx_api_coherence.patch | 110 + patches/security/20130618/8008132-better_serialization.patch | 121 + patches/security/20130618/8008585-jmx_data_handling.patch | 69 + patches/security/20130618/8008593-better_urlclassloader.patch | 270 + patches/security/20130618/8008603-jmx_provider_provision.patch | 29 + patches/security/20130618/8008611-6_fixup.patch | 20 + patches/security/20130618/8008611-jmx_annotations.patch | 32 + patches/security/20130618/8008615-jmx_internal_api_robustness.patch | 70 + patches/security/20130618/8008623-mbeanserver_handling.patch | 121 + patches/security/20130618/8008744-6741606_rework.patch | 882 + patches/security/20130618/8008982-jmx_interface_changes.patch | 168 + patches/security/20130618/8009004-rmi_connection_improvement.patch | 54 + patches/security/20130618/8009013-t2k_glyphs.patch | 39 + patches/security/20130618/8009034-jmx_notification_improvement.patch | 30 + patches/security/20130618/8009038-jmx_notification_support_improvement.patch | 89 + patches/security/20130618/8009067-improve_key_storing.patch | 20 + patches/security/20130618/8009071-improve_shape_handling.patch | 1014 + patches/security/20130618/8009235-improve_tsa_data_handling.patch | 80 + patches/security/20130618/8011243-improve_imaginglib.patch | 618 + patches/security/20130618/8011248-better_component_rasters.patch | 51 + patches/security/20130618/8011253-better_short_component_rasters.patch | 140 + patches/security/20130618/8011257-better_byte_component_rasters.patch | 157 + patches/security/20130618/8011557-improve_reflection.patch | 132 + patches/security/20130618/8012375-javadoc_framing.patch | 61 + patches/security/20130618/8012421-better_positioning.patch | 100 + patches/security/20130618/8012438-better_image_validation.patch | 283 + patches/security/20130618/8012597-better_image_channel_validation.patch | 597 + patches/security/20130618/8012601-better_layout_validation.patch | 125 + patches/security/20130618/8014281-better_xml_signature_checking.patch | 49 + patches/security/20130618/8015997-more_javadoc_framing.patch | 21 + patches/security/20130618/diamond_fix.patch | 55 + patches/security/20130618/handle_npe.patch | 21 + patches/security/20130618/hs_merge-01.patch | 284 + patches/security/20130618/hs_merge-02.patch | 155 + patches/security/20130618/hs_merge-03.patch | 18 + patches/security/20130618/hs_merge-04.patch | 44 + patches/security/20130618/javac_issue.patch | 60 + patches/security/20130618/langtools_generics.patch | 600 + patches/security/20130618/langtools_merge-01.patch | 30 + patches/security/20130618/langtools_merge-02.patch | 30 + patches/security/20130618/langtools_merge-03.patch | 18 + 102 files changed, 121588 insertions(+), 362 deletions(-) diffs (truncated from 123104 to 500 lines): diff -r 36d69d052be1 -r a6de0621a57b ChangeLog --- a/ChangeLog Thu Apr 25 14:14:05 2013 +0100 +++ b/ChangeLog Wed Jun 26 15:10:59 2013 -0400 @@ -1,4 +1,171 @@ -2013-04-25 Andrew John Hughes +2013-06-26 Chris Phillips + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/7158805-nested_subroutine_rewriting.patch + patches/security/20130618/8001330-checking_order_improvement.patch + patches/openjdk/7036747-elfstringtable.patch + patches/openjdk/7017732-move_static_fields_to_class.patch + patches/openjdk/6990754-use_native_memory_for_symboltable.patch + patches/openjdk/6990754-handle_renames.patch + patches/openjdk/7008809-report_class_in_arraystoreexception.patch + patches/openjdk/7086585-flexible_field_injection.patch + patches/security/20130618/hs_merge-01.patch + patches/security/20130618/hs_merge-02.patch + patches/security/20130618/hs_merge-03.patch + patches/openjdk/7014851-unused_parallel_compaction_code.patch + patches/security/20130618/hs_merge-04.patch + Add: + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch + patches/security/20130618/8001330-checking_order_improvement-it6.patch + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Backported fix for 7158805. + * patches/security/20130618/8001330-checking_order_improvement-it6.patch: + Backported fix for hs portion of 8001330. + +2013-06-26 Omair Majid + Severin Gehwolf + + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/8009554-serialjavaobject.patch. + * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This + was adding redundant permission checking. + +2013-06-26 Omair Majid + + * Makefile.am: + (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and + patches/openjdk/6851834-handle_renames.patch + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't + rename files using extended-diff-style. + * patches/openjdk/6990754-handle_renames.patch: New file. Contains the + rename portion of 6990754 since some patch programs can not handle + renames. + * patches/openjdk/6851834-restructure.patch: Don't rename files using + extended-diff-style. + * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename + porition of 6851834 since some patch programs can not handle renames. + +2013-06-24 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Move 8009071 after library patch. + * NEWS: Correct bug ID referenced for OJ3. + * patches/ecj/needs-6.patch: + Add cases for javax.sound and javax.management, due + to @Override annotations in the security patches. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated again as wrong last time. + * patches/security/20130618/8009071-improve_shape_handling.patch: + Include sizecalc.h in gif_lib.h. + +2013-06-22 Andrew John Hughes + + * patches/idresolver_fix.patch: + Removed. Part of 6469266. + * Makefile.am: + (SECURITY_PATCHES): Add new ones. + (SPECIAL_SECURITY_PATCH_1): Renamed from + SPECIAL_SECURITY_PATCH. + (SPECIAL_SECURITY_PATCH_2): Add 8009071, which + needs to be applied after some AWT backports. + (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. + Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES + as must be applied before 8004584. Add 7171223 to + end. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated. + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6656651-windows_lcd_glyphs.patch, + * patches/openjdk/6786028-wcag_bold_tags.patch, + * patches/openjdk/6786682-wcag_lang.patch, + * patches/openjdk/6786688-wcag_table.patch, + * patches/openjdk/6786690-wcag_dl.patch, + * patches/openjdk/6802694-no_deprecated.patch, + * patches/openjdk/6851834-restructure.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/6961178-doclet_xml.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7006270-regressions.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7171223-strict_aliasing.patch, + * patches/openjdk/7195301-no_instanceof_node.patch, + * patches/security/20130618/6741606-apache_santuario.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/7170730-windows_network_stack.patch, + * patches/security/20130618/8000638-improve_deserialization.patch, + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch, + * patches/security/20130618/8001032-restrict_object_access-jdk.patch, + * patches/security/20130618/8001033-refactor_address_handling.patch, + * patches/security/20130618/8001034-memory_management.patch, + * patches/security/20130618/8001038-resourcefully_handle_resources.patch, + * patches/security/20130618/8001043-clarify_definition_restrictions.patch, + * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, + * patches/security/20130618/8001318-6_fixup.patch, + * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch, + * patches/security/20130618/8001330-improve_checking_order.patch, + * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, + * patches/security/20130618/8004584-augment_applet_contextualization.patch, + * patches/security/20130618/8005007-better_glyph_processing.patch, + * patches/security/20130618/8006328-6_fixup.patch, + * patches/security/20130618/8006328-sound_class_robustness.patch, + * patches/security/20130618/8006611-improve_scripting.patch, + * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, + * patches/security/20130618/8007471-6_fixup.patch, + * patches/security/20130618/8007471-improve_mbean_notifications.patch, + * patches/security/20130618/8007812-getenclosingmethod.patch, + * patches/security/20130618/8008120-improve_jmx_class_checking.patch, + * patches/security/20130618/8008124-better_compliance_testing.patch, + * patches/security/20130618/8008128-better_jmx_api_coherence.patch, + * patches/security/20130618/8008132-better_serialization.patch, + * patches/security/20130618/8008585-jmx_data_handling.patch, + * patches/security/20130618/8008593-better_urlclassloader.patch, + * patches/security/20130618/8008603-jmx_provider_provision.patch, + * patches/security/20130618/8008611-6_fixup.patch, + * patches/security/20130618/8008611-jmx_annotations.patch, + * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, + * patches/security/20130618/8008623-mbeanserver_handling.patch, + * patches/security/20130618/8008744-6741606_rework.patch, + * patches/security/20130618/8008982-jmx_interface_changes.patch, + * patches/security/20130618/8009004-rmi_connection_improvement.patch, + * patches/security/20130618/8009013-t2k_glyphs.patch, + * patches/security/20130618/8009034-jmx_notification_improvement.patch, + * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, + * patches/security/20130618/8009067-improve_key_storing.patch, + * patches/security/20130618/8009071-improve_shape_handling.patch, + * patches/security/20130618/8009235-improve_tsa_data_handling.patch, + * patches/security/20130618/8009554-serialjavaobject.patch, + * patches/security/20130618/8011243-improve_imaginglib.patch, + * patches/security/20130618/8011248-better_component_rasters.patch, + * patches/security/20130618/8011253-better_short_component_rasters.patch, + * patches/security/20130618/8011257-better_byte_component_rasters.patch, + * patches/security/20130618/8011557-improve_reflection.patch, + * patches/security/20130618/8012375-javadoc_framing.patch, + * patches/security/20130618/8012421-better_positioning.patch, + * patches/security/20130618/8012438-better_image_validation.patch, + * patches/security/20130618/8012597-better_image_channel_validation.patch, + * patches/security/20130618/8012601-better_layout_validation.patch, + * patches/security/20130618/8014281-better_xml_signature_checking.patch, + * patches/security/20130618/8015997-more_javadoc_framing.patch, + * patches/security/20130618/diamond_fix.patch, + * patches/security/20130618/handle_npe.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/security/20130618/javac_issue.patch, + * patches/security/20130618/langtools_generics.patch, + * patches/security/20130618/langtools_merge-01.patch, + * patches/security/20130618/langtools_merge-02.patch, + * patches/security/20130618/langtools_merge-03.patch: + 2013/06/18 security patches. + * patches/apache-xml-internal-fix-bug-38655.patch: Remove. + +2013-04-25 Andrew John Hughes * configure.ac: Bump to 1.12.6pre. * NEWS: Add section for 1.12.6. diff -r 36d69d052be1 -r a6de0621a57b Makefile.am --- a/Makefile.am Thu Apr 25 14:14:05 2013 +0100 +++ b/Makefile.am Wed Jun 26 15:10:59 2013 -0400 @@ -336,9 +336,89 @@ patches/security/20130416/8009305.patch \ patches/security/20130416/8009699.patch \ patches/security/20130416/8009814.patch \ - patches/security/20130416/8009857.patch + patches/security/20130416/8009857.patch \ + patches/openjdk/7195301-no_instanceof_node.patch \ + patches/openjdk/6469266-xmlsec_1.4.2.patch \ + patches/security/20130618/6741606-apache_santuario.patch \ + patches/security/20130618/7170730-windows_network_stack.patch \ + patches/security/20130618/8000638-improve_deserialization.patch \ + patches/security/20130618/8001032-restrict_object_access-corba.patch \ + patches/security/20130618/8001032-restrict_object_access-jdk.patch \ + patches/security/20130618/8001033-refactor_address_handling.patch \ + patches/security/20130618/8001034-memory_management.patch \ + patches/security/20130618/8001038-resourcefully_handle_resources.patch \ + patches/security/20130618/8001043-clarify_definition_restrictions.patch \ + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch \ + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch \ + patches/security/20130618/8001318-6_fixup.patch \ + patches/security/20130618/8001330-improve_checking_order.patch \ + patches/security/20130618/8003703-update_rmi_connection_dialog.patch \ + patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ + patches/openjdk/8007393.patch \ + patches/openjdk/8007611.patch \ + patches/security/20130618/8004584-augment_applet_contextualization.patch \ + patches/security/20130618/8005007-better_glyph_processing.patch \ + patches/security/20130618/8006328-sound_class_robustness.patch \ + patches/security/20130618/8006328-6_fixup.patch \ + patches/security/20130618/8006611-improve_scripting.patch \ + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch \ + patches/security/20130618/8007471-improve_mbean_notifications.patch \ + patches/security/20130618/8007471-6_fixup.patch \ + patches/security/20130618/8007812-getenclosingmethod.patch \ + patches/security/20130618/8008120-improve_jmx_class_checking.patch \ + patches/security/20130618/8008124-better_compliance_testing.patch \ + patches/security/20130618/8008128-better_jmx_api_coherence.patch \ + patches/security/20130618/8008132-better_serialization.patch \ + patches/security/20130618/8008585-jmx_data_handling.patch \ + patches/security/20130618/8008593-better_urlclassloader.patch \ + patches/security/20130618/8008603-jmx_provider_provision.patch \ + patches/security/20130618/8008611-jmx_annotations.patch \ + patches/security/20130618/8008611-6_fixup.patch \ + patches/security/20130618/8008615-jmx_internal_api_robustness.patch \ + patches/security/20130618/8008623-mbeanserver_handling.patch \ + patches/security/20130618/8008744-6741606_rework.patch \ + patches/security/20130618/8008982-jmx_interface_changes.patch \ + patches/security/20130618/8009004-rmi_connection_improvement.patch \ + patches/security/20130618/8009013-t2k_glyphs.patch \ + patches/security/20130618/8009034-jmx_notification_improvement.patch \ + patches/security/20130618/8009038-jmx_notification_support_improvement.patch \ + patches/security/20130618/8009067-improve_key_storing.patch \ + patches/security/20130618/8009235-improve_tsa_data_handling.patch \ + patches/openjdk/6888167-medialib_memory_leaks.patch \ + patches/security/20130618/8011243-improve_imaginglib.patch \ + patches/security/20130618/8011248-better_component_rasters.patch \ + patches/security/20130618/8011253-better_short_component_rasters.patch \ + patches/security/20130618/8011257-better_byte_component_rasters.patch \ + patches/security/20130618/8011557-improve_reflection.patch \ + patches/security/20130618/8012421-better_positioning.patch \ + patches/security/20130618/8012438-better_image_validation.patch \ + patches/security/20130618/8012597-better_image_channel_validation.patch \ + patches/security/20130618/8012601-better_layout_validation.patch \ + patches/security/20130618/8014281-better_xml_signature_checking.patch \ + patches/security/20130618/diamond_fix.patch \ + patches/security/20130618/handle_npe.patch \ + patches/security/20130618/javac_issue.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ + patches/security/20130618/8001330-checking_order_improvement-it6.patch \ + patches/security/20130618/8000642-better_transportation_handling.patch \ + patches/openjdk/6786028-wcag_bold_tags.patch \ + patches/openjdk/6786682-wcag_lang.patch \ + patches/openjdk/6802694-no_deprecated.patch \ + patches/openjdk/6786690-wcag_dl.patch \ + patches/openjdk/6786688-wcag_table.patch \ + patches/openjdk/6961178-doclet_xml.patch \ + patches/openjdk/6851834-restructure.patch \ + patches/openjdk/6851834-handle_renames.patch \ + patches/openjdk/7006270-regressions.patch \ + patches/security/20130618/8012375-javadoc_framing.patch \ + patches/security/20130618/8015997-more_javadoc_framing.patch \ + patches/security/20130618/langtools_merge-01.patch \ + patches/security/20130618/langtools_merge-02.patch \ + patches/security/20130618/langtools_generics.patch \ + patches/security/20130618/langtools_merge-03.patch -SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch +SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch +SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch ICEDTEA_PATCHES = \ $(DROP_PATCHES) \ @@ -355,13 +435,14 @@ patches/openjdk/6725214-direct3d-01.patch \ patches/openjdk/6748082-isDisplayLocal.patch \ patches/openjdk/6633275-shaped_translucent_windows.patch \ - $(SPECIAL_SECURITY_PATCH) \ + $(SPECIAL_SECURITY_PATCH_1) \ patches/openjdk/6769607-modal-hangs.patch \ patches/openjdk/6791612-opengl-jni-fix.patch \ patches/openjdk/6755274-glgetstring-crash.patch \ patches/openjdk/6984543-onscreen_rendering_resize_test.patch \ patches/openjdk/6693253-security_warning.patch \ patches/openjdk/6444769-windowwithwarningtest.patch \ + patches/openjdk/6656651-windows_lcd_glyphs.patch \ patches/notice-safepoints.patch \ patches/parisc-opt.patch \ patches/lucene-crash.patch \ @@ -374,6 +455,7 @@ patches/gcc-suffix.patch \ patches/memory-limits.patch \ patches/libraries.patch \ + $(SPECIAL_SECURITY_PATCH_2) \ patches/jvmtiEnv.patch \ patches/lcms.patch \ patches/print_lsb_release.patch \ @@ -540,8 +622,6 @@ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ - patches/idresolver_fix.patch \ - patches/apache-xml-internal-fix-bug-38655.patch \ patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \ patches/openjdk/7088989-ucrypto_tests.patch \ patches/generalise_crypto_tests.patch \ @@ -563,18 +643,16 @@ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ patches/openjdk/8004341-jck_dialog_failure.patch \ patches/openjdk/8004341-jck_dialog_failure-02.patch \ patches/pr1319-support_giflib_5.patch \ - patches/openjdk/8007393.patch \ - patches/openjdk/8007611.patch \ patches/fix_get_stack_bounds_leak.patch \ patches/openjdk/7197906-handle_32_bit_shifts.patch \ patches/aarch64.patch \ patches/jaxws-tempfiles-ioutils-6.patch \ patches/object-factory-cl-internal.patch \ - patches/openjdk/8009530-icu_kern_table_support_broken.patch + patches/openjdk/8009530-icu_kern_table_support_broken.patch \ + patches/openjdk/7171223-strict_aliasing.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 36d69d052be1 -r a6de0621a57b NEWS --- a/NEWS Thu Apr 25 14:14:05 2013 +0100 +++ b/NEWS Wed Jun 26 15:10:59 2013 -0400 @@ -63,7 +63,7 @@ - S7133220: Additional patches to JAXP 1.4.5 update 1 for 7u4 (partial for S6657673) - S8009530: ICU Kern table support broken * Bug fixes - - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7197906) + - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7017193) - PR1362: Fedora 19 / rawhide FTBFS SIGILL - PR1338: Remove dependence on libXp - PR1339: Simplify the rhino class rewriter to avoid use of concurrency diff -r 36d69d052be1 -r a6de0621a57b patches/apache-xml-internal-fix-bug-38655.patch --- a/patches/apache-xml-internal-fix-bug-38655.patch Thu Apr 25 14:14:05 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -diff -u -r /jck/apache-xml/icedtea6/openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java security/c14n/implementations/NameSpaceSymbTable.java ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java 2011-11-14 23:11:46.000000000 +0100 -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java 2012-03-16 17:52:37.000000000 +0100 -@@ -370,6 +370,7 @@ - if (cur == null || (cur.equals( obj))) { - return index; - } -+ length=length-1; - do { - index=index==length? 0:++index; - cur = set[index]; diff -r 36d69d052be1 -r a6de0621a57b patches/ecj/needs-6.patch --- a/patches/ecj/needs-6.patch Thu Apr 25 14:14:05 2013 +0100 +++ b/patches/ecj/needs-6.patch Wed Jun 26 15:10:59 2013 -0400 @@ -22,3 +22,27 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 +diff -Nru openjdk-ecj.orig/jdk/make/javax/sound/Makefile openjdk-ecj/jdk/make/javax/sound/Makefile +--- openjdk-ecj.orig/jdk/make/javax/sound/Makefile 2013-06-24 00:00:22.031254425 +0100 ++++ openjdk-ecj/jdk/make/javax/sound/Makefile 2013-06-24 00:01:27.040288124 +0100 +@@ -28,6 +28,8 @@ + LIBRARY = jsound + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # include defines for sound + include SoundDefs.gmk +diff -Nru openjdk-ecj.orig/jdk/make/javax/management/Makefile openjdk-ecj/jdk/make/javax/management/Makefile +--- openjdk-ecj.orig/jdk/make/javax/management/Makefile 2011-11-14 22:11:40.000000000 +0000 ++++ openjdk-ecj/jdk/make/javax/management/Makefile 2013-06-24 00:40:59.742001431 +0100 +@@ -31,6 +31,8 @@ + PACKAGE = javax.management + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Files to compile diff -r 36d69d052be1 -r a6de0621a57b patches/idresolver_fix.patch --- a/patches/idresolver_fix.patch Thu Apr 25 14:14:05 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java 2012-03-20 20:29:30.000000000 +0100 -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java 2012-03-20 22:18:41.094309861 +0100 -@@ -26,6 +26,7 @@ - import org.w3c.dom.Attr; - import org.w3c.dom.Document; - import org.w3c.dom.Element; -+import org.w3c.dom.NamedNodeMap; - import org.w3c.dom.Node; - - import java.util.Arrays; -@@ -175,69 +176,124 @@ - return null; - } - -+ private static java.util.List names; -+ private static int namesLength; -+ static { -+ String namespaces[]={ -+ Constants.SignatureSpecNS, -+ EncryptionConstants.EncryptionSpecNS, -+ "http://schemas.xmlsoap.org/soap/security/2000-12", -+ "http://www.w3.org/2002/03/xkms#", -+ "urn:oasis:names:tc:SAML:1.0:assertion", -+ "urn:oasis:names:tc:SAML:1.0:protocol" -+ }; -+ names = Arrays.asList(namespaces); -+ namesLength = names.size(); -+ } - -- static java.util.List names; -- static { -- String namespaces[]={ Constants.SignatureSpecNS, -- EncryptionConstants.EncryptionSpecNS, -- "http://schemas.xmlsoap.org/soap/security/2000-12", -- "http://www.w3.org/2002/03/xkms#" -- }; -- names=Arrays.asList(namespaces); -- } - -+ private static Element getElementBySearching(Node root,String id) { -+ Element []els=new Element[namesLength + 1]; -+ getEl(root,id,els); -+ for (int i=0;i References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1490 --- Comment #2 from progserega --- I use 5990 (change system jar to downloaded josm 5990). It is started correctly. After start: 1. Menu->View-> Map Paint Styles -> Preferences 2. Select All available styles 3. add it's to active styles 4. Press OK Sigsegv: INFO: RemoteControl::Accepting connections on port 8111 GET http://osm.prim.drsk.ru/api/0.6/map?bbox=131.9626236,43.7683667,131.9945526,43.7829926 # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0xb7738b3f, pid=17260, tid=2407197504 # # JRE version: 6.0_24-b24 # Java VM: OpenJDK Client VM (20.0-b12 mixed mode linux-x86 ) # Derivative: IcedTea6 1.11.5 # Distribution: Built on Gentoo Base System release 2.0.3 (Thu Oct 18 22:10:38 CEST 2012) # Problematic frame: # C [libz.so.1+0xab3f] inflate+0x1ffb # # An error report file with more information is saved as: # /home/serega/hs_err_pid17260.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # zsh: abort LC_ALL=C josm -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/8e243c9e/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 21:30:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 04:30:37 +0000 Subject: [Bug 1490] crash on start josm In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1490 --- Comment #3 from progserega --- Created attachment 903 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=903&action=edit crash log josm 5990 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/69f747bb/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 8 23:46:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 06:46:06 +0000 Subject: [Bug 1490] crash on start josm In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1490 --- Comment #4 from Stefan Ring --- Comment on attachment 903 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=903 crash log josm 5990 Crashes in zlib are almost always a stack alignment issue. I'm not aware of anything in the ABI that mandates an aligned stack on i386 these days, but for some reason, the crashing function seems to expect it. Might be caused by build settings for zlib. I've seen a similar thing on Ubuntu, albeit with x86_64, which does mandate stack alignment. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/4f500901/attachment.html From xerxes at zafena.se Tue Jul 9 00:56:55 2013 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Tue, 09 Jul 2013 09:56:55 +0200 Subject: [patch] update the jamvm patch for at least 2.3.10 In-Reply-To: <2097065116.385391.1373271682781.JavaMail.root@redhat.com> References: <51D17CBE.6010209@ubuntu.com> <2097065116.385391.1373271682781.JavaMail.root@redhat.com> Message-ID: <51DBC247.5050508@zafena.se> 2013-07-08 10:21, Andrew Hughes skrev: > ----- Original Message ----- >> In the 2.3.10 release, the jamvm patch needs an update. Didn't check the >> other >> releases. Updated patch attached. >> >> Matthias >> >> > > Any idea why these changes are needed? > The remove-sun.misc.Perf-debug-code.patch was needed for use of OpenJDK 7 & 8 in combination with JamVM prior to 2012-12-28. The more recent JamVM versions have implemented a workaround: Robert's git commit explain: http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=e8dbdac844c3837f3f697e34dcf7b7c6506158ce "The OpenJDK 7 and OpenJDK 8 sources contain various calls to sun.misc.Perf for performance profiling of class-loading. Whether this is left-over debug code or is intentional is not clear. However, this causes JamVM to fail as it doesn't implement the native methods for sun.misc.Perf. IcedTea 7 contains a patch to remove these calls to enable JamVM to run. But this doesn't help when running with "vanilla" OpenJDK 8, which I'm using for the JSR 292 work (no IcedTea version for OpenJDK 8 exists, that I'm aware off). Hacking the sources to remove these calls everytime I get a new version is a huge pain-in-the-ass. So this is a dummy implementation, sufficient to get the sources to run without hacking them. Signed-off-by: Robert Lougher " 2013-07-01 15:22, Xerxes R?nby skrev:> 2013-07-01 14:57, Matthias Klose skrev: >> In the 2.3.10 release, the jamvm patch needs an update. Didn't check the other releases. Updated patch attached. >> >> Matthias >> > > Looks OK, > > We have one option and that is to update JamVM to match the version used in 2.4.*, > http://icedtea.classpath.org/hg/release/icedtea7-2.4/rev/933d082ec889 > if we update JamVM then we may drop this remove-sun.misc.Perf-debug-code.patch for the 2.3.10 branch as well. > Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Tue Jul 9 01:25:09 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 08:25:09 +0000 Subject: [Bug 1398] Current Minecraft (v 1.5.1) under current CentOS 6 and current OpenJDK crashes with backtrace In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1398 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se --- Comment #2 from Xerxes R?nby --- I suggest reporting this bug CentOS since they provide your OpenGL driver. The stack backtrack indicate that the crash happened early inside the initialization code for your OpenGL driver. Java -> Minecraft -> LWJGL -> CentOS (the provider of your OpenGL driver) -> crash When you report this bug to CentOS include the following information: 1: your opengl driver version and vendor (mesa, fglrx, nvidia etc) You can get this information by running and include all output from the glxinfo tool. glxinfo If glxinfo also crash then you have a broken OpenGL driver setup on your system, its quite common that people run into these kind of crashes if they have both free software Mesa OpenGL drivers and proprietary OpenGL drivers, like fglrx, installed on the same system. 2: the stack trace, indicating a crash in libxcb-glx.so xcb_glx_query_server_string_string_length Stack: [0x00007ff072b0d000,0x00007ff072c0e000], sp=0x00007ff072c0c4d8, free space=1021k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libxcb-glx.so.0+0xa240] xcb_glx_query_server_string_string_length+0x0 [error occurred during error reporting (printing native stack), id 0xb] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j org.lwjgl.opengl.LinuxDisplayPeerInfo.initDefaultPeerInfo(JILjava/nio/ByteBuffer;Lorg/lwjgl/opengl/PixelFormat;)V+0 j org.lwjgl.opengl.LinuxDisplayPeerInfo.(Lorg/lwjgl/opengl/PixelFormat;)V+24 j org.lwjgl.opengl.LinuxDisplay.createPeerInfo(Lorg/lwjgl/opengl/PixelFormat;)Lorg/lwjgl/opengl/PeerInfo;+6 j org.lwjgl.opengl.Display.create(Lorg/lwjgl/opengl/PixelFormat;Lorg/lwjgl/opengl/Drawable;Lorg/lwjgl/opengl/ContextAttribs;)V+55 j org.lwjgl.opengl.Display.create(Lorg/lwjgl/opengl/PixelFormat;)V+9 j net.minecraft.client.Minecraft.a()V+177 j avv.a()V+94 j net.minecraft.client.Minecraft.run()V+6 j java.lang.Thread.run()V+11 v ~StubRoutines::call_stub -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/c2e7acbc/attachment.html From gnu.andrew at redhat.com Tue Jul 9 08:09:09 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 9 Jul 2013 11:09:09 -0400 (EDT) Subject: [patch] update the jamvm patch for at least 2.3.10 In-Reply-To: <51DBC247.5050508@zafena.se> References: <51D17CBE.6010209@ubuntu.com> <2097065116.385391.1373271682781.JavaMail.root@redhat.com> <51DBC247.5050508@zafena.se> Message-ID: <828706596.1229483.1373382549376.JavaMail.root@redhat.com> ----- Original Message ----- > 2013-07-08 10:21, Andrew Hughes skrev: > > ----- Original Message ----- > >> In the 2.3.10 release, the jamvm patch needs an update. Didn't check the > >> other > >> releases. Updated patch attached. > >> > >> Matthias > >> > >> > > > > Any idea why these changes are needed? > > > > The remove-sun.misc.Perf-debug-code.patch was needed for use of OpenJDK 7 & 8 > in combination with JamVM prior to 2012-12-28. > The more recent JamVM versions have implemented a workaround: > Robert's git commit explain: > > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=e8dbdac844c3837f3f697e34dcf7b7c6506158ce > "The OpenJDK 7 and OpenJDK 8 sources contain various calls to sun.misc.Perf > for performance profiling of class-loading. > Whether this is left-over debug code or is intentional is not clear. > > However, this causes JamVM to fail as it doesn't implement the native methods > for sun.misc.Perf. > IcedTea 7 contains a patch to remove these calls to enable JamVM to run. > But this doesn't help when running with "vanilla" OpenJDK 8, which I'm using > for the JSR 292 work (no IcedTea version for OpenJDK 8 exists, that I'm > aware off). > > Hacking the sources to remove these calls everytime I get a new version is a > huge pain-in-the-ass. > So this is a dummy implementation, sufficient to get the sources to run > without hacking them. > Signed-off-by: Robert Lougher " > > > 2013-07-01 15:22, Xerxes R?nby skrev:> 2013-07-01 14:57, Matthias Klose > skrev: > >> In the 2.3.10 release, the jamvm patch needs an update. Didn't check the > >> other releases. Updated patch attached. > >> > >> Matthias > >> > > > > Looks OK, > > > > We have one option and that is to update JamVM to match the version used in > > 2.4.*, > > http://icedtea.classpath.org/hg/release/icedtea7-2.4/rev/933d082ec889 > > if we update JamVM then we may drop this > > remove-sun.misc.Perf-debug-code.patch for the 2.3.10 branch as well. > > > > Cheers > Xerxes > But we're talking about JamVM as it already stood on the 2.3.x branch. It hasn't changed and we don't change it between release branches. So there must be something in the security patches that caused this. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Tue Jul 9 08:23:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 15:23:06 +0000 Subject: [Bug 1487] com.sun.xml.messaging.saaj issues in latest release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1487 --- Comment #4 from Andrew John Hughes --- We don't release the forest, so I don't see how a "forest component" would make any sense. As I understand it, the general norm for all distribution packages is for issues to first be raised with the distributor and then directed upstream as necessary. Packagers usually know far better than upstream how the build was configured and any local patches that may have been applied. Things really aren't any different with IcedTea from any other distribution package. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/9664742c/attachment.html From andrew at icedtea.classpath.org Tue Jul 9 08:29:22 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 09 Jul 2013 15:29:22 +0000 Subject: /hg/release/icedtea6-1.11: Remove unused patches and those which... Message-ID: changeset 49e2fd0a8dfd in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=49e2fd0a8dfd author: Andrew John Hughes date: Tue Jul 09 16:29:08 2013 +0100 Remove unused patches and those which need more testing in HEAD. 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * Makefile.am: (ICEDTEA_PATCHES): Remove patches which need more testing before release. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. diffstat: ChangeLog | 52 +- Makefile.am | 28 +- patches/ecj/ant.patch | 20 - patches/ecj/override.patch | 11 - patches/openjdk/6990754-handle_renames.patch | 925 - patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18949 ---------- patches/openjdk/7008809-report_class_in_arraystoreexception.patch | 189 - patches/openjdk/7014851-unused_parallel_compaction_code.patch | 810 - patches/openjdk/7017732-move_static_fields_to_class.patch | 3079 - patches/openjdk/7036747-elfstringtable.patch | 130 - patches/openjdk/7086585-flexible_field_injection.patch | 3424 - patches/openjdk/7188114-alternate_command_line_parser.patch | 611 - patches/openjdk/7199143-OCSP_timeout.patch | 53 - patches/openjdk/8002070-remove_logger_stack_search.patch | 152 - patches/openjdk/8002070-remove_logger_stack_search_2.patch | 546 - patches/openjdk/8006120-server_jre.patch | 60 - patches/openjdk/8006536-remove_trailing_slashes.patch | 43 - patches/openjdk/8009463-space_and_final_backslash.patch | 33 - patches/openjdk/8010118-caller_sensitive.patch | 2950 - patches/openjdk/8010213-set_socketoptions_windows.patch | 29 - patches/openjdk/8011139-revise_checking_getenclosingclass.patch | 58 - patches/openjdk/8011154-awt_regression.patch | 20 + patches/openjdk/8011154-awt_regresssion.patch | 20 - patches/openjdk/8011313-OCSP_timeout_wrong_value.patch | 31 - patches/openjdk/8011990-logger_test_urls.patch | 55 - patches/openjdk/8012243-serial_regression.patch | 42 - patches/openjdk/8013380-handle_renames.patch | 107 - patches/openjdk/8013380-logger_stack_walk_glassfish.patch | 936 - patches/openjdk/8014205-blank_swing_dialogs_windows.patch | 146 - patches/openjdk/8014427-raster_regression.patch | 20 + patches/openjdk/8014427-raster_regresssion.patch | 20 - patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch | 149 - patches/openjdk/8014676-javadebugger_space_in_paths.patch | 32 - patches/openjdk/8014745-logger_stack_walk_switch.patch | 199 - patches/openjdk/8014968-OCSP_timeout_default.patch | 19 - patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 743 - patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 39 +- patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 - patches/security/20130618/8001330-checking_order_improvement.patch | 37 +- patches/security/20130618/hs_merge-01.patch | 284 - patches/security/20130618/hs_merge-02.patch | 155 - patches/security/20130618/hs_merge-03.patch | 18 - patches/security/20130618/hs_merge-04.patch | 44 - patches/sparc.patch | 1808 - 44 files changed, 149 insertions(+), 37427 deletions(-) diffs (truncated from 37891 to 500 lines): diff -r d146c22f9e46 -r 49e2fd0a8dfd ChangeLog --- a/ChangeLog Wed Jul 03 23:28:46 2013 -0400 +++ b/ChangeLog Tue Jul 09 16:29:08 2013 +0100 @@ -1,3 +1,51 @@ +2013-07-09 Andrew John Hughes + + * patches/ecj/ant.patch, + * patches/openjdk/6990754-handle_renames.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, + * patches/security/20130618/8001330-checking_order_improvement-it6.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/sparc.patch: + Remove unused patches. + * Makefile.am: + (ICEDTEA_PATCHES): Remove patches which need more testing before + release. + * patches/ecj/override.patch: Drop recent addition. In accordance with + PR1397, we should avoid extending this patch in favour of either not + including @Override additions or setting source/target correctly. + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch: + Replace with Chris' patches, regenerated as unified diffs. + 2013-07-03 Omair Majid * patches/openjdk/6541350-tz_display_names_l10n.patch, @@ -63,7 +111,9 @@ * NEWS: Update with backports. 2013-06-26 Chris Phillips - * Makefile.am (SECURITY_PATCHES): Drop + + * Makefile.am: + (SECURITY_PATCHES): Drop patches/security/20130618/7158805-nested_subroutine_rewriting.patch patches/security/20130618/8001330-checking_order_improvement.patch patches/openjdk/7036747-elfstringtable.patch diff -r d146c22f9e46 -r 49e2fd0a8dfd Makefile.am --- a/Makefile.am Wed Jul 03 23:28:46 2013 -0400 +++ b/Makefile.am Tue Jul 09 16:29:08 2013 +0100 @@ -377,8 +377,8 @@ patches/security/20130618/diamond_fix.patch \ patches/security/20130618/handle_npe.patch \ patches/security/20130618/javac_issue.patch \ - patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ - patches/security/20130618/8001330-checking_order_improvement-it6.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting.patch \ + patches/security/20130618/8001330-checking_order_improvement.patch \ patches/security/20130618/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ @@ -620,40 +620,20 @@ patches/object-factory-cl-internal.patch \ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ patches/openjdk/7171223-strict_aliasing.patch \ - patches/openjdk/7188114-alternate_command_line_parser.patch \ - patches/openjdk/7199143-OCSP_timeout.patch \ - patches/openjdk/8006120-server_jre.patch \ - patches/openjdk/8006536-remove_trailing_slashes.patch \ patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \ patches/openjdk/8009217-fix_test_compile.patch \ - patches/openjdk/8009463-space_and_final_backslash.patch \ patches/openjdk/8009610-blacklist_malware_certificate.patch \ - patches/openjdk/8010213-set_socketoptions_windows.patch \ patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \ - patches/openjdk/8011154-awt_regresssion.patch \ - patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \ + patches/openjdk/8011154-awt_regression.patch \ patches/openjdk/8011992-MlibOpsTest_failed.patch \ patches/openjdk/8012112-MlibOpsTest_fails.patch \ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ patches/openjdk/8012933-appcontext_disposed_too_early.patch \ patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ - patches/openjdk/8014205-blank_swing_dialogs_windows.patch \ - patches/openjdk/8014427-raster_regresssion.patch \ - patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch \ - patches/openjdk/8014676-javadebugger_space_in_paths.patch \ - patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/8002070-remove_logger_stack_search.patch \ - patches/openjdk/8002070-remove_logger_stack_search_2.patch \ - patches/openjdk/8010118-caller_sensitive.patch \ + patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8010727-empty_logger_name.patch \ patches/openjdk/8010939-logmanager_deadlock.patch \ - patches/openjdk/8011990-logger_test_urls.patch \ - patches/openjdk/8013380-logger_stack_walk_glassfish.patch \ - patches/openjdk/8013380-handle_renames.patch \ - patches/openjdk/8014745-logger_stack_walk_switch.patch \ - patches/openjdk/8012243-serial_regression.patch \ patches/openjdk/8014718-remove_logging_suntoolkit.patch \ - patches/openjdk/8011139-revise_checking_getenclosingclass.patch \ patches/openjdk/8009996-emitter_bean.patch \ patches/openjdk/6541350-tz_display_names_l10n.patch \ patches/openjdk/6821191-tz_display_names_l10n.patch \ diff -r d146c22f9e46 -r 49e2fd0a8dfd patches/ecj/ant.patch --- a/patches/ecj/ant.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500 -@@ -80,6 +80,7 @@ - endif - - ifdef ALT_BOOTDIR -+ ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - endif - ---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500 -@@ -109,6 +109,7 @@ - memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}" - excludes="com/sun/tools/internal/txw2/**"> -+ - - - diff -r d146c22f9e46 -r 49e2fd0a8dfd patches/ecj/override.patch --- a/patches/ecj/override.patch Wed Jul 03 23:28:46 2013 -0400 +++ b/patches/ecj/override.patch Tue Jul 09 16:29:08 2013 +0100 @@ -310,14 +310,3 @@ public final void close() { open = false; synchronized (AbstractMidiDevice.this.traRecLock) { -diff -ruN openjdk-ecj.orig/jdk/src/share/classes/java/awt/image/BufferedImage.java openjdk-ecj/jdk/src/share/classes/java/awt/image/BufferedImage.java ---- openjdk-ecj.orig/jdk/src/share/classes/java/awt/image/BufferedImage.java 2013-07-01 13:03:32.946070591 -0400 -+++ openjdk-ecj/jdk/src/share/classes/java/awt/image/BufferedImage.java 2013-07-01 13:33:55.905426035 -0400 -@@ -810,7 +810,6 @@ - new PrivilegedAction() - { - -- @Override - public Boolean run() { - final ClassLoader std = System.class.getClassLoader(); - diff -r d146c22f9e46 -r 49e2fd0a8dfd patches/openjdk/6990754-handle_renames.patch --- a/patches/openjdk/6990754-handle_renames.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,925 +0,0 @@ -This handles the rename bits of the original 6990754 -diff -ruN openjdk.orig/hotspot/src/share/vm/oops/symbol.cpp openjdk/hotspot/src/share/vm/oops/symbol.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/symbol.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/hotspot/src/share/vm/oops/symbol.cpp 2013-06-25 14:49:37.268431428 -0400 -@@ -0,0 +1,231 @@ -+/* -+ * Copyright (c) 1997, 2009, 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. -+ * -+ * 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. -+ * -+ */ -+ -+ -+#include "precompiled.hpp" -+#include "oops/oop.inline.hpp" -+#include "oops/symbol.hpp" -+#include "runtime/os.hpp" -+#include "memory/allocation.inline.hpp" -+ -+Symbol::Symbol(const u1* name, int length) : _refcount(0), _length(length) { -+ _identity_hash = os::random(); -+ for (int i = 0; i < _length; i++) { -+ byte_at_put(i, name[i]); -+ } -+} -+ -+void* Symbol::operator new(size_t size, int len) { -+ return (void *) AllocateHeap(object_size(len) * HeapWordSize, "symbol"); -+} -+ -+// ------------------------------------------------------------------ -+// Symbol::equals -+// -+// Compares the symbol with a string of the given length. -+bool Symbol::equals(const char* str, int len) const { -+ int l = utf8_length(); -+ if (l != len) return false; -+ while (l-- > 0) { -+ if (str[l] != (char) byte_at(l)) -+ return false; -+ } -+ assert(l == -1, "we should be at the beginning"); -+ return true; -+} -+ -+ -+// ------------------------------------------------------------------ -+// Symbol::starts_with -+// -+// Tests if the symbol starts with the specified prefix of the given -+// length. -+bool Symbol::starts_with(const char* prefix, int len) const { -+ if (len > utf8_length()) return false; -+ while (len-- > 0) { -+ if (prefix[len] != (char) byte_at(len)) -+ return false; -+ } -+ assert(len == -1, "we should be at the beginning"); -+ return true; -+} -+ -+ -+// ------------------------------------------------------------------ -+// Symbol::index_of -+// -+// Finds if the given string is a substring of this symbol's utf8 bytes. -+// Return -1 on failure. Otherwise return the first index where str occurs. -+int Symbol::index_of_at(int i, const char* str, int len) const { -+ assert(i >= 0 && i <= utf8_length(), "oob"); -+ if (len <= 0) return 0; -+ char first_char = str[0]; -+ address bytes = (address) ((Symbol*)this)->base(); -+ address limit = bytes + utf8_length() - len; // inclusive limit -+ address scan = bytes + i; -+ if (scan > limit) -+ return -1; -+ for (;;) { -+ scan = (address) memchr(scan, first_char, (limit + 1 - scan)); -+ if (scan == NULL) -+ return -1; // not found -+ assert(scan >= bytes+i && scan <= limit, "scan oob"); -+ if (memcmp(scan, str, len) == 0) -+ return (int)(scan - bytes); -+ } -+} -+ -+ -+char* Symbol::as_C_string(char* buf, int size) const { -+ if (size > 0) { -+ int len = MIN2(size - 1, utf8_length()); -+ for (int i = 0; i < len; i++) { -+ buf[i] = byte_at(i); -+ } -+ buf[len] = '\0'; -+ } -+ return buf; -+} -+ -+char* Symbol::as_C_string() const { -+ int len = utf8_length(); -+ char* str = NEW_RESOURCE_ARRAY(char, len + 1); -+ return as_C_string(str, len + 1); -+} -+ -+char* Symbol::as_C_string_flexible_buffer(Thread* t, -+ char* buf, int size) const { -+ char* str; -+ int len = utf8_length(); -+ int buf_len = len + 1; -+ if (size < buf_len) { -+ str = NEW_RESOURCE_ARRAY(char, buf_len); -+ } else { -+ str = buf; -+ } -+ return as_C_string(str, buf_len); -+} -+ -+void Symbol::print_symbol_on(outputStream* st) const { -+ st = st ? st : tty; -+ int length = UTF8::unicode_length((const char*)bytes(), utf8_length()); -+ const char *ptr = (const char *)bytes(); -+ jchar value; -+ for (int index = 0; index < length; index++) { -+ ptr = UTF8::next(ptr, &value); -+ if (value >= 32 && value < 127 || value == '\'' || value == '\\') { -+ st->put(value); -+ } else { -+ st->print("\\u%04x", value); -+ } -+ } -+} -+ -+jchar* Symbol::as_unicode(int& length) const { -+ Symbol* this_ptr = (Symbol*)this; -+ length = UTF8::unicode_length((char*)this_ptr->bytes(), utf8_length()); -+ jchar* result = NEW_RESOURCE_ARRAY(jchar, length); -+ if (length > 0) { -+ UTF8::convert_to_unicode((char*)this_ptr->bytes(), result, length); -+ } -+ return result; -+} -+ -+const char* Symbol::as_klass_external_name(char* buf, int size) const { -+ if (size > 0) { -+ char* str = as_C_string(buf, size); -+ int length = (int)strlen(str); -+ // Turn all '/'s into '.'s (also for array klasses) -+ for (int index = 0; index < length; index++) { -+ if (str[index] == '/') { -+ str[index] = '.'; -+ } -+ } -+ return str; -+ } else { -+ return buf; -+ } -+} -+ -+const char* Symbol::as_klass_external_name() const { -+ char* str = as_C_string(); -+ int length = (int)strlen(str); -+ // Turn all '/'s into '.'s (also for array klasses) -+ for (int index = 0; index < length; index++) { -+ if (str[index] == '/') { -+ str[index] = '.'; -+ } -+ } -+ return str; -+} -+ -+ -+void Symbol::print_on(outputStream* st) const { -+ if (this == NULL) { -+ st->print_cr("NULL"); -+ } else { -+ st->print("Symbol: '"); -+ print_symbol_on(st); -+ st->print("'"); -+ st->print(" count %d", refcount()); -+ } -+} -+ -+// The print_value functions are present in all builds, to support the -+// disassembler and error reporting. -+void Symbol::print_value_on(outputStream* st) const { -+ if (this == NULL) { -+ st->print("NULL"); -+ } else { -+ st->print("'"); -+ for (int i = 0; i < utf8_length(); i++) { -+ st->print("%c", byte_at(i)); -+ } -+ st->print("'"); -+ } -+} -+ -+void Symbol::increment_refcount() { -+ // Only increment the refcount if positive. If negative either -+ // overflow has occurred or it is a permanent symbol in a read only -+ // shared archive. -+ if (_refcount >= 0) { -+ Atomic::inc(&_refcount); -+ NOT_PRODUCT(Atomic::inc(&_total_count);) -+ } -+} -+ -+void Symbol::decrement_refcount() { -+ if (_refcount >= 0) { -+ Atomic::dec(&_refcount); -+#ifdef ASSERT -+ if (_refcount < 0) { -+ print(); -+ assert(false, "reference count underflow for symbol"); -+ } -+#endif -+ } -+} -+ -+NOT_PRODUCT(int Symbol::_total_count = 0;) -diff -ruN openjdk.orig/hotspot/src/share/vm/oops/symbol.hpp openjdk/hotspot/src/share/vm/oops/symbol.hpp ---- openjdk.orig/hotspot/src/share/vm/oops/symbol.hpp 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/hotspot/src/share/vm/oops/symbol.hpp 2013-06-25 14:49:37.269431439 -0400 -@@ -0,0 +1,223 @@ -+/* -+ * Copyright (c) 1997, 2009, 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. -+ * -+ * 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. -+ * -+ */ -+ -+#ifndef SHARE_VM_OOPS_SYMBOL_HPP -+#define SHARE_VM_OOPS_SYMBOL_HPP -+ -+#include "utilities/utf8.hpp" -+#include "memory/allocation.hpp" -+ -+// A Symbol is a canonicalized string. -+// All Symbols reside in global SymbolTable and are reference counted. -+ -+// Reference counting -+// -+// All Symbols are allocated and added to the SymbolTable. -+// When a class is unloaded, the reference counts of the Symbol pointers in -+// the ConstantPool and in instanceKlass (see release_C_heap_structures) are -+// decremented. When the reference count for a Symbol goes to 0, the garbage -+// collector can free the Symbol and remove it from the SymbolTable. -+// -+// 0) Symbols need to be reference counted when a pointer to the Symbol is -+// saved in persistent storage. This does not include the pointer -+// in the SymbolTable bucket (the _literal field in HashtableEntry) -+// that points to the Symbol. All other stores of a Symbol* -+// to a field of a persistent variable (e.g., the _name filed in -+// FieldAccessInfo or _ptr in a CPSlot) is reference counted. -+// -+// 1) The lookup of a "name" in the SymbolTable either creates a Symbol F for -+// "name" and returns a pointer to F or finds a pre-existing Symbol F for -+// "name" and returns a pointer to it. In both cases the reference count for F -+// is incremented under the assumption that a pointer to F will be created from -+// the return value. Thus the increment of the reference count is on the lookup -+// and not on the assignment to the new Symbol*. That is -+// Symbol* G = lookup() -+// ^ increment on lookup() -+// and not -+// Symbol* G = lookup() -+// ^ increment on assignmnet -+// The reference count must be decremented manually when the copy of the -+// pointer G is destroyed. -+// -+// 2) For a local Symbol* A that is a copy of an existing Symbol* B, the -+// reference counting is elided when the scope of B is greater than the scope -+// of A. For example, in the code fragment -+// below "klass" is passed as a parameter to the method. Symbol* "kn" -+// is a copy of the name in "klass". -+// -+// Symbol* kn = klass->name(); -+// unsigned int d_hash = dictionary()->compute_hash(kn, class_loader); -+// -+// The scope of "klass" is greater than the scope of "kn" so the reference -+// counting for "kn" is elided. -+// -+// Symbol* copied from ConstantPool entries are good candidates for reference -+// counting elision. The ConstantPool entries for a class C exist until C is -+// unloaded. If a Symbol* is copied out of the ConstantPool into Symbol* X, -+// the Symbol* in the ConstantPool will in general out live X so the reference -+// counting on X can be elided. -+// -+// For cases where the scope of A is not greater than the scope of B, -+// the reference counting is explicitly done. See ciSymbol, -+// ResolutionErrorEntry and ClassVerifier for examples. -+// -+// 3) When a Symbol K is created for temporary use, generally for substrings of -+// an existing symbol or to create a new symbol, assign it to a -+// TempNewSymbol. The SymbolTable methods new_symbol(), lookup() -+// and probe() all potentially return a pointer to a new Symbol. -+// The allocation (or lookup) of K increments the reference count for K -+// and the destructor decrements the reference count. -+// From bugzilla-daemon at icedtea.classpath.org Tue Jul 9 08:29:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 15:29:30 +0000 Subject: [Bug 1397] [IcedTea6] Remove needed for override patch by building source/target 6 throughout In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1397 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.11?cmd=changeset;node=49e2fd0a8dfd author: Andrew John Hughes date: Tue Jul 09 16:29:08 2013 +0100 Remove unused patches and those which need more testing in HEAD. 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * Makefile.am: (ICEDTEA_PATCHES): Remove patches which need more testing before release. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/3913675f/attachment.html From aazores at redhat.com Tue Jul 9 08:46:30 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 09 Jul 2013 11:46:30 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DAD6BB.5080500@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> Message-ID: <51DC3056.1070006@redhat.com> Changelog: * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, added new stamp to create HTML for AboutDialog * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of extras into netx and renamed from Main. New Swing layout and uses HTML files generated in Makefile. * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras into netx. Added ability to click hyperlinks. * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, getJNLPFile, itwInfoMessage): changed way of launching About dialog to using new static display method rather than JNLP launch. Removed methods relating to JNLP launch. More informative and nicely formatted -headless information. * netx/net/sourceforge/jnlp/resources/Messages.properties (BAboutITW, BFileInfoAuthors, BFileInfoCopying, BFileInfoNews): added new messages for javaws -about -headless launch * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras into netx. Added more content, changed formatting. * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer needed * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for About dialog. Modified version of javaws_splash.png * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of extras into netx * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx * extra/net/sourceforge/javaws/about/Main.java: same * extra/net/sourceforge/javaws/about/resources/about.html: same * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same * extra/net/sourceforge/javaws/about/resources/applications.html: removed * extra/net/sourceforge/javaws/about/resources/notes.html: removed On 07/08/2013 11:11 AM, Jiri Vanek wrote: > Looks excellent! Two minor nits - I would like to have icedtea-web > homepage url and removed license header (sorry) in headless about > and.. see general comments below Okay, fixed. > This looks like it is not here (or is not working). The - public > static void centerWindowsToCurrentScreen(Window w) { from > net.sourceforge.jnlp.util.ScreenFinder should do the trick. Thanks, using that call now. > A bit?? You are quite powerful make/sed/bash magican. Feature will > prove how bullet proof this code is ;) > You have included some comments, and it is really *appreciated* . > Maybe even more comments will be nice (eg split the greate regex on > start of target [to several lines with individual comments?]?) :) thank you. Added more comments. Hopefully anyone who needs to maintain this in the future knows sed and regexes... > Still several general comments: > - drop license header in headless mode. It does not looks nice. Sorry:( > - the mentioning of COPYING file is more then enough > - add icedtea-web homepage url in headless about. > - you have duplicated the splash image. Tats wrong :) But as you did > it, I would recomand to shrink it (so the source iamge have the same > size as result image), fill Iced (by some iced-blue) and make web more > dark - visible) > - my $0.002 +1 for having it a bit bigger then now O:) > - please update changelog for next round I think all of this is handled now. > > - several tests is depending on about.jar or other affected stuff You > will have to fix those:( > - see: grep about -ir tests/ > tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: > testResourceCaching("net/sourceforge/jnlp/about/Main.class"); > tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: > testResourceCaching("net/sourceforge/jnlp/about/Main.class"); > tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: > testResourceCaching("net/sourceforge/jnlp/about/resources/about.html"); > tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: > testResourceCaching("net/sourceforge/jnlp/about/resources/about.html"); > tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: > testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); > tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: > testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); > > ^^ Here and here ?? you will have to create soem jar via jar and javac > api. > > tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFile.java: > JAR_URL = new URL("http://icedtea.classpath.org/netx/about.jar"); > tests/test-extensions/net/sourceforge/jnlp/ContentReader.java: > //mostly compaling when assassin kill the process about StreamClosed > > tests/reproducers/simple/LocalesTest/testcases/LocalesTestTest.java: > "BOAbout", > > Thsi one expects the BOAbout to be printed, but it looks like you have > dropped this "ssentence" We talked about this on IRC but these tests actually are not affected by these changes because they download an old version of about.jar from the Internet anyway. -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 14733 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/cd86e282/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: last.patch Type: text/x-patch Size: 14558 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/cd86e282/last.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Makefile.am.patch Type: text/x-patch Size: 8928 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/cd86e282/Makefile.am.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: resources.patch Type: text/x-patch Size: 9607 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/cd86e282/resources.patch From aazores at redhat.com Tue Jul 9 09:23:12 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 09 Jul 2013 12:23:12 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DC3056.1070006@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> Message-ID: <51DC38F0.5060505@redhat.com> On 07/09/2013 11:46 AM, Andrew Azores wrote: > Changelog: > * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, > added new stamp to create HTML for AboutDialog > * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of > extras into netx and renamed from Main. New Swing layout and uses HTML > files generated in Makefile. > * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras > into netx. Added ability to click hyperlinks. > * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, > getJNLPFile, itwInfoMessage): changed way of launching About dialog to > using new static display method rather than JNLP launch. Removed > methods relating to JNLP launch. More informative and nicely formatted > -headless information. > > * netx/net/sourceforge/jnlp/resources/Messages.properties (BAboutITW, > BFileInfoAuthors, BFileInfoCopying, BFileInfoNews): added new messages > for javaws -about -headless launch > * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras > into netx. Added more content, changed formatting. > * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer > needed > * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for > About dialog. Modified version of javaws_splash.png > * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of extras > into netx > > * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx > * extra/net/sourceforge/javaws/about/Main.java: same > * extra/net/sourceforge/javaws/about/resources/about.html: same > * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same > * extra/net/sourceforge/javaws/about/resources/applications.html: removed > * extra/net/sourceforge/javaws/about/resources/notes.html: removed And here is the new itw_logo.png. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: itw_logo.png Type: image/png Size: 2191 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/1b96a940/itw_logo.png From aazores at redhat.com Tue Jul 9 10:28:01 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 09 Jul 2013 13:28:01 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DC38F0.5060505@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> Message-ID: <51DC4821.2070804@redhat.com> On 07/09/2013 12:23 PM, Andrew Azores wrote: > On 07/09/2013 11:46 AM, Andrew Azores wrote: >> Changelog: >> * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, >> added new stamp to create HTML for AboutDialog >> * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of >> extras into netx and renamed from Main. New Swing layout and uses >> HTML files generated in Makefile. >> * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras >> into netx. Added ability to click hyperlinks. >> * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, >> getJNLPFile, itwInfoMessage): changed way of launching About dialog >> to using new static display method rather than JNLP launch. Removed >> methods relating to JNLP launch. More informative and nicely >> formatted -headless information. >> >> * netx/net/sourceforge/jnlp/resources/Messages.properties (BAboutITW, >> BFileInfoAuthors, BFileInfoCopying, BFileInfoNews): added new >> messages for javaws -about -headless launch >> * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras >> into netx. Added more content, changed formatting. >> * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer >> needed >> * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for >> About dialog. Modified version of javaws_splash.png >> * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of >> extras into netx >> >> * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx >> * extra/net/sourceforge/javaws/about/Main.java: same >> * extra/net/sourceforge/javaws/about/resources/about.html: same >> * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same >> * extra/net/sourceforge/javaws/about/resources/applications.html: >> removed >> * extra/net/sourceforge/javaws/about/resources/notes.html: removed > > And here is the new itw_logo.png. > > Andrew A > Updated patches so that the button labels in the AboutDialog are localized. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 14808 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/2559823c/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: resources.patch Type: text/x-patch Size: 9801 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/2559823c/resources.patch From aazores at redhat.com Tue Jul 9 10:43:59 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 9 Jul 2013 13:43:59 -0400 (EDT) Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 In-Reply-To: <51C9F3C1.8070307@redhat.com> References: <51C9F3C1.8070307@redhat.com> Message-ID: <126697207.1316729.1373391839141.JavaMail.root@redhat.com> Ping - any takers to review this one? :) Andrew A ----- Original Message ----- From: "Andrew Azores" To: distro-pkg-dev at openjdk.java.net Sent: Tuesday, June 25, 2013 3:47:13 PM Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 Changelog: * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, getResources): Constructor stores list of JNLP extensions, getResources returns this list * tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java: tests browser launch of HTML file with embedded JNLP applet referencing extension JNLP * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html: same * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp: same * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same PluginBridge had null parserSettings, which caused a NPE in JNLPFile parse() method later on. I wasn't sure if there was a particular reason why the PluginBridge constructor never called super(), so instead it instantiates a new ParserSettings on its own, with default values. The constructor also stores a list of extension JNLP files, which are then returned later when getResources is called with the param ExtensionDesc.class. The reproducer tests set up a scenario as described in the original bug report; one HTML file which uses jnlp_href tag. This JNLP file has another JNLP file as an extension. Each of these JNLP files references one JAR. One of these JARs contains a helper class which is referenced by a class in the other JAR. Previously this scenario would result in a NoClassDefFoundError for the helper class when a browser was used to load the HTML, although using javaws to launch the JNLP directly worked fine. Thanks, Andrew A From bugzilla-daemon at icedtea.classpath.org Tue Jul 9 14:17:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 21:17:58 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 --- Comment #1 from Deepak Bhole --- Do older versions of the plugin work? Also, does FreeBSD support FIFO pipes? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/810ba989/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jul 9 14:48:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 21:48:25 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Jung-uk Kim changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jkim at FreeBSD.org --- Comment #2 from Jung-uk Kim --- (In reply to comment #1) > Do older versions of the plugin work? Yes, it does. FYI, I am de facto maintainer of the FreeBSD port: http://www.freshports.org/java/icedtea-web/ http://svnweb.freebsd.org/ports/head/java/icedtea-web/ These are our local patches: http://svnweb.freebsd.org/ports/head/java/icedtea-web/files/ In fact, I'm patiently waiting for a new release with this patch: http://icedtea.classpath.org/hg/icedtea-web/rev/2469bedc6d63 If you think it's going to take a while for some odd reason, I have no choice but to add it to collection of our local patches. > Also, does FreeBSD support FIFO pipes? Yes, of course. mkfifo(2) is a POSIX.1 system call. ;-) Jung-uk Kim -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/eaf6e25d/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jul 9 14:55:53 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 09 Jul 2013 21:55:53 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jvanek at redhat.com --- Comment #3 from Deepak Bhole --- Ah okay. The reason I asked about FIFO is because of this: /usr/ports/java/icedtea-web/work/icedtea-web-1.4/plugin/icedteanp/IcedTeaNPPlugin.cc:1029: thread 0x80f9cf430: Error: Failed to read line from input channel You said you are waiting for http://icedtea.classpath.org/hg/icedtea-web/rev/2469bedc6d63 -- but that does not solve this problem, right? I was not aware that it had not gone into a release yet. Jiri, wdyt about doing a 1.4.x release with the above fix soon? It would be nice to have it in a supported release. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130709/8fc5aa04/attachment.html From omajid at icedtea.classpath.org Tue Jul 9 16:25:46 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 09 Jul 2013 23:25:46 +0000 Subject: /hg/icedtea6: 6 new changesets Message-ID: changeset 809bd0fb849e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=809bd0fb849e author: Andrew John Hughes date: Tue Jul 09 12:43:05 2013 -0400 2013/06/18 Security Patches 2013-07-09 Omair Majid * hotspot.map: Update to latest hs23. * Makefile.am (ICEDTEA_PATCHES): Make hotspot-specific patches conditional. 2013-06-22 Andrew John Hughes * patches/idresolver_fix.patch: Removed. Part of 6469266. * patches/apache-xml-internal-fix-bug-38655.patch: Removed. Part of 6469266. * Makefile.am: (SECURITY_PATCHES): Add new ones. (SPECIAL_SECURITY_PATCH_1): Renamed from SPECIAL_SECURITY_PATCH. (SPECIAL_SECURITY_PATCH_2): Add 8009071, which needs to be applied after some AWT backports. (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES as must be applied before 8004584. Add 7171223 to end. * patches/openjdk/6307603-xrender-01.patch, * patches/openjdk/6469266-xmlsec_1.4.2.patch, * patches/openjdk/6656651-windows_lcd_glyphs.patch, * patches/openjdk/6786028-wcag_bold_tags.patch, * patches/openjdk/6786682-wcag_lang.patch, * patches/openjdk/6786688-wcag_table.patch, * patches/openjdk/6786690-wcag_dl.patch, * patches/openjdk/6802694-no_deprecated.patch, * patches/openjdk/6851834-restructure.patch, * patches/openjdk/6888167-medialib_memory_leaks.patch, * patches/openjdk/6961178-doclet_xml.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7006270-regressions.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7171223-strict_aliasing.patch, * patches/openjdk/7195301-no_instanceof_node.patch, * patches/security/20130618/6741606-apache_santuario.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/7170730-windows_network_stack.patch, * patches/security/20130618/8000638-improve_deserialization.patch, * patches/security/20130618/8000642-better_transportation_handling.patch, * patches/security/20130618/8001032-restrict_object_access-corba.patch, * patches/security/20130618/8001032-restrict_object_access-jdk.patch, * patches/security/20130618/8001033-refactor_address_handling.patch, * patches/security/20130618/8001034-memory_management.patch, * patches/security/20130618/8001038-resourcefully_handle_resources.patch, * patches/security/20130618/8001043-clarify_definition_restrictions.patch, * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, * patches/security/20130618/8001318-6_fixup.patch, * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, * patches/security/20130618/8001330-checking_order_improvement.patch, * patches/security/20130618/8001330-improve_checking_order.patch, * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, * patches/security/20130618/8004584-augment_applet_contextualization.patch, * patches/security/20130618/8005007-better_glyph_processing.patch, * patches/security/20130618/8006328-6_fixup.patch, * patches/security/20130618/8006328-sound_class_robustness.patch, * patches/security/20130618/8006611-improve_scripting.patch, * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, * patches/security/20130618/8007471-6_fixup.patch, * patches/security/20130618/8007471-improve_mbean_notifications.patch, * patches/security/20130618/8007812-getenclosingmethod.patch, * patches/security/20130618/8008120-improve_jmx_class_checking.patch, * patches/security/20130618/8008124-better_compliance_testing.patch, * patches/security/20130618/8008128-better_jmx_api_coherence.patch, * patches/security/20130618/8008132-better_serialization.patch, * patches/security/20130618/8008585-jmx_data_handling.patch, * patches/security/20130618/8008593-better_urlclassloader.patch, * patches/security/20130618/8008603-jmx_provider_provision.patch, * patches/security/20130618/8008611-6_fixup.patch, * patches/security/20130618/8008611-jmx_annotations.patch, * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, * patches/security/20130618/8008623-mbeanserver_handling.patch, * patches/security/20130618/8008744-6741606_rework.patch, * patches/security/20130618/8008982-jmx_interface_changes.patch, * patches/security/20130618/8009004-rmi_connection_improvement.patch, * patches/security/20130618/8009013-t2k_glyphs.patch, * patches/security/20130618/8009034-jmx_notification_improvement.patch, * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, * patches/security/20130618/8009067-improve_key_storing.patch, * patches/security/20130618/8009071-improve_shape_handling.patch, * patches/security/20130618/8009235-improve_tsa_data_handling.patch, * patches/security/20130618/8009554-serialjavaobject.patch, * patches/security/20130618/8011243-improve_imaginglib.patch, * patches/security/20130618/8011248-better_component_rasters.patch, * patches/security/20130618/8011253-better_short_component_rasters.patch, * patches/security/20130618/8011257-better_byte_component_rasters.patch, * patches/security/20130618/8011557-improve_reflection.patch, * patches/security/20130618/8012375-javadoc_framing.patch, * patches/security/20130618/8012421-better_positioning.patch, * patches/security/20130618/8012438-better_image_validation.patch, * patches/security/20130618/8012597-better_image_channel_validation.patch, * patches/security/20130618/8012601-better_layout_validation.patch, * patches/security/20130618/8014281-better_xml_signature_checking.patch, * patches/security/20130618/8015997-more_javadoc_framing.patch, * patches/security/20130618/diamond_fix.patch, * patches/security/20130618/handle_npe.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/security/20130618/javac_issue.patch, * patches/security/20130618/langtools_generics.patch, * patches/security/20130618/langtools_merge-01.patch, * patches/security/20130618/langtools_merge-02.patch, * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. changeset f8ab99438f3a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f8ab99438f3a author: Andrew John Hughes date: Tue Jul 09 13:17:30 2013 -0400 Correct issues found in building security patches. 2013-06-24 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move 8009071 after library patch. * NEWS: Correct bug ID referenced for OJ3. * patches/ecj/needs-6.patch: Add cases for javax.sound and javax.management, due to @Override annotations in the security patches. * patches/openjdk/6307603-xrender-01.patch: Regenerated again as wrong last time. * patches/security/20130618/8009071-improve_shape_handling.patch: Include sizecalc.h in gif_lib.h. changeset 9ba5f31e9323 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9ba5f31e9323 author: Omair Majid date: Wed Jun 26 10:47:13 2013 -0400 Fix patches to work with patch tools that can not handle renames 2013-06-26 Omair Majid * Makefile.am: (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and patches/openjdk/6851834-handle_renames.patch * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't rename files using extended-diff-style. * patches/openjdk/6990754-handle_renames.patch: New file. Contains the rename portion of 6990754 since some patch programs can not handle renames. * patches/openjdk/6851834-restructure.patch: Don't rename files using extended-diff-style. * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename porition of 6851834 since some patch programs can not handle renames. changeset 9accc50c9c1f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9accc50c9c1f author: Omair Majid date: Wed Jun 26 13:45:20 2013 -0400 Drop unnecessary patch for S8009554 2013-06-26 Omair Majid Severin Gehwolf * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/8009554-serialjavaobject.patch. * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This was adding redundant permission check changeset adfdf70ea171 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=adfdf70ea171 author: Chris Phillips date: Tue Jul 09 14:11:59 2013 -0400 Backport 20130618 sec fixes S7158805 and S8001330 2013-06-26 Chris Phillips * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/7158805-nested_subroutine_rewriting.patch patches/security/20130618/8001330-checking_order_improvement.patch patches/openjdk/7036747-elfstringtable.patch patches/openjdk/7017732-move_static_fields_to_class.patch patches/openjdk/6990754-use_native_memory_for_symboltable.patch patches/openjdk/6990754-handle_renames.patch patches/openjdk/7008809-report_class_in_arraystoreexception.patch patches/openjdk/7086585-flexible_field_injection.patch patches/security/20130618/hs_merge-01.patch patches/security/20130618/hs_merge-02.patch patches/security/20130618/hs_merge-03.patch patches/openjdk/7014851-unused_parallel_compaction_code.patch patches/security/20130618/hs_merge-04.patch Add: patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch patches/security/20130618/8001330-checking_order_improvement-it6.patch * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Backported fix for 7158805. * patches/security/20130618/8001330-checking_order_improvement-it6.patch: Backported fix for hs portion of 8001330. changeset 47fc9f561578 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=47fc9f561578 author: Omair Majid date: Tue Jul 09 17:22:26 2013 -0400 Build additional code using -source 6 2013-07-09 Omair Majid * patches/ecj/needs-6.patch: Build additional code using -source 6. diffstat: ChangeLog | 181 +- Makefile.am | 98 +- hotspot.map | 2 +- patches/apache-xml-internal-fix-bug-38655.patch | 11 - patches/ecj/needs-6.patch | 36 + patches/idresolver_fix.patch | 194 - patches/openjdk/6307603-xrender-01.patch | 239 +- patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 ++++++++ patches/openjdk/6656651-windows_lcd_glyphs.patch | 938 + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 4 +- patches/openjdk/6786028-wcag_bold_tags.patch | 2914 + patches/openjdk/6786682-wcag_lang.patch | 274 + patches/openjdk/6786688-wcag_table.patch | 2828 + patches/openjdk/6786690-wcag_dl.patch | 3230 + patches/openjdk/6802694-no_deprecated.patch | 601 + patches/openjdk/6851834-handle_renames.patch | 605 + patches/openjdk/6851834-restructure.patch | 26853 ++++++++++ patches/openjdk/6888167-medialib_memory_leaks.patch | 134 + patches/openjdk/6961178-doclet_xml.patch | 1989 + patches/openjdk/6980681-corba_deadlock.patch | 7 - patches/openjdk/6990754-handle_renames.patch | 925 + patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18949 +++++++ patches/openjdk/7006270-regressions.patch | 299 + patches/openjdk/7008809-report_class_in_arraystoreexception.patch | 189 + patches/openjdk/7014851-unused_parallel_compaction_code.patch | 810 + patches/openjdk/7017732-move_static_fields_to_class.patch | 3079 + patches/openjdk/7036747-elfstringtable.patch | 130 + patches/openjdk/7086585-flexible_field_injection.patch | 3424 + patches/openjdk/7162902-corba_fixes.patch | 21 - patches/openjdk/7171223-strict_aliasing.patch | 25 + patches/openjdk/7195301-no_instanceof_node.patch | 86 + patches/security/20130618/6741606-apache_santuario.patch | 8110 +++ patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 717 + patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 448 + patches/security/20130618/7170730-windows_network_stack.patch | 1057 + patches/security/20130618/8000638-improve_deserialization.patch | 26 + patches/security/20130618/8000642-better_transportation_handling.patch | 808 + patches/security/20130618/8001032-restrict_object_access-corba.patch | 544 + patches/security/20130618/8001032-restrict_object_access-jdk.patch | 21 + patches/security/20130618/8001033-refactor_address_handling.patch | 119 + patches/security/20130618/8001034-memory_management.patch | 78 + patches/security/20130618/8001038-resourcefully_handle_resources.patch | 236 + patches/security/20130618/8001043-clarify_definition_restrictions.patch | 92 + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch | 36 + patches/security/20130618/8001318-6_fixup.patch | 114 + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch | 470 + patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 + patches/security/20130618/8001330-checking_order_improvement.patch | 380 + patches/security/20130618/8001330-improve_checking_order.patch | 97 + patches/security/20130618/8003703-update_rmi_connection_dialog.patch | 131 + patches/security/20130618/8004584-augment_applet_contextualization.patch | 322 + patches/security/20130618/8005007-better_glyph_processing.patch | 118 + patches/security/20130618/8006328-6_fixup.patch | 31 + patches/security/20130618/8006328-sound_class_robustness.patch | 6936 ++ patches/security/20130618/8006611-improve_scripting.patch | 78 + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch | 108 + patches/security/20130618/8007471-6_fixup.patch | 25 + patches/security/20130618/8007471-improve_mbean_notifications.patch | 89 + patches/security/20130618/8007812-getenclosingmethod.patch | 89 + patches/security/20130618/8008120-improve_jmx_class_checking.patch | 332 + patches/security/20130618/8008124-better_compliance_testing.patch | 20 + patches/security/20130618/8008128-better_jmx_api_coherence.patch | 110 + patches/security/20130618/8008132-better_serialization.patch | 121 + patches/security/20130618/8008585-jmx_data_handling.patch | 69 + patches/security/20130618/8008593-better_urlclassloader.patch | 270 + patches/security/20130618/8008603-jmx_provider_provision.patch | 29 + patches/security/20130618/8008611-6_fixup.patch | 20 + patches/security/20130618/8008611-jmx_annotations.patch | 32 + patches/security/20130618/8008615-jmx_internal_api_robustness.patch | 70 + patches/security/20130618/8008623-mbeanserver_handling.patch | 121 + patches/security/20130618/8008744-6741606_rework.patch | 882 + patches/security/20130618/8008982-jmx_interface_changes.patch | 168 + patches/security/20130618/8009004-rmi_connection_improvement.patch | 54 + patches/security/20130618/8009013-t2k_glyphs.patch | 39 + patches/security/20130618/8009034-jmx_notification_improvement.patch | 30 + patches/security/20130618/8009038-jmx_notification_support_improvement.patch | 89 + patches/security/20130618/8009067-improve_key_storing.patch | 20 + patches/security/20130618/8009071-improve_shape_handling.patch | 1014 + patches/security/20130618/8009235-improve_tsa_data_handling.patch | 80 + patches/security/20130618/8011243-improve_imaginglib.patch | 618 + patches/security/20130618/8011248-better_component_rasters.patch | 51 + patches/security/20130618/8011253-better_short_component_rasters.patch | 140 + patches/security/20130618/8011257-better_byte_component_rasters.patch | 157 + patches/security/20130618/8011557-improve_reflection.patch | 132 + patches/security/20130618/8012375-javadoc_framing.patch | 61 + patches/security/20130618/8012421-better_positioning.patch | 100 + patches/security/20130618/8012438-better_image_validation.patch | 283 + patches/security/20130618/8012597-better_image_channel_validation.patch | 597 + patches/security/20130618/8012601-better_layout_validation.patch | 125 + patches/security/20130618/8014281-better_xml_signature_checking.patch | 49 + patches/security/20130618/8015997-more_javadoc_framing.patch | 21 + patches/security/20130618/diamond_fix.patch | 55 + patches/security/20130618/handle_npe.patch | 21 + patches/security/20130618/hs_merge-01.patch | 284 + patches/security/20130618/hs_merge-02.patch | 155 + patches/security/20130618/hs_merge-03.patch | 18 + patches/security/20130618/hs_merge-04.patch | 44 + patches/security/20130618/javac_issue.patch | 60 + patches/security/20130618/langtools_generics.patch | 600 + patches/security/20130618/langtools_merge-01.patch | 30 + patches/security/20130618/langtools_merge-02.patch | 30 + patches/security/20130618/langtools_merge-03.patch | 18 + 102 files changed, 121587 insertions(+), 363 deletions(-) diffs (truncated from 123121 to 500 lines): diff -r 427412f94dc4 -r 47fc9f561578 ChangeLog --- a/ChangeLog Tue May 28 19:56:33 2013 +0200 +++ b/ChangeLog Tue Jul 09 17:22:26 2013 -0400 @@ -1,3 +1,182 @@ +2013-07-09 Omair Majid + + * patches/ecj/needs-6.patch: Build additional code using -source 6. + +2013-06-26 Chris Phillips + + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/7158805-nested_subroutine_rewriting.patch + patches/security/20130618/8001330-checking_order_improvement.patch + patches/openjdk/7036747-elfstringtable.patch + patches/openjdk/7017732-move_static_fields_to_class.patch + patches/openjdk/6990754-use_native_memory_for_symboltable.patch + patches/openjdk/6990754-handle_renames.patch + patches/openjdk/7008809-report_class_in_arraystoreexception.patch + patches/openjdk/7086585-flexible_field_injection.patch + patches/security/20130618/hs_merge-01.patch + patches/security/20130618/hs_merge-02.patch + patches/security/20130618/hs_merge-03.patch + patches/openjdk/7014851-unused_parallel_compaction_code.patch + patches/security/20130618/hs_merge-04.patch + Add: + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch + patches/security/20130618/8001330-checking_order_improvement-it6.patch + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Backported fix for 7158805. + * patches/security/20130618/8001330-checking_order_improvement-it6.patch: + Backported fix for hs portion of 8001330. + +2013-06-26 Omair Majid + Severin Gehwolf + + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/8009554-serialjavaobject.patch. + * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This + was adding redundant permission checking. + +2013-06-26 Omair Majid + + * Makefile.am: + (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and + patches/openjdk/6851834-handle_renames.patch + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't + rename files using extended-diff-style. + * patches/openjdk/6990754-handle_renames.patch: New file. Contains the + rename portion of 6990754 since some patch programs can not handle + renames. + * patches/openjdk/6851834-restructure.patch: Don't rename files using + extended-diff-style. + * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename + porition of 6851834 since some patch programs can not handle renames. + +2013-06-24 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Move 8009071 after library patch. + * NEWS: Correct bug ID referenced for OJ3. + * patches/ecj/needs-6.patch: + Add cases for javax.sound and javax.management, due + to @Override annotations in the security patches. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated again as wrong last time. + * patches/security/20130618/8009071-improve_shape_handling.patch: + Include sizecalc.h in gif_lib.h. + +2013-07-09 Omair Majid + + * hotspot.map: Update to latest hs23. + * Makefile.am (ICEDTEA_PATCHES): Make hotspot-specific patches + conditional. + +2013-06-22 Andrew John Hughes + + * patches/idresolver_fix.patch: + Removed. Part of 6469266. + * patches/apache-xml-internal-fix-bug-38655.patch: + Removed. Part of 6469266. + * Makefile.am: + (SECURITY_PATCHES): Add new ones. + (SPECIAL_SECURITY_PATCH_1): Renamed from + SPECIAL_SECURITY_PATCH. + (SPECIAL_SECURITY_PATCH_2): Add 8009071, which + needs to be applied after some AWT backports. + (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. + Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES + as must be applied before 8004584. Add 7171223 to + end. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated. + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6656651-windows_lcd_glyphs.patch, + * patches/openjdk/6786028-wcag_bold_tags.patch, + * patches/openjdk/6786682-wcag_lang.patch, + * patches/openjdk/6786688-wcag_table.patch, + * patches/openjdk/6786690-wcag_dl.patch, + * patches/openjdk/6802694-no_deprecated.patch, + * patches/openjdk/6851834-restructure.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/6961178-doclet_xml.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7006270-regressions.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7171223-strict_aliasing.patch, + * patches/openjdk/7195301-no_instanceof_node.patch, + * patches/security/20130618/6741606-apache_santuario.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/7170730-windows_network_stack.patch, + * patches/security/20130618/8000638-improve_deserialization.patch, + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch, + * patches/security/20130618/8001032-restrict_object_access-jdk.patch, + * patches/security/20130618/8001033-refactor_address_handling.patch, + * patches/security/20130618/8001034-memory_management.patch, + * patches/security/20130618/8001038-resourcefully_handle_resources.patch, + * patches/security/20130618/8001043-clarify_definition_restrictions.patch, + * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, + * patches/security/20130618/8001318-6_fixup.patch, + * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch, + * patches/security/20130618/8001330-improve_checking_order.patch, + * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, + * patches/security/20130618/8004584-augment_applet_contextualization.patch, + * patches/security/20130618/8005007-better_glyph_processing.patch, + * patches/security/20130618/8006328-6_fixup.patch, + * patches/security/20130618/8006328-sound_class_robustness.patch, + * patches/security/20130618/8006611-improve_scripting.patch, + * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, + * patches/security/20130618/8007471-6_fixup.patch, + * patches/security/20130618/8007471-improve_mbean_notifications.patch, + * patches/security/20130618/8007812-getenclosingmethod.patch, + * patches/security/20130618/8008120-improve_jmx_class_checking.patch, + * patches/security/20130618/8008124-better_compliance_testing.patch, + * patches/security/20130618/8008128-better_jmx_api_coherence.patch, + * patches/security/20130618/8008132-better_serialization.patch, + * patches/security/20130618/8008585-jmx_data_handling.patch, + * patches/security/20130618/8008593-better_urlclassloader.patch, + * patches/security/20130618/8008603-jmx_provider_provision.patch, + * patches/security/20130618/8008611-6_fixup.patch, + * patches/security/20130618/8008611-jmx_annotations.patch, + * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, + * patches/security/20130618/8008623-mbeanserver_handling.patch, + * patches/security/20130618/8008744-6741606_rework.patch, + * patches/security/20130618/8008982-jmx_interface_changes.patch, + * patches/security/20130618/8009004-rmi_connection_improvement.patch, + * patches/security/20130618/8009013-t2k_glyphs.patch, + * patches/security/20130618/8009034-jmx_notification_improvement.patch, + * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, + * patches/security/20130618/8009067-improve_key_storing.patch, + * patches/security/20130618/8009071-improve_shape_handling.patch, + * patches/security/20130618/8009235-improve_tsa_data_handling.patch, + * patches/security/20130618/8009554-serialjavaobject.patch, + * patches/security/20130618/8011243-improve_imaginglib.patch, + * patches/security/20130618/8011248-better_component_rasters.patch, + * patches/security/20130618/8011253-better_short_component_rasters.patch, + * patches/security/20130618/8011257-better_byte_component_rasters.patch, + * patches/security/20130618/8011557-improve_reflection.patch, + * patches/security/20130618/8012375-javadoc_framing.patch, + * patches/security/20130618/8012421-better_positioning.patch, + * patches/security/20130618/8012438-better_image_validation.patch, + * patches/security/20130618/8012597-better_image_channel_validation.patch, + * patches/security/20130618/8012601-better_layout_validation.patch, + * patches/security/20130618/8014281-better_xml_signature_checking.patch, + * patches/security/20130618/8015997-more_javadoc_framing.patch, + * patches/security/20130618/diamond_fix.patch, + * patches/security/20130618/handle_npe.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/security/20130618/javac_issue.patch, + * patches/security/20130618/langtools_generics.patch, + * patches/security/20130618/langtools_merge-01.patch, + * patches/security/20130618/langtools_merge-02.patch, + * patches/security/20130618/langtools_merge-03.patch: + 2013/06/18 security patches. + 2013-05-28 Xerxes R??nby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile @@ -324,7 +503,7 @@ * patches/security/20130416/8009857.patch: Add security patches. -2013-04-25 Andrew John Hughes +2013-04-25 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move aarch64.patch to original diff -r 427412f94dc4 -r 47fc9f561578 Makefile.am --- a/Makefile.am Tue May 28 19:56:33 2013 +0200 +++ b/Makefile.am Tue Jul 09 17:22:26 2013 -0400 @@ -354,17 +354,97 @@ patches/security/20130416/8007918.patch \ patches/security/20130416/8009305.patch \ patches/security/20130416/8009814.patch \ - patches/security/20130416/8009857.patch + patches/security/20130416/8009857.patch \ + patches/openjdk/7195301-no_instanceof_node.patch \ + patches/openjdk/6469266-xmlsec_1.4.2.patch \ + patches/security/20130618/6741606-apache_santuario.patch \ + patches/security/20130618/7170730-windows_network_stack.patch \ + patches/security/20130618/8000638-improve_deserialization.patch \ + patches/security/20130618/8001032-restrict_object_access-corba.patch \ + patches/security/20130618/8001032-restrict_object_access-jdk.patch \ + patches/security/20130618/8001033-refactor_address_handling.patch \ + patches/security/20130618/8001034-memory_management.patch \ + patches/security/20130618/8001038-resourcefully_handle_resources.patch \ + patches/security/20130618/8001043-clarify_definition_restrictions.patch \ + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch \ + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch \ + patches/security/20130618/8001318-6_fixup.patch \ + patches/security/20130618/8001330-improve_checking_order.patch \ + patches/security/20130618/8003703-update_rmi_connection_dialog.patch \ + patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ + patches/openjdk/8007393.patch \ + patches/openjdk/8007611.patch \ + patches/security/20130618/8004584-augment_applet_contextualization.patch \ + patches/security/20130618/8005007-better_glyph_processing.patch \ + patches/security/20130618/8006328-sound_class_robustness.patch \ + patches/security/20130618/8006328-6_fixup.patch \ + patches/security/20130618/8006611-improve_scripting.patch \ + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch \ + patches/security/20130618/8007471-improve_mbean_notifications.patch \ + patches/security/20130618/8007471-6_fixup.patch \ + patches/security/20130618/8007812-getenclosingmethod.patch \ + patches/security/20130618/8008120-improve_jmx_class_checking.patch \ + patches/security/20130618/8008124-better_compliance_testing.patch \ + patches/security/20130618/8008128-better_jmx_api_coherence.patch \ + patches/security/20130618/8008132-better_serialization.patch \ + patches/security/20130618/8008585-jmx_data_handling.patch \ + patches/security/20130618/8008593-better_urlclassloader.patch \ + patches/security/20130618/8008603-jmx_provider_provision.patch \ + patches/security/20130618/8008611-jmx_annotations.patch \ + patches/security/20130618/8008611-6_fixup.patch \ + patches/security/20130618/8008615-jmx_internal_api_robustness.patch \ + patches/security/20130618/8008623-mbeanserver_handling.patch \ + patches/security/20130618/8008744-6741606_rework.patch \ + patches/security/20130618/8008982-jmx_interface_changes.patch \ + patches/security/20130618/8009004-rmi_connection_improvement.patch \ + patches/security/20130618/8009013-t2k_glyphs.patch \ + patches/security/20130618/8009034-jmx_notification_improvement.patch \ + patches/security/20130618/8009038-jmx_notification_support_improvement.patch \ + patches/security/20130618/8009067-improve_key_storing.patch \ + patches/security/20130618/8009235-improve_tsa_data_handling.patch \ + patches/openjdk/6888167-medialib_memory_leaks.patch \ + patches/security/20130618/8011243-improve_imaginglib.patch \ + patches/security/20130618/8011248-better_component_rasters.patch \ + patches/security/20130618/8011253-better_short_component_rasters.patch \ + patches/security/20130618/8011257-better_byte_component_rasters.patch \ + patches/security/20130618/8011557-improve_reflection.patch \ + patches/security/20130618/8012421-better_positioning.patch \ + patches/security/20130618/8012438-better_image_validation.patch \ + patches/security/20130618/8012597-better_image_channel_validation.patch \ + patches/security/20130618/8012601-better_layout_validation.patch \ + patches/security/20130618/8014281-better_xml_signature_checking.patch \ + patches/security/20130618/diamond_fix.patch \ + patches/security/20130618/handle_npe.patch \ + patches/security/20130618/javac_issue.patch \ + patches/security/20130618/8000642-better_transportation_handling.patch \ + patches/openjdk/6786028-wcag_bold_tags.patch \ + patches/openjdk/6786682-wcag_lang.patch \ + patches/openjdk/6802694-no_deprecated.patch \ + patches/openjdk/6786690-wcag_dl.patch \ + patches/openjdk/6786688-wcag_table.patch \ + patches/openjdk/6961178-doclet_xml.patch \ + patches/openjdk/6851834-restructure.patch \ + patches/openjdk/6851834-handle_renames.patch \ + patches/openjdk/7006270-regressions.patch \ + patches/security/20130618/8012375-javadoc_framing.patch \ + patches/security/20130618/8015997-more_javadoc_framing.patch \ + patches/security/20130618/langtools_merge-01.patch \ + patches/security/20130618/langtools_merge-02.patch \ + patches/security/20130618/langtools_generics.patch \ + patches/security/20130618/langtools_merge-03.patch if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ patches/security/20130201/8001307.patch \ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ - patches/security/20130416/8009699.patch + patches/security/20130416/8009699.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ + patches/security/20130618/8001330-checking_order_improvement-it6.patch endif -SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch +SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch +SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch ICEDTEA_PATCHES = \ $(DROP_PATCHES) \ @@ -380,13 +460,14 @@ patches/openjdk/6725214-direct3d-01.patch \ patches/openjdk/6748082-isDisplayLocal.patch \ patches/openjdk/6633275-shaped_translucent_windows.patch \ - $(SPECIAL_SECURITY_PATCH) \ + $(SPECIAL_SECURITY_PATCH_1) \ patches/openjdk/6769607-modal-hangs.patch \ patches/openjdk/6791612-opengl-jni-fix.patch \ patches/openjdk/6755274-glgetstring-crash.patch \ patches/openjdk/6984543-onscreen_rendering_resize_test.patch \ patches/openjdk/6693253-security_warning.patch \ patches/openjdk/6444769-windowwithwarningtest.patch \ + patches/openjdk/6656651-windows_lcd_glyphs.patch \ patches/notice-safepoints.patch \ patches/parisc-opt.patch \ patches/lucene-crash.patch \ @@ -396,6 +477,7 @@ patches/headers.patch \ patches/gcc-suffix.patch \ patches/libraries.patch \ + $(SPECIAL_SECURITY_PATCH_2) \ patches/lcms.patch \ patches/uname.patch \ patches/freetypeversion.patch \ @@ -529,8 +611,6 @@ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ - patches/idresolver_fix.patch \ - patches/apache-xml-internal-fix-bug-38655.patch \ patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \ patches/openjdk/7088989-ucrypto_tests.patch \ patches/generalise_crypto_tests.patch \ @@ -551,11 +631,8 @@ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ patches/openjdk/8004341-jck_dialog_failure.patch \ patches/pr1319-support_giflib_5.patch \ - patches/openjdk/8007393.patch \ - patches/openjdk/8007611.patch \ patches/copy_memory.patch \ patches/openjdk/6718364-inference_failure.patch \ patches/openjdk/6682380-foreach_crash.patch \ @@ -569,7 +646,8 @@ patches/jtreg-LayoutGetCharacterCount.patch \ patches/jtreg-LayoutLimits.patch \ patches/jtreg-ComponentOrientationTests.patch \ - patches/jtreg-TextLayoutBoundsChecks.patch + patches/jtreg-TextLayoutBoundsChecks.patch \ + patches/openjdk/7171223-strict_aliasing.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 427412f94dc4 -r 47fc9f561578 hotspot.map --- a/hotspot.map Tue May 28 19:56:33 2013 +0200 +++ b/hotspot.map Tue Jul 09 17:22:26 2013 -0400 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 332f7e24a493 da6f849e2b8c0e8c46de4171b9f14ec9d97bac76dd56006d9c33323b23f54f98 +hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0 diff -r 427412f94dc4 -r 47fc9f561578 patches/apache-xml-internal-fix-bug-38655.patch --- a/patches/apache-xml-internal-fix-bug-38655.patch Tue May 28 19:56:33 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -diff -u -r /jck/apache-xml/icedtea6/openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java security/c14n/implementations/NameSpaceSymbTable.java ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java 2011-11-14 23:11:46.000000000 +0100 -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java 2012-03-16 17:52:37.000000000 +0100 -@@ -370,6 +370,7 @@ - if (cur == null || (cur.equals( obj))) { - return index; - } -+ length=length-1; - do { - index=index==length? 0:++index; - cur = set[index]; diff -r 427412f94dc4 -r 47fc9f561578 patches/ecj/needs-6.patch --- a/patches/ecj/needs-6.patch Tue May 28 19:56:33 2013 +0200 +++ b/patches/ecj/needs-6.patch Tue Jul 09 17:22:26 2013 -0400 @@ -22,6 +22,30 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 +diff -Nru openjdk-ecj.orig/jdk/make/javax/sound/Makefile openjdk-ecj/jdk/make/javax/sound/Makefile +--- openjdk-ecj.orig/jdk/make/javax/sound/Makefile 2013-06-24 00:00:22.031254425 +0100 ++++ openjdk-ecj/jdk/make/javax/sound/Makefile 2013-06-24 00:01:27.040288124 +0100 +@@ -28,6 +28,8 @@ + LIBRARY = jsound + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # include defines for sound + include SoundDefs.gmk +diff -Nru openjdk-ecj.orig/jdk/make/javax/management/Makefile openjdk-ecj/jdk/make/javax/management/Makefile +--- openjdk-ecj.orig/jdk/make/javax/management/Makefile 2011-11-14 22:11:40.000000000 +0000 ++++ openjdk-ecj/jdk/make/javax/management/Makefile 2013-06-24 00:40:59.742001431 +0100 +@@ -31,6 +31,8 @@ + PACKAGE = javax.management + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Files to compile diff --git a/make/java/awt/Makefile b/make/java/awt/Makefile --- openjdk-ecj/jdk/make/java/awt/Makefile +++ openjdk-ecj/jdk/make/java/awt/Makefile @@ -34,3 +58,15 @@ # +diff -ruN openjdk-ecj.orig/jdk/make/java/java/Makefile openjdk-ecj/jdk/make/java/java/Makefile +--- openjdk-ecj.orig/jdk/make/java/java/Makefile 2012-10-26 14:25:40.000000000 -0400 ++++ openjdk-ecj/jdk/make/java/java/Makefile 2013-07-09 15:46:52.421633685 -0400 +@@ -33,6 +33,8 @@ + LIBRARY = java + PRODUCT = java + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # windows compiler flags + ifeq ($(PLATFORM),windows) diff -r 427412f94dc4 -r 47fc9f561578 patches/idresolver_fix.patch --- a/patches/idresolver_fix.patch Tue May 28 19:56:33 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java 2012-03-20 20:29:30.000000000 +0100 -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java 2012-03-20 22:18:41.094309861 +0100 -@@ -26,6 +26,7 @@ - import org.w3c.dom.Attr; - import org.w3c.dom.Document; - import org.w3c.dom.Element; -+import org.w3c.dom.NamedNodeMap; - import org.w3c.dom.Node; - - import java.util.Arrays; -@@ -175,69 +176,124 @@ - return null; - } - -+ private static java.util.List names; -+ private static int namesLength; -+ static { -+ String namespaces[]={ -+ Constants.SignatureSpecNS, -+ EncryptionConstants.EncryptionSpecNS, -+ "http://schemas.xmlsoap.org/soap/security/2000-12", -+ "http://www.w3.org/2002/03/xkms#", -+ "urn:oasis:names:tc:SAML:1.0:assertion", -+ "urn:oasis:names:tc:SAML:1.0:protocol" -+ }; -+ names = Arrays.asList(namespaces); -+ namesLength = names.size(); -+ } - -- static java.util.List names; -- static { -- String namespaces[]={ Constants.SignatureSpecNS, -- EncryptionConstants.EncryptionSpecNS, -- "http://schemas.xmlsoap.org/soap/security/2000-12", -- "http://www.w3.org/2002/03/xkms#" -- }; -- names=Arrays.asList(namespaces); -- } - -+ private static Element getElementBySearching(Node root,String id) { -+ Element []els=new Element[namesLength + 1]; -+ getEl(root,id,els); -+ for (int i=0;i http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1494 Bug ID: 1494 Summary: Eclipse repeated crashes Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: martin at testime.com CC: unassigned at icedtea.classpath.org Created attachment 904 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=904&action=edit Dump file from Java Eclipse Juno keeps crashing. It used to work before I upgraded to Fedora 19. I have increased memory to 512M but it has not improved the situation. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/8f030014/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jul 10 02:03:52 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 10 Jul 2013 09:03:52 +0000 Subject: [Bug 1494] Eclipse repeated crashes In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1494 Severin Gehwolf changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sgehwolf at redhat.com --- Comment #1 from Severin Gehwolf --- Are you using yum installed Eclipse or a download from eclipse.org? There's a known issue with upstream Eclipse Juno and newer webkit. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=404776 which also lists workarounds (see comment 22). Yum installed Eclipse should be 4.3 (Kepler) which should not have this issue. Please let us know if you find otherwise. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/dbc5775c/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jul 10 02:19:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 10 Jul 2013 09:19:12 +0000 Subject: [Bug 1494] Eclipse repeated crashes In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1494 --- Comment #2 from Martin Ellison --- I'm using an Android "adt bundle linux" that delivers Eclipse as part of a packaged Android development environment. I found the https://bugs.eclipse.org/bugs/show_bug.cgi?id=404776 useful and after implementing the -Dorg.eclipse.swt.browser.DefaultType=mozilla workaround I don't seem to be getting crashes any more. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/1d4f406e/attachment.html From andrew at icedtea.classpath.org Wed Jul 10 05:41:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 10 Jul 2013 12:41:52 +0000 Subject: /hg/release/icedtea6-1.11: 4 new changesets Message-ID: changeset 8ccc2d062ef2 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=8ccc2d062ef2 author: Andrew John Hughes date: Tue Jul 09 19:32:39 2013 +0100 Set version to 1.11.12 and fix NEWS file. 2013-07-09 Andrew John Hughes * configure.ac: Bump to 1.11.12. * NEWS: Sync with patches now included and add release date. changeset ebb668a814fc in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ebb668a814fc author: Andrew John Hughes date: Wed Jul 10 12:31:16 2013 +0100 Avoid referring to the bootstrap runtime library when compiling the JDK, so as to avoid version conflicts. 2013-07-09 Andrew John Hughes * Makefile.am: (ICEDTEA_ECJ_PATCHES): Add new patch. * patches/ecj/jcp-importsources.patch: Include imported JAXP sources in sourcepath when building org.jcp code. 2013-07-09 Omair Majid * patches/ecj/needs-6.patch: Build additional code using -source 6. 2013-05-15 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException. (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, no-sun-classes, bootstrap-tools and xbootclasspath patches from icedtea.patch. Make the latter two conditional. * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath and -Xbootclasspath/a by prepending, setting or appending its value to the bootclasspath option used to ecj, respectively. * patches/ecj/icedtea.patch: Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK altogether. * patches/ecj/needs-6.patch: Add java.awt Makefile. changeset eca411657872 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=eca411657872 author: Andrew John Hughes date: Wed Jul 10 12:33:47 2013 +0100 Bump release date. 2013-07-10 Andrew John Hughes * NEWS: Bump release date. changeset b8d450756cc9 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=b8d450756cc9 author: Andrew John Hughes date: Wed Jul 10 13:40:03 2013 +0100 Added tag icedtea6-1.11.12 for changeset eca411657872 diffstat: .hgtags | 1 + ChangeLog | 41 +++++++++++++++++ Makefile.am | 6 +- NEWS | 86 ++++++++++++++++++++++++++++-------- configure.ac | 2 +- javac.in | 24 +++++++++- patches/ecj/icedtea.patch | 12 ----- patches/ecj/jcp-importsources.patch | 10 ++++ patches/ecj/needs-6.patch | 24 ++++++++++ 9 files changed, 171 insertions(+), 35 deletions(-) diffs (317 lines): diff -r 49e2fd0a8dfd -r b8d450756cc9 .hgtags --- a/.hgtags Tue Jul 09 16:29:08 2013 +0100 +++ b/.hgtags Wed Jul 10 13:40:03 2013 +0100 @@ -34,3 +34,4 @@ 4892e006b2951600c9131e595096f8eceae5ffe8 icedtea6-1.11.9 f25e5db9397688f7268bb62aca5c63520b4bd08e icedtea6-1.11.10 d3fed928b8b9d76d6153789ac6daec5dd02aab4d icedtea6-1.11.11 +eca41165787238e9d088af88d5a35e417cff21b7 icedtea6-1.11.12 diff -r 49e2fd0a8dfd -r b8d450756cc9 ChangeLog --- a/ChangeLog Tue Jul 09 16:29:08 2013 +0100 +++ b/ChangeLog Wed Jul 10 13:40:03 2013 +0100 @@ -1,3 +1,44 @@ +2013-07-10 Andrew John Hughes + + * NEWS: Bump release date. + +2013-07-10 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_ECJ_PATCHES): Add new patch. + * patches/ecj/jcp-importsources.patch: + Include imported JAXP sources in sourcepath + when building org.jcp code. + +2013-07-09 Omair Majid + + * patches/ecj/needs-6.patch: Build additional code + using -source 6. + +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException. + (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, + no-sun-classes, bootstrap-tools and xbootclasspath + patches from icedtea.patch. Make the latter two + conditional. + * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath + and -Xbootclasspath/a by prepending, setting or appending + its value to the bootclasspath option used to ecj, + respectively. + * patches/ecj/icedtea.patch: + Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK + altogether. + * patches/ecj/needs-6.patch: + Add java.awt Makefile. + +2013-07-09 Andrew John Hughes + + * configure.ac: Bump to 1.11.12. + * NEWS: Sync with patches now included + and add release date. + 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, diff -r 49e2fd0a8dfd -r b8d450756cc9 Makefile.am --- a/Makefile.am Tue Jul 09 16:29:08 2013 +0100 +++ b/Makefile.am Wed Jul 10 13:40:03 2013 +0100 @@ -77,7 +77,8 @@ ICEDTEA_BOOTSTRAP_CLASSES = \ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \ $(SHARE)/javax/management/StandardMBean.java \ - $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java + $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java \ + $(SHARE)/java/sql/SQLException.java # Flags IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) @@ -710,7 +711,8 @@ patches/ecj/bootver.patch \ patches/ecj/getannotation-cast.patch \ patches/ecj/override.patch \ - patches/ecj/xsltproc.patch + patches/ecj/xsltproc.patch \ + patches/ecj/jcp-importsources.patch if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ diff -r 49e2fd0a8dfd -r b8d450756cc9 NEWS --- a/NEWS Tue Jul 09 16:29:08 2013 +0100 +++ b/NEWS Wed Jul 10 13:40:03 2013 +0100 @@ -11,13 +11,76 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.11.12 (2013-07-XX): +New in release 1.11.12 (2013-07-10): + * Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing * Backports + - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 - S6541350: TimeZone display names localization + - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications. + - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong + - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute + - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers + - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue + - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form - S6821191: Timezone display name localization + - S6851834: Javadoc doclet needs a structured approach to generate the output HTML. + - S6888167: memory leaks in the medialib glue code + - S6961178: Allow doclet.xml to contain XML attributes - S6977550: (tz) Support tzdata2010l - S6996686: (tz) Support tzdata2010o + - S7006270: Several javadoc regression tests are failing on windows - S7017800: (tz) Support tzdata2011b - S7027387: (tz) Support tzdata2011d - S7033174: (tz) Support tzdata2011e @@ -27,43 +90,28 @@ - S7103405: Correct display names for Pacific/Apia timezone - S7104126: Insert openjdk copyright header back into TZdata files - S7158483: (tz) Support tzdata2012c + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S7198570: (tz) Support tzdata2012f - - S7188114: (launcher) need an alternate command line parser for Windows - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node - - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout - - S8002070: Remove the stack search for a resource bundle for Logger to use - S8002225: (tz) Support tzdata2012i - - S8006120: Provide "Server JRE" for 7u train - - S8006536: [launcher] removes trailing slashes on arguments - S8009165: Fix for 8006435 needs revision - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 - - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. + - S8009530: ICU Kern table support broken - S8009610: Blacklist certificate used with malware. - S8009987: (tz) Support tzdata2013b - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail - - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive - - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance - S8010939: Deadlock in LogManager - - S8011139: (reflect) Revise checking in getEnclosingClass - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows - - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined - - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011557: Improve reflection utility classes - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris - - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() - - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup - - S8014205: Most of the Swing dialogs are blank on one win7 MUI - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 - - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement - - S8014676: Java debugger may fail to run - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 - - S8014745: Provide a switch to allow stack walk search of resource bundle - - S8014968: OCSP and CRL connection timeout is set to four hours by default New in release 1.11.11 (2013-04-24): diff -r 49e2fd0a8dfd -r b8d450756cc9 configure.ac --- a/configure.ac Tue Jul 09 16:29:08 2013 +0100 +++ b/configure.ac Wed Jul 10 13:40:03 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.11.12pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.11.12],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) diff -r 49e2fd0a8dfd -r b8d450756cc9 javac.in --- a/javac.in Tue Jul 09 16:29:08 2013 +0100 +++ b/javac.in Wed Jul 10 13:40:03 2013 +0100 @@ -6,7 +6,29 @@ my $ECJ_WARNINGS="-nowarn"; my @bcoption; -push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' +my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV; +my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV; +my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV; +my $bcp = $bcoptionsp[0]; +my $bc = $bcoptions[0]; +my $bca = $bcoptionsa[0]; +my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'; +if ($bcp) +{ + $bcp =~ s/^[^:]*://; + $systembc = join ":", $bcp, $systembc; +} +if ($bc) +{ + $bc =~ s/^[^:]*://; + $systembc = $bc; +} +if ($bca) +{ + $bca =~ s/^[^:]*://; + $systembc = join ":", $systembc, $bca; +} +push @bcoption, '-bootclasspath', $systembc unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); diff -r 49e2fd0a8dfd -r b8d450756cc9 patches/ecj/icedtea.patch --- a/patches/ecj/icedtea.patch Tue Jul 09 16:29:08 2013 +0100 +++ b/patches/ecj/icedtea.patch Wed Jul 10 13:40:03 2013 +0100 @@ -613,18 +613,6 @@ diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk --- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2010-05-26 09:32:35.000000000 +0100 +++ openjdk-ecj/jdk/make/common/Rules.gmk 2010-05-26 15:02:51.000000000 +0100 -@@ -235,8 +235,9 @@ - $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ - $(CAT) $(JAVA_SOURCE_LIST); \ - $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ -+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - fi - @$(java-vm-cleanup) - @@ -302,6 +303,8 @@ $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) diff -r 49e2fd0a8dfd -r b8d450756cc9 patches/ecj/jcp-importsources.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/jcp-importsources.patch Wed Jul 10 13:40:03 2013 +0100 @@ -0,0 +1,10 @@ +--- openjdk-ecj/jdk/make/org/jcp/Makefile.orig 2013-07-10 10:02:13.715336690 +0100 ++++ openjdk-ecj/jdk/make/org/jcp/Makefile 2013-07-10 10:02:55.359996584 +0100 +@@ -31,6 +31,7 @@ + PACKAGE = org.jcp + PRODUCT = jcp + include $(BUILDDIR)/common/Defs.gmk ++SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java) + + # + # Files to compile diff -r 49e2fd0a8dfd -r b8d450756cc9 patches/ecj/needs-6.patch --- a/patches/ecj/needs-6.patch Tue Jul 09 16:29:08 2013 +0100 +++ b/patches/ecj/needs-6.patch Wed Jul 10 13:40:03 2013 +0100 @@ -46,3 +46,27 @@ # # Files to compile +diff --git a/make/java/awt/Makefile b/make/java/awt/Makefile +--- openjdk-ecj/jdk/make/java/awt/Makefile ++++ openjdk-ecj/jdk/make/java/awt/Makefile +@@ -27,6 +27,8 @@ + PACKAGE = java.awt + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + + # +diff -ruN openjdk-ecj.orig/jdk/make/java/java/Makefile openjdk-ecj/jdk/make/java/java/Makefile +--- openjdk-ecj.orig/jdk/make/java/java/Makefile 2012-10-26 14:25:40.000000000 -0400 ++++ openjdk-ecj/jdk/make/java/java/Makefile 2013-07-09 15:46:52.421633685 -0400 +@@ -33,6 +33,8 @@ + LIBRARY = java + PRODUCT = java + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # windows compiler flags + ifeq ($(PLATFORM),windows) From aazores at redhat.com Wed Jul 10 07:15:37 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 10 Jul 2013 10:15:37 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DC4821.2070804@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> Message-ID: <51DD6C89.1010000@redhat.com> On 07/09/2013 01:28 PM, Andrew Azores wrote: > On 07/09/2013 12:23 PM, Andrew Azores wrote: >> On 07/09/2013 11:46 AM, Andrew Azores wrote: >>> Changelog: >>> * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, >>> added new stamp to create HTML for AboutDialog >>> * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of >>> extras into netx and renamed from Main. New Swing layout and uses >>> HTML files generated in Makefile. >>> * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of >>> extras into netx. Added ability to click hyperlinks. >>> * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, >>> getJNLPFile, itwInfoMessage): changed way of launching About dialog >>> to using new static display method rather than JNLP launch. Removed >>> methods relating to JNLP launch. More informative and nicely >>> formatted -headless information. >>> >>> * netx/net/sourceforge/jnlp/resources/Messages.properties >>> (BAboutITW, BFileInfoAuthors, BFileInfoCopying, BFileInfoNews): >>> added new messages for javaws -about -headless launch >>> * netx/net/sourceforge/jnlp/resources/about.html: moved out of >>> extras into netx. Added more content, changed formatting. >>> * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer >>> needed >>> * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for >>> About dialog. Modified version of javaws_splash.png >>> * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of >>> extras into netx >>> >>> * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx >>> * extra/net/sourceforge/javaws/about/Main.java: same >>> * extra/net/sourceforge/javaws/about/resources/about.html: same >>> * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same >>> * extra/net/sourceforge/javaws/about/resources/applications.html: >>> removed >>> * extra/net/sourceforge/javaws/about/resources/notes.html: removed >> >> And here is the new itw_logo.png. >> >> Andrew A >> > Updated patches so that the button labels in the AboutDialog are > localized. > > Andrew A Everything all together in one big patch file as per request. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: total.patch Type: text/x-patch Size: 40030 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/96f28ff3/total.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: itw_logo.png Type: image/png Size: 2191 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/96f28ff3/itw_logo.png From andrew at icedtea.classpath.org Wed Jul 10 07:42:50 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 10 Jul 2013 14:42:50 +0000 Subject: /hg/release/icedtea6-1.12: 6 new changesets Message-ID: changeset ce5dbd04cea5 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=ce5dbd04cea5 author: Andrew John Hughes date: Wed Jul 10 13:59:14 2013 +0100 Backport additional fixes. Additional fixes were applied to jdk7u as part of the security release. This patch includes a subset of them. 2013-07-01 Omair Majid * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, * patches/openjdk/8009217-fix_test_compile.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8009610-blacklist_malware_certificate.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011992-MlibOpsTest_failed.patch, * patches/openjdk/8012112-MlibOpsTest_fails.patch, * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, * patches/openjdk/8012933-appcontext_disposed_too_early.patch, * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014427-raster_regresssion.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * patches/ecj/override.patch: Add new hunk for BufferedImage. * NEWS: Update with backports. changeset 079a280bf354 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=079a280bf354 author: Omair Majid date: Wed Jul 03 23:28:46 2013 -0400 Additional fixes that go along with the security update Backport additional fixes from 7 that went along with the security update. 2013-07-03 Omair Majid * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8009996-emitter_bean.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010727-empty_logger_name.patch, * patches/openjdk/8010939-logmanager_deadlock.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014718-remove_logging_suntoolkit.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * NEWS: Update with fixes. changeset 736ee5b3272b in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=736ee5b3272b author: Andrew John Hughes date: Wed Jul 10 14:09:21 2013 +0100 Remove unused patches and those which need more testing in HEAD. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Readd parts of patch removed without note in an earlier backport and fix copyright headers to apply (2011 instead of 2010). 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * Makefile.am: (ICEDTEA_PATCHES): Remove patches which need more testing before release. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. changeset 80e8d9771395 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=80e8d9771395 author: Andrew John Hughes date: Wed Jul 10 14:12:46 2013 +0100 Set version to 1.12.6 and fix NEWS file. 2013-07-10 Andrew John Hughes * configure.ac: Bump to 1.12.6. 2013-07-09 Andrew John Hughes * NEWS: Sync with patches now included and add release date. changeset 410b4993d8df in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=410b4993d8df author: Andrew John Hughes date: Wed Jul 10 14:25:35 2013 +0100 Avoid referring to the bootstrap runtime library when compiling the JDK, so as to avoid version conflicts. 2013-07-09 Andrew John Hughes * Makefile.am: (ICEDTEA_ECJ_PATCHES): Add new patch. * patches/ecj/jcp-importsources.patch: Include imported JAXP sources in sourcepath when building org.jcp code. 2013-07-09 Omair Majid * patches/ecj/needs-6.patch: Build additional code using -source 6. 2013-05-15 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException if any of the constructors are missing. * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath and -Xbootclasspath/a by prepending, setting or appending its value to the bootclasspath option used to ecj, respectively. * configure.ac: Test for the java.sql.SQLException constructors. * patches/ecj/icedtea.patch: Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK altogether. * patches/ecj/needs-6.patch: Add java.awt Makefile. changeset 72801116cb84 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=72801116cb84 author: Andrew John Hughes date: Wed Jul 10 15:13:09 2013 +0100 Make 7158805 patch apply again. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Make patch apply again. diffstat: ChangeLog | 167 +- Makefile.am | 62 +- NEWS | 102 +- configure.ac | 8 +- javac.in | 24 +- patches/ecj/ant.patch | 20 - patches/ecj/icedtea.patch | 12 - patches/ecj/jcp-importsources.patch | 10 + patches/ecj/needs-6.patch | 24 + patches/openjdk/6541350-tz_display_names_l10n.patch | 300 + patches/openjdk/6821191-tz_display_names_l10n.patch | 125 + patches/openjdk/6977550-tzdata2010l.patch | 1208 + patches/openjdk/6990754-handle_renames.patch | 925 - patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18949 ---------- patches/openjdk/6996686-tzdata2010o.patch | 93 + patches/openjdk/7008809-report_class_in_arraystoreexception.patch | 189 - patches/openjdk/7014851-unused_parallel_compaction_code.patch | 810 - patches/openjdk/7017732-move_static_fields_to_class.patch | 3079 - patches/openjdk/7017800-tzdata2011b.patch | 254 + patches/openjdk/7027387-tzdata2011d.patch | 502 + patches/openjdk/7033174-tzdata2011e.patch | 117 + patches/openjdk/7036747-elfstringtable.patch | 130 - patches/openjdk/7039469-tzdata2011g.patch | 116 + patches/openjdk/7086585-flexible_field_injection.patch | 3424 - patches/openjdk/7090843-tzdata2011j.patch | 1228 + patches/openjdk/7103108-tzdata2011l.patch | 1593 + patches/openjdk/7103405-correct_display_names.patch | 118 + patches/openjdk/7104126-headers_tzdata.patch | 530 + patches/openjdk/7158483-tzdata2012c.patch | 1436 + patches/openjdk/7198570-tzdata2012f.patch | 841 + patches/openjdk/8002225-tzdata2012i.patch | 261 + patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch | 68 + patches/openjdk/8009217-fix_test_compile.patch | 91 + patches/openjdk/8009610-blacklist_malware_certificate.patch | 64 + patches/openjdk/8009987-tzdata2013b.patch | 2165 + patches/openjdk/8009996-emitter_bean.patch | 27 + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch | 345 + patches/openjdk/8010727-empty_logger_name.patch | 99 + patches/openjdk/8010939-logmanager_deadlock.patch | 264 + patches/openjdk/8011154-awt_regression.patch | 20 + patches/openjdk/8011992-MlibOpsTest_failed.patch | 89 + patches/openjdk/8012112-MlibOpsTest_fails.patch | 51 + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch | 480 + patches/openjdk/8012933-appcontext_disposed_too_early.patch | 153 + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 + patches/openjdk/8014427-raster_regression.patch | 20 + patches/openjdk/8014718-remove_logging_suntoolkit.patch | 112 + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 743 - patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 53 +- patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 - patches/security/20130618/8001330-checking_order_improvement.patch | 37 +- patches/security/20130618/hs_merge-01.patch | 284 - patches/security/20130618/hs_merge-02.patch | 155 - patches/security/20130618/hs_merge-03.patch | 18 - patches/security/20130618/hs_merge-04.patch | 44 - patches/sparc.patch | 1808 - 56 files changed, 13285 insertions(+), 31120 deletions(-) diffs (truncated from 44796 to 500 lines): diff -r a6de0621a57b -r 72801116cb84 ChangeLog --- a/ChangeLog Wed Jun 26 15:10:59 2013 -0400 +++ b/ChangeLog Wed Jul 10 15:13:09 2013 +0100 @@ -1,5 +1,170 @@ +2013-07-10 Andrew John Hughes + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Make patch apply again. + +2013-07-09 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_ECJ_PATCHES): Add new patch. + * patches/ecj/jcp-importsources.patch: + Include imported JAXP sources in sourcepath + when building org.jcp code. + +2013-07-09 Omair Majid + + * patches/ecj/needs-6.patch: Build additional code + using -source 6. + +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException + if any of the constructors are missing. + * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath + and -Xbootclasspath/a by prepending, setting or appending + its value to the bootclasspath option used to ecj, + respectively. + * configure.ac: Test for the java.sql.SQLException + constructors. + * patches/ecj/icedtea.patch: + Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK + altogether. + * patches/ecj/needs-6.patch: + Add java.awt Makefile. + +2013-07-10 Andrew John Hughes + + * configure.ac: Bump to 1.12.6. + +2013-07-09 Andrew John Hughes + + * NEWS: Sync with patches now included + and add release date. + +2013-07-10 Andrew John Hughes + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Readd parts of patch removed without note in + an earlier backport and fix copyright headers to + apply (2011 instead of 2010). + +2013-07-09 Andrew John Hughes + + * patches/ecj/ant.patch, + * patches/openjdk/6990754-handle_renames.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, + * patches/security/20130618/8001330-checking_order_improvement-it6.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/sparc.patch: + Remove unused patches. + * Makefile.am: + (ICEDTEA_PATCHES): Remove patches which need more testing before + release. + * patches/ecj/override.patch: Drop recent addition. In accordance with + PR1397, we should avoid extending this patch in favour of either not + including @Override additions or setting source/target correctly. + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch: + Replace with Chris' patches, regenerated as unified diffs. + +2013-07-03 Omair Majid + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8009996-emitter_bean.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010727-empty_logger_name.patch, + * patches/openjdk/8010939-logmanager_deadlock.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014718-remove_logging_suntoolkit.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch: + New file. Backport from icedtea/openjdk 7. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * NEWS: Update with fixes. + +2013-07-01 Omair Majid + + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, + * patches/openjdk/8009217-fix_test_compile.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8009610-blacklist_malware_certificate.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, + * patches/openjdk/8011154-awt_regresssion.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011992-MlibOpsTest_failed.patch, + * patches/openjdk/8012112-MlibOpsTest_fails.patch, + * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, + * patches/openjdk/8012933-appcontext_disposed_too_early.patch, + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014427-raster_regresssion.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. + Backport from icedtea/openjdk 7. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/override.patch: Add new hunk for BufferedImage. + * NEWS: Update with backports. + 2013-06-26 Chris Phillips - * Makefile.am (SECURITY_PATCHES): Drop + + * Makefile.am: + (SECURITY_PATCHES): Drop patches/security/20130618/7158805-nested_subroutine_rewriting.patch patches/security/20130618/8001330-checking_order_improvement.patch patches/openjdk/7036747-elfstringtable.patch diff -r a6de0621a57b -r 72801116cb84 Makefile.am --- a/Makefile.am Wed Jun 26 15:10:59 2013 -0400 +++ b/Makefile.am Wed Jul 10 15:13:09 2013 +0100 @@ -140,6 +140,27 @@ $(SHARE)/javax/net/ssl/KeyStoreBuilderParameters.java endif +#PR57420 - java.sql.SQLException +if LACKS_JAVA_SQL_EXCEPTION_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +endif +endif +endif +endif + # Flags MEMORY_LIMIT = -J-Xmx1024m IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) @@ -398,8 +419,8 @@ patches/security/20130618/diamond_fix.patch \ patches/security/20130618/handle_npe.patch \ patches/security/20130618/javac_issue.patch \ - patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ - patches/security/20130618/8001330-checking_order_improvement-it6.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting.patch \ + patches/security/20130618/8001330-checking_order_improvement.patch \ patches/security/20130618/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ @@ -652,7 +673,39 @@ patches/jaxws-tempfiles-ioutils-6.patch \ patches/object-factory-cl-internal.patch \ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ - patches/openjdk/7171223-strict_aliasing.patch + patches/openjdk/7171223-strict_aliasing.patch \ + patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \ + patches/openjdk/8009217-fix_test_compile.patch \ + patches/openjdk/8009610-blacklist_malware_certificate.patch \ + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \ + patches/openjdk/8011154-awt_regression.patch \ + patches/openjdk/8011992-MlibOpsTest_failed.patch \ + patches/openjdk/8012112-MlibOpsTest_fails.patch \ + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ + patches/openjdk/8012933-appcontext_disposed_too_early.patch \ + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8014427-raster_regression.patch \ + patches/openjdk/8010727-empty_logger_name.patch \ + patches/openjdk/8010939-logmanager_deadlock.patch \ + patches/openjdk/8014718-remove_logging_suntoolkit.patch \ + patches/openjdk/8009996-emitter_bean.patch \ + patches/openjdk/6541350-tz_display_names_l10n.patch \ + patches/openjdk/6821191-tz_display_names_l10n.patch \ + patches/openjdk/6977550-tzdata2010l.patch \ + patches/openjdk/6996686-tzdata2010o.patch \ + patches/openjdk/7017800-tzdata2011b.patch \ + patches/openjdk/7027387-tzdata2011d.patch \ + patches/openjdk/7033174-tzdata2011e.patch \ + patches/openjdk/7039469-tzdata2011g.patch \ + patches/openjdk/7090843-tzdata2011j.patch \ + patches/openjdk/7103108-tzdata2011l.patch \ + patches/openjdk/7104126-headers_tzdata.patch \ + patches/openjdk/7103405-correct_display_names.patch \ + patches/openjdk/7158483-tzdata2012c.patch \ + patches/openjdk/7198570-tzdata2012f.patch \ + patches/openjdk/8002225-tzdata2012i.patch \ + patches/openjdk/8009987-tzdata2013b.patch + if WITH_RHINO ICEDTEA_PATCHES += \ @@ -721,7 +774,8 @@ patches/ecj/corba-dependencies.patch \ patches/ecj/jaxws-langtools-dependency.patch \ patches/ecj/jaxws-jdk-dependency.patch \ - patches/ecj/hotspot-jdk-dependency.patch + patches/ecj/hotspot-jdk-dependency.patch \ + patches/ecj/jcp-importsources.patch if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ diff -r a6de0621a57b -r 72801116cb84 NEWS --- a/NEWS Wed Jun 26 15:10:59 2013 -0400 +++ b/NEWS Wed Jul 10 15:13:09 2013 +0100 @@ -11,7 +11,107 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.12.6 (2013-06-XX): +New in release 1.12.6 (2013-07-10): + +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* Backports + - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 + - S6541350: TimeZone display names localization + - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications. + - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong + - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute + - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers + - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue + - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form + - S6821191: Timezone display name localization + - S6851834: Javadoc doclet needs a structured approach to generate the output HTML. + - S6888167: memory leaks in the medialib glue code + - S6961178: Allow doclet.xml to contain XML attributes + - S6977550: (tz) Support tzdata2010l + - S6996686: (tz) Support tzdata2010o + - S7006270: Several javadoc regression tests are failing on windows + - S7017800: (tz) Support tzdata2011b + - S7027387: (tz) Support tzdata2011d + - S7033174: (tz) Support tzdata2011e + - S7039469: (tz) Support tzdata2011g + - S7090843: (tz) Support tzdata2011j + - S7103108: (tz) Support tzdata2011l + - S7103405: Correct display names for Pacific/Apia timezone + - S7104126: Insert openjdk copyright header back into TZdata files + - S7158483: (tz) Support tzdata2012c + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S7198570: (tz) Support tzdata2012f + - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node + - S8002225: (tz) Support tzdata2012i + - S8009165: Fix for 8006435 needs revision + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009530: ICU Kern table support broken + - S8009610: Blacklist certificate used with malware. + - S8009987: (tz) Support tzdata2013b + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010939: Deadlock in LogManager + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011557: Improve reflection utility classes + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 New in release 1.12.5 (2013-04-24): diff -r a6de0621a57b -r 72801116cb84 configure.ac --- a/configure.ac Wed Jun 26 15:10:59 2013 -0400 +++ b/configure.ac Wed Jul 10 15:13:09 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.12.6pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.12.6],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) @@ -154,6 +154,12 @@ [new javax.net.ssl.KeyStoreBuilderParameters(new java.util.ArrayList()).getParameters()] ) +dnl PR57420 - java.sql.SQLException +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_THROWABLE],[java.sql.SQLException],[Throwable.class],[new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_THROWABLE],[java.sql.SQLException],[String.class,Throwable.class],["Something went wrong",new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()]) + # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) diff -r a6de0621a57b -r 72801116cb84 javac.in --- a/javac.in Wed Jun 26 15:10:59 2013 -0400 +++ b/javac.in Wed Jul 10 15:13:09 2013 +0100 @@ -7,7 +7,29 @@ my $JAVAC_WARNINGS="-nowarn"; my @bcoption; -push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' +my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV; +my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV; +my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV; +my $bcp = $bcoptionsp[0]; +my $bc = $bcoptions[0]; +my $bca = $bcoptionsa[0]; +my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'; +if ($bcp) +{ + $bcp =~ s/^[^:]*://; + $systembc = join ":", $bcp, $systembc; +} +if ($bc) +{ + $bc =~ s/^[^:]*://; + $systembc = $bc; +} +if ($bca) +{ + $bca =~ s/^[^:]*://; + $systembc = join ":", $systembc, $bca; +} +push @bcoption, '-bootclasspath', $systembc unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', '-XDignore.symbol.file=true'); diff -r a6de0621a57b -r 72801116cb84 patches/ecj/ant.patch --- a/patches/ecj/ant.patch Wed Jun 26 15:10:59 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500 -@@ -80,6 +80,7 @@ - endif - - ifdef ALT_BOOTDIR -+ ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - endif - ---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500 -@@ -109,6 +109,7 @@ - memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}" - excludes="com/sun/tools/internal/txw2/**"> -+ - - - diff -r a6de0621a57b -r 72801116cb84 patches/ecj/icedtea.patch --- a/patches/ecj/icedtea.patch Wed Jun 26 15:10:59 2013 -0400 +++ b/patches/ecj/icedtea.patch Wed Jul 10 15:13:09 2013 +0100 @@ -602,18 +602,6 @@ diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk --- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2011-01-07 21:32:51.000000000 +0000 +++ openjdk-ecj/jdk/make/common/Rules.gmk 2012-01-18 21:43:04.150185964 +0000 -@@ -235,8 +235,9 @@ - $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ - $(CAT) $(JAVA_SOURCE_LIST); \ - $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ -+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - fi - @$(java-vm-cleanup) - @@ -302,6 +303,8 @@ $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) diff -r a6de0621a57b -r 72801116cb84 patches/ecj/jcp-importsources.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/jcp-importsources.patch Wed Jul 10 15:13:09 2013 +0100 @@ -0,0 +1,10 @@ +--- openjdk-ecj/jdk/make/org/jcp/Makefile.orig 2013-07-10 10:02:13.715336690 +0100 ++++ openjdk-ecj/jdk/make/org/jcp/Makefile 2013-07-10 10:02:55.359996584 +0100 +@@ -31,6 +31,7 @@ + PACKAGE = org.jcp + PRODUCT = jcp + include $(BUILDDIR)/common/Defs.gmk ++SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java) + + # + # Files to compile diff -r a6de0621a57b -r 72801116cb84 patches/ecj/needs-6.patch --- a/patches/ecj/needs-6.patch Wed Jun 26 15:10:59 2013 -0400 +++ b/patches/ecj/needs-6.patch Wed Jul 10 15:13:09 2013 +0100 @@ -46,3 +46,27 @@ From bugzilla-daemon at icedtea.classpath.org Wed Jul 10 07:43:09 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 10 Jul 2013 14:43:09 +0000 Subject: [Bug 1397] [IcedTea6] Remove needed for override patch by building source/target 6 throughout In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1397 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.12?cmd=changeset;node=736ee5b3272b author: Andrew John Hughes date: Wed Jul 10 14:09:21 2013 +0100 Remove unused patches and those which need more testing in HEAD. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Readd parts of patch removed without note in an earlier backport and fix copyright headers to apply (2011 instead of 2010). 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * Makefile.am: (ICEDTEA_PATCHES): Remove patches which need more testing before release. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/d3f1ce83/attachment.html From gnu.andrew at redhat.com Wed Jul 10 09:06:36 2013 From: gnu.andrew at redhat.com (Andrew John Hughes) Date: Wed, 10 Jul 2013 17:06:36 +0100 Subject: [SECURITY] IcedTea 1.11.12 & 1.12.6 for OpenJDK 6 Released! Message-ID: <20130710160614.GA5316@carrie.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. These releases update our OpenJDK 6 support to include the latest security updates. We recommend that users upgrade as soon as possible. The security fixes are as follows: * S6741606, CVE-2013-2407: Integrate Apache Santuario * S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls * S7170730, CVE-2013-2451: Improve Windows network stack support. * S8000638, CVE-2013-2450: Improve deserialization * S8000642, CVE-2013-2446: Better handling of objects for transportation * S8001032: Restrict object access * S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers * S8001034, CVE-2013-1500: Memory management improvements * S8001038, CVE-2013-2444: Resourcefully handle resources * S8001043: Clarify definition restrictions * S8001309: Better handling of annotation interfaces * S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost * S8001330, CVE-2013-2443: Improve on checking order * S8003703, CVE-2013-2412: Update RMI connection dialog box * S8004584: Augment applet contextualization * S8005007: Better glyph processing * S8006328, CVE-2013-2448: Improve robustness of sound classes * S8006611: Improve scripting * S8007467: Improve robustness of JMX internal APIs * S8007471: Improve MBean notifications * S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes * S8008120, CVE-2013-2457: Improve JMX class checking * S8008124, CVE-2013-2453: Better compliance testing * S8008128: Better API coherence for JMX * S8008132, CVE-2013-2456: Better serialization support * S8008585: Better JMX data handling * S8008593: Better URLClassLoader resource management * S8008603: Improve provision of JMX providers * S8008611: Better handling of annotations in JMX * S8008615: Improve robustness of JMX internal APIs * S8008623: Better handling of MBeanServers * S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 * S8008982: Adjust JMX for underlying interface changes * S8009004: Better implementation of RMI connections * S8009013: Better handling of T2K glyphs * S8009034: Improve resulting notifications in JMX * S8009038: Improve JMX notification support * S8009067: Improve storing keys in KeyStore * S8009071, CVE-2013-2459: Improve shape handling * S8009235: Improve handling of TSA data * S8011243, CVE-2013-2470: Improve ImagingLib * S8011248, CVE-2013-2471: Better Component Rasters * S8011253, CVE-2013-2472: Better Short Component Rasters * S8011257, CVE-2013-2473: Better Byte Component Rasters * S8012375, CVE-2013-1571: Improve Javadoc framing * S8012421: Better positioning of PairPositioning * S8012438, CVE-2013-2463: Better image validation * S8012597, CVE-2013-2465: Better image channel verification * S8012601, CVE-2013-2469: Better validation of image layouts * S8014281, CVE-2013-2461: Better checking of XML signature * S8015997: Additional improvement in Javadoc framing IcedTea includes the usual IcedTea patches to allow builds against system libraries and to support more esoteric architectures. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. Note that we have also included a subset of the changes which were part of the 7u25 update, compromising of those which we thought safest to include in a stable 6 release. What's New? =========== New in release 1.11.12 (2013-07-10): * Security fixes - S6741606, CVE-2013-2407: Integrate Apache Santuario - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls - S7170730, CVE-2013-2451: Improve Windows network stack support. - S8000638, CVE-2013-2450: Improve deserialization - S8000642, CVE-2013-2446: Better handling of objects for transportation - S8001032: Restrict object access - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers - S8001034, CVE-2013-1500: Memory management improvements - S8001038, CVE-2013-2444: Resourcefully handle resources - S8001043: Clarify definition restrictions - S8001309: Better handling of annotation interfaces - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost - S8001330, CVE-2013-2443: Improve on checking order - S8003703, CVE-2013-2412: Update RMI connection dialog box - S8004584: Augment applet contextualization - S8005007: Better glyph processing - S8006328, CVE-2013-2448: Improve robustness of sound classes - S8006611: Improve scripting - S8007467: Improve robustness of JMX internal APIs - S8007471: Improve MBean notifications - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes - S8008120, CVE-2013-2457: Improve JMX class checking - S8008124, CVE-2013-2453: Better compliance testing - S8008128: Better API coherence for JMX - S8008132, CVE-2013-2456: Better serialization support - S8008585: Better JMX data handling - S8008593: Better URLClassLoader resource management - S8008603: Improve provision of JMX providers - S8008611: Better handling of annotations in JMX - S8008615: Improve robustness of JMX internal APIs - S8008623: Better handling of MBeanServers - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 - S8008982: Adjust JMX for underlying interface changes - S8009004: Better implementation of RMI connections - S8009013: Better handling of T2K glyphs - S8009034: Improve resulting notifications in JMX - S8009038: Improve JMX notification support - S8009067: Improve storing keys in KeyStore - S8009071, CVE-2013-2459: Improve shape handling - S8009235: Improve handling of TSA data - S8011243, CVE-2013-2470: Improve ImagingLib - S8011248, CVE-2013-2471: Better Component Rasters - S8011253, CVE-2013-2472: Better Short Component Rasters - S8011257, CVE-2013-2473: Better Byte Component Rasters - S8012375, CVE-2013-1571: Improve Javadoc framing - S8012421: Better positioning of PairPositioning - S8012438, CVE-2013-2463: Better image validation - S8012597, CVE-2013-2465: Better image channel verification - S8012601, CVE-2013-2469: Better validation of image layouts - S8014281, CVE-2013-2461: Better checking of XML signature - S8015997: Additional improvement in Javadoc framing * Backports - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 - S6541350: TimeZone display names localization - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications. - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form - S6821191: Timezone display name localization - S6851834: Javadoc doclet needs a structured approach to generate the output HTML. - S6888167: memory leaks in the medialib glue code - S6961178: Allow doclet.xml to contain XML attributes - S6977550: (tz) Support tzdata2010l - S6996686: (tz) Support tzdata2010o - S7006270: Several javadoc regression tests are failing on windows - S7017800: (tz) Support tzdata2011b - S7027387: (tz) Support tzdata2011d - S7033174: (tz) Support tzdata2011e - S7039469: (tz) Support tzdata2011g - S7090843: (tz) Support tzdata2011j - S7103108: (tz) Support tzdata2011l - S7103405: Correct display names for Pacific/Apia timezone - S7104126: Insert openjdk copyright header back into TZdata files - S7158483: (tz) Support tzdata2012c - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S7198570: (tz) Support tzdata2012f - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node - S8002225: (tz) Support tzdata2012i - S8009165: Fix for 8006435 needs revision - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 - S8009530: ICU Kern table support broken - S8009610: Blacklist certificate used with malware. - S8009987: (tz) Support tzdata2013b - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance - S8010939: Deadlock in LogManager - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows - S8011557: Improve reflection utility classes - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 New in release 1.12.6 (2013-07-10): * Security fixes - S6741606, CVE-2013-2407: Integrate Apache Santuario - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls - S7170730, CVE-2013-2451: Improve Windows network stack support. - S8000638, CVE-2013-2450: Improve deserialization - S8000642, CVE-2013-2446: Better handling of objects for transportation - S8001032: Restrict object access - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers - S8001034, CVE-2013-1500: Memory management improvements - S8001038, CVE-2013-2444: Resourcefully handle resources - S8001043: Clarify definition restrictions - S8001309: Better handling of annotation interfaces - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost - S8001330, CVE-2013-2443: Improve on checking order - S8003703, CVE-2013-2412: Update RMI connection dialog box - S8004584: Augment applet contextualization - S8005007: Better glyph processing - S8006328, CVE-2013-2448: Improve robustness of sound classes - S8006611: Improve scripting - S8007467: Improve robustness of JMX internal APIs - S8007471: Improve MBean notifications - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes - S8008120, CVE-2013-2457: Improve JMX class checking - S8008124, CVE-2013-2453: Better compliance testing - S8008128: Better API coherence for JMX - S8008132, CVE-2013-2456: Better serialization support - S8008585: Better JMX data handling - S8008593: Better URLClassLoader resource management - S8008603: Improve provision of JMX providers - S8008611: Better handling of annotations in JMX - S8008615: Improve robustness of JMX internal APIs - S8008623: Better handling of MBeanServers - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 - S8008982: Adjust JMX for underlying interface changes - S8009004: Better implementation of RMI connections - S8009013: Better handling of T2K glyphs - S8009034: Improve resulting notifications in JMX - S8009038: Improve JMX notification support - S8009067: Improve storing keys in KeyStore - S8009071, CVE-2013-2459: Improve shape handling - S8009235: Improve handling of TSA data - S8011243, CVE-2013-2470: Improve ImagingLib - S8011248, CVE-2013-2471: Better Component Rasters - S8011253, CVE-2013-2472: Better Short Component Rasters - S8011257, CVE-2013-2473: Better Byte Component Rasters - S8012375, CVE-2013-1571: Improve Javadoc framing - S8012421: Better positioning of PairPositioning - S8012438, CVE-2013-2463: Better image validation - S8012597, CVE-2013-2465: Better image channel verification - S8012601, CVE-2013-2469: Better validation of image layouts - S8014281, CVE-2013-2461: Better checking of XML signature - S8015997: Additional improvement in Javadoc framing * Backports - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 - S6541350: TimeZone display names localization - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications. - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form - S6821191: Timezone display name localization - S6851834: Javadoc doclet needs a structured approach to generate the output HTML. - S6888167: memory leaks in the medialib glue code - S6961178: Allow doclet.xml to contain XML attributes - S6977550: (tz) Support tzdata2010l - S6996686: (tz) Support tzdata2010o - S7006270: Several javadoc regression tests are failing on windows - S7017800: (tz) Support tzdata2011b - S7027387: (tz) Support tzdata2011d - S7033174: (tz) Support tzdata2011e - S7039469: (tz) Support tzdata2011g - S7090843: (tz) Support tzdata2011j - S7103108: (tz) Support tzdata2011l - S7103405: Correct display names for Pacific/Apia timezone - S7104126: Insert openjdk copyright header back into TZdata files - S7158483: (tz) Support tzdata2012c - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S7198570: (tz) Support tzdata2012f - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node - S8002225: (tz) Support tzdata2012i - S8009165: Fix for 8006435 needs revision - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 - S8009530: ICU Kern table support broken - S8009610: Blacklist certificate used with malware. - S8009987: (tz) Support tzdata2013b - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance - S8010939: Deadlock in LogManager - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows - S8011557: Improve reflection utility classes - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 The tarballs can be downloaded from: http://icedtea.classpath.org/download/source/icedtea6-1.11.12.tar.gz http://icedtea.classpath.org/download/source/icedtea6-1.12.6.tar.gz SHA256 checksum: 7b2dbad30b233a631dea6631385570ebfa851390e359fd2ef193da0f76a9d884 icedtea6-1.11.12.tar.gz 18d98fd05ef8d5088b09c444e0b025a8295181c6ae2efb6ebefe0a0397062865 icedtea6-1.12.6.tar.gz The tarballs are accompanied by a digital signature available at: http://icedtea.classpath.org/download/source/icedtea6-1.11.12.tar.gz.sig http://icedtea.classpath.org/download/source/icedtea6-1.12.6.tar.gz.sig respectively. This is produced using my public key. See details below. PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 The following people helped with these releases: * Severin Gehwolf (S7170730, S8008132, S8008585, S8009067) * Andrew Hughes (all other security backports and dependencies, build patches, release management) * Omair Majid (non-security 7u25 backports) * Chris Phillips (HotSpot security backports) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-${ver}.tar.gz $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-${ver}/configure $ make where ${ver} is the version used. Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/9db2d082/attachment.bin From andrew at icedtea.classpath.org Wed Jul 10 09:09:04 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 10 Jul 2013 16:09:04 +0000 Subject: /hg/release/icedtea6-1.12: Added tag icedtea6-1.12.6 for changes... Message-ID: changeset c0fe7f2171d4 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=c0fe7f2171d4 author: Andrew John Hughes date: Wed Jul 10 17:08:55 2013 +0100 Added tag icedtea6-1.12.6 for changeset 72801116cb84 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 72801116cb84 -r c0fe7f2171d4 .hgtags --- a/.hgtags Wed Jul 10 15:13:09 2013 +0100 +++ b/.hgtags Wed Jul 10 17:08:55 2013 +0100 @@ -28,3 +28,4 @@ 37209dd4b07599b5f83b33c63daae8d37c708e39 icedtea6-1.12.3 5e17710282ddf2938993ae2077028cff3786c048 icedtea6-1.12.4 d66e262a38085bde02921a6c8001b5f7c144600c icedtea6-1.12.5 +72801116cb84cf2c644e3bc273ec810597de29ea icedtea6-1.12.6 From jvanek at icedtea.classpath.org Wed Jul 10 09:32:31 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 10 Jul 2013 16:32:31 +0000 Subject: /hg/icedtea-web: Implemented new about dialogue (by Andrew Azore... Message-ID: changeset c806308b6529 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c806308b6529 author: Jiri Vanek date: Wed Jul 10 18:31:48 2013 +0200 Implemented new about dialogue (by Andrew Azores). Andrew added to authors diffstat: AUTHORS | 1 + ChangeLog | 33 + Makefile.am | 117 +++-- extra/net/sourceforge/javaws/about/HTMLPanel.java | 59 --- extra/net/sourceforge/javaws/about/Main.java | 117 ------ extra/net/sourceforge/javaws/about/resources/about.html | 28 - extra/net/sourceforge/javaws/about/resources/applications.html | 36 - extra/net/sourceforge/javaws/about/resources/jamIcon.jpg | Bin extra/net/sourceforge/javaws/about/resources/notes.html | 99 ----- netx/net/sourceforge/jnlp/about/AboutDialog.java | 192 ++++++++++ netx/net/sourceforge/jnlp/about/HTMLPanel.java | 84 ++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 12 + netx/net/sourceforge/jnlp/resources/about.html | 44 ++ netx/net/sourceforge/jnlp/resources/about.jnlp | 17 - netx/net/sourceforge/jnlp/resources/itw_logo.png | Bin netx/net/sourceforge/jnlp/resources/jamIcon.jpg | Bin netx/net/sourceforge/jnlp/runtime/Boot.java | 72 +-- 17 files changed, 470 insertions(+), 441 deletions(-) diffs (truncated from 1140 to 500 lines): diff -r 87c9fc859a21 -r c806308b6529 AUTHORS --- a/AUTHORS Fri Jun 28 09:45:11 2013 -0400 +++ b/AUTHORS Wed Jul 10 18:31:48 2013 +0200 @@ -2,6 +2,7 @@ Please keep this list in alphabetical order. Lillian Angel +Andrew Azores Deepak Bhole Ricardo Mart??n Camarero Danesh Dadachanji diff -r 87c9fc859a21 -r c806308b6529 ChangeLog --- a/ChangeLog Fri Jun 28 09:45:11 2013 -0400 +++ b/ChangeLog Wed Jul 10 18:31:48 2013 +0200 @@ -1,3 +1,36 @@ +2013-06-06 Jiri Vanek + Andrew Azores + + New about dialogue + * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, added + new stamp to create HTML for AboutDialog + * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of extras into + netx and renamed from Main. New Swing layout and uses HTML files + generated in Makefile. + * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of + extras into netx. Added ability to click hyperlinks. + * netx/net/sourceforge/jnlp/runtime/Boot.java + (main, getAboutFile, getJNLPFile, itwInfoMessage): changed way of launching + About dialog to using new static display method rather than JNLP launch. + Removed methods relating to JNLP launch. More informative and nicely + formatted -headless information. + * netx/net/sourceforge/jnlp/resources/Messages.properties + (BAboutITW, BFileInfoAuthors, BFileInfoCopying, BFileInfoNews): added new + messages for javaws -about -headless launch + * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras + into netx. Added more content, changed formatting. + * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer needed + * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for About + dialog. Modified version of javaws_splash.png + * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of extras + into netx + * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx + * extra/net/sourceforge/javaws/about/Main.java: same + * extra/net/sourceforge/javaws/about/resources/about.html: same + * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same + * extra/net/sourceforge/javaws/about/resources/applications.html: removed + * extra/net/sourceforge/javaws/about/resources/notes.html: removed + 2013-06-28 Adam Domurad * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java diff -r 87c9fc859a21 -r c806308b6529 Makefile.am --- a/Makefile.am Fri Jun 28 09:45:11 2013 -0400 +++ b/Makefile.am Wed Jul 10 18:31:48 2013 +0200 @@ -5,8 +5,6 @@ export NETX_DIR = $(abs_top_builddir)/netx.build export NETX_SRCDIR = $(abs_top_srcdir)/netx export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources -export NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources -export NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources export REPORT_STYLES_DIRNAME=report-styles @@ -132,6 +130,7 @@ export PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \ + net.sourceforge.jnlp.about \ net.sourceforge.jnlp.cache net.sourceforge.jnlp.config \ net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \ net.sourceforge.jnlp.runtime net.sourceforge.jnlp.security \ @@ -192,9 +191,6 @@ export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION) -export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \ - itweb-settings.desktop.in $(top_srcdir)/tests - # reproducers `D`shortcuts export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws) @@ -224,12 +220,12 @@ # Top-Level Targets # ================= -all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \ +all-local: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \ javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop check-local: $(RHINO_TESTS) $(JUNIT_TESTS) -clean-local: clean-netx clean-plugin clean-liveconnect clean-extra \ +clean-local: clean-netx clean-plugin clean-liveconnect \ clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests clean-bootstrap-directory if [ -e stamps ] ; then \ rmdir stamps ; \ @@ -249,13 +245,11 @@ ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) - ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) install-data-local: ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1 - ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) if ENABLE_DOCS ${mkinstalldirs} $(DESTDIR)$(htmldir) (cd ${abs_top_builddir}/docs/netx; \ @@ -276,8 +270,6 @@ rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar - rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp - rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar rm -f $(DESTDIR)$(mandir)/man1/javaws.1 rm -f $(DESTDIR)$(bindir)/$(javaws) rm -f $(DESTDIR)$(bindir)/$(itweb_settings) @@ -466,7 +458,74 @@ sed -i '/VariableX509TrustManagerJDK7/ d' $@ endif -stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp +stamps/netx-html-gen.stamp: + (cd $$NETX_SRCDIR/..; \ + mkdir -p html-gen; \ + cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ + cd html-gen/; \ + for FILE in NEWS AUTHORS COPYING ChangeLog; \ + do \ + sed -r \ + -e "s/\t/ /g" $(: Convert tabs into four spaces) \ + -e "s/\&/\&/g" $(: "&" -> "&") \ + -e "s/ /\ \ /g" $(: Double-spaces into HTML whitespace for formatting) \ + -e "s/ "<") \ + -e "s/>/\>/g" $(: ">" -> ">") \ + -e 's/(\<)?(https?:\/\/[^ ]*)(\>| |$$)/\1\2<\/a>\3/i' $(: Creates hyperlinks from http/https URLs) \ + -e 's/\<(.*@.*)\>/\<\1<\/a>\>/i' $(: Create mailto links from email addresses formatted as ) \ + -e "s/$$/
/g" $(: "\n" -> "
") \ + "./$$FILE" > "./$$FILE.html"; \ + done; \ + sed -i '4i
' AUTHORS.html; \ + sed -i '5i
Jam Icon

' AUTHORS.html; $(: Insert jamIcon into AUTHORS.html and center the authors list)\ + echo "
" >> AUTHORS.html; \ + for FILE in NEWS.html ChangeLog.html; \ + do \ + mv $$FILE "$$FILE.old"; \ + COUNTER=0; \ + while read LINE; \ + do \ + BOLD=1; \ + if [[ $$FILE == "NEWS.html" ]]; \ + then \ + if [[ $$LINE =~ New\ in\ release* ]]; \ + then \ + BOLD=0; \ + COUNTER=$$(( $$COUNTER + 1 )); \ + fi; \ + if [[ $$COUNTER -gt 2 ]]; $(: Cut to two releases)\ + then \ + break; \ + fi; \ + else \ + if [[ $$LINE =~ .*\<\;.*\@.*\>\; ]]; $(: Matches eg , after HTML-escaping)\ + then \ + BOLD=0; \ + fi; \ + if [[ $$LINE =~ [0-9]{4}-[0-9]{2}-[0-9]{2}* ]]; $(: Matches eg 2013-07-01)\ + then \ + COUNTER=$$(( $$COUNTER + 1 )); \ + fi; \ + if [[ $$COUNTER -gt 10 ]]; $(: Cut to ten changesets)\ + then \ + break; \ + fi; \ + fi; \ + if [[ $$BOLD -eq 0 ]]; $(: Highlight "New In Release" in News, and author name lines in ChangeLog) \ + then \ + echo "$$LINE" >> $$FILE; \ + else \ + echo "$$LINE" >> $$FILE; \ + fi; \ + done < "$$FILE.old"; \ + rm $$FILE.old; \ + done) + ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR) + rm -r $(NETX_SRCDIR)/../html-gen/ + mkdir -p stamps + touch $@ + +stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp mkdir -p $(NETX_DIR) $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(NETX_DIR) \ @@ -503,37 +562,13 @@ rm -f stamps/netx-dist.stamp rm -f netx-source-files.txt rm -f stamps/netx.stamp + rm -f stamps/netx-html-gen.stamp + rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html clean-desktop-files: rm -f javaws.desktop rm -f itweb-settings.desktop -# extras -- used to create about.jar for javaws. -extra-source-files.txt: - find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ - -stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp - mkdir -p extra-lib - $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \ - -sourcepath $(abs_top_srcdir)/extra -cp netx.build \ - -bootclasspath $(RUNTIME) @extra-source-files.txt - (cd $(NETX_EXTRA_DIR); \ - for files in $$(find . -type f); \ - do \ - ${INSTALL_DATA} -D $${files} \ - $(NETX_EXTRA_DIST_DIR)/$${files}; \ - done) - mkdir -p stamps - touch $@ - -clean-extra: - rm -rf extra-lib - rm -f stamps/extra-class-files.stamp - rm -f extra-source-files.txt - -extra-lib/about.jar: stamps/extra-class-files.stamp - $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; - launcher.build/$(javaws): launcher/launchers.in mkdir -p launcher.build MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\ @@ -865,7 +900,7 @@ $(MAKE) ; \ mv $(SOFTKILLER) $(TESTS_DIR)/ -stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \ +stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \ javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \ stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public $(TESTS_DIR)/softkiller \ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\ @@ -910,7 +945,7 @@ #although this targets will indeed create symbolic links to enable #icedtea-web plugin inside browser it is intended for testing purposes if ENABLE_PLUGIN -stamps/user-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp \ +stamps/user-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp \ launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) if [ $(MOZILLA_FAMILY_TEST) ] ; then \ if [ -e $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ] ; then \ @@ -940,7 +975,7 @@ rm -f stamps/user-links.stamp ; \ fi -stamps/global-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \ +stamps/global-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \ stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) if [ $(MOZILLA_FAMILY_TEST) ] ; then \ dir="$(MOZILLA_GLOBAL32_PLUGINDIR)" ; \ diff -r 87c9fc859a21 -r c806308b6529 extra/net/sourceforge/javaws/about/HTMLPanel.java --- a/extra/net/sourceforge/javaws/about/HTMLPanel.java Fri Jun 28 09:45:11 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* HTMLPanel.java - Copyright (C) 2008 Red Hat, Inc. - -This file is part of IcedTea. - -IcedTea is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. - -IcedTea 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 for more details. - -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. -*/ - -package net.sourceforge.javaws.about; - -import java.awt.BorderLayout; -import java.io.IOException; -import java.net.URL; - -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JEditorPane; - -public class HTMLPanel extends JPanel { - - JEditorPane pane; - - public HTMLPanel(URL url) throws IOException { - super(new BorderLayout()); - pane = new JEditorPane(url); - pane.setEditable(false); - JScrollPane scroller = new JScrollPane(pane); - add(scroller, BorderLayout.CENTER); - } -} diff -r 87c9fc859a21 -r c806308b6529 extra/net/sourceforge/javaws/about/Main.java --- a/extra/net/sourceforge/javaws/about/Main.java Fri Jun 28 09:45:11 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -/* Main.java - Copyright (C) 2008 Red Hat, Inc. - -This file is part of IcedTea. - -IcedTea is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. - -IcedTea 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 for more details. - -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. -*/ - -package net.sourceforge.javaws.about; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Toolkit; -import java.io.IOException; - -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import javax.swing.UIManager; - - -public class Main extends JPanel { - - private final String notes = "/net/sourceforge/javaws/about/resources/notes.html"; - private final String apps = "/net/sourceforge/javaws/about/resources/applications.html"; - private final String about = "/net/sourceforge/javaws/about/resources/about.html"; - JTabbedPane tabbedPane; - - public Main() throws IOException { - super(new BorderLayout()); - - HTMLPanel notesPanel = new HTMLPanel(getClass().getResource(notes)); - HTMLPanel appsPanel = new HTMLPanel(getClass().getResource(apps)); - HTMLPanel aboutPanel = new HTMLPanel(getClass().getResource(about)); - - - - tabbedPane = new JTabbedPane(); - - tabbedPane.add("About IcedTea-Web and NetX", aboutPanel); - tabbedPane.add("Applications", appsPanel); - tabbedPane.add("Notes", notesPanel); - - tabbedPane.setPreferredSize(new Dimension(550,410)); - add(tabbedPane, BorderLayout.CENTER); - } - - private static void createAndShowGUI() { - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { - } - - JFrame frame = new JFrame("About IcedTea-Web and NetX"); - frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - Main demo = null; - try { - demo = new Main(); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - demo.setOpaque(true); - frame.setContentPane(demo); - frame.pack(); - centerDialog(frame); - frame.setVisible(true); - } - - private static void centerDialog(JFrame frame) { - Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); - Dimension dialogSize = frame.getSize(); - - frame.setLocation((screen.width - dialogSize.width)/2, - (screen.height - dialogSize.height)/2); - } - - public static void main(String[] args) { - javax.swing.SwingUtilities.invokeLater(new Runnable() { - public void run() { - createAndShowGUI(); - } - }); - } - - -} diff -r 87c9fc859a21 -r c806308b6529 extra/net/sourceforge/javaws/about/resources/about.html --- a/extra/net/sourceforge/javaws/about/resources/about.html Fri Jun 28 09:45:11 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ - - - - - - - -

IcedTea-Web

is a high-quality JNLP client, built on NetX, that executes - network-based applications. -
NetX downloads code over the - network, caches it, and runs it in a secure sandbox - environment (unless signed). -

- Features of NetX: - -
    -
  • Modular: Easily add JNLP capabilities to an application.
  • -
  • Small Size: Loads from a ~130K JAR file.
  • -
  • Saves Memory: Launch programs in a shared JVM.
  • -
  • Fast startup: Runs applications from a cache for fast starting.
  • -
  • Security: Run any application in a sandbox or log its activities.
  • -
  • Auto-Update: Applications can auto-update without special code.
  • -
  • Network Deployment: Deploy to the internet, not with installers.
  • -
  • Open Source: GNU Lesser General Public License.
  • -
- - - diff -r 87c9fc859a21 -r c806308b6529 extra/net/sourceforge/javaws/about/resources/applications.html --- a/extra/net/sourceforge/javaws/about/resources/applications.html Fri Jun 28 09:45:11 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ - - - -Applications - - - -Sample Applications:
-   
jDiskReport - http://www.jGoodies.com/download/jdiskreport/jdiskreport.jnlp
-   jPathReport - http://www.jgoodies.com/download/jpathreport/jpathreport.jnlp
-   Skin L2F Demo - http://www.L2FProd.com/software/skinlf/jnlp/demo.php
-   Secure FTP - http://www.glub.com/products/secureftp/secureftp.jnlp
-   Jext - http://www.jext.org/apps/jext.jnlp
-   Java Music Player - http://www.javazoom.net/jlgui/jws/jlgui.jnlp
-
-Apps using netx:
-   Java Start Button - http://jnlp.sourceforge.net/netx/start/start.jnlp
-
From jvanek at redhat.com Wed Jul 10 09:35:30 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 10 Jul 2013 18:35:30 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DD6C89.1010000@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> Message-ID: <51DD8D52.3010604@redhat.com> On 07/10/2013 04:15 PM, Andrew Azores wrote: > On 07/09/2013 01:28 PM, Andrew Azores wrote: >> On 07/09/2013 12:23 PM, Andrew Azores wrote: >>> On 07/09/2013 11:46 AM, Andrew Azores wrote: >>>> Changelog: >>>> * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, added new stamp to create >>>> HTML for AboutDialog >>>> * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of extras into netx and renamed >>>> from Main. New Swing layout and uses HTML files generated in Makefile. >>>> * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras into netx. Added ability >>>> to click hyperlinks. >>>> * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, getJNLPFile, itwInfoMessage): >>>> changed way of launching About dialog to using new static display method rather than JNLP >>>> launch. Removed methods relating to JNLP launch. More informative and nicely formatted -headless >>>> information. >>>> >>>> * netx/net/sourceforge/jnlp/resources/Messages.properties (BAboutITW, BFileInfoAuthors, >>>> BFileInfoCopying, BFileInfoNews): added new messages for javaws -about -headless launch >>>> * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras into netx. Added more >>>> content, changed formatting. >>>> * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer needed >>>> * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for About dialog. Modified version >>>> of javaws_splash.png >>>> * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of extras into netx >>>> >>>> * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx >>>> * extra/net/sourceforge/javaws/about/Main.java: same >>>> * extra/net/sourceforge/javaws/about/resources/about.html: same >>>> * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same >>>> * extra/net/sourceforge/javaws/about/resources/applications.html: removed >>>> * extra/net/sourceforge/javaws/about/resources/notes.html: removed >>> >>> And here is the new itw_logo.png. >>> >>> Andrew A >>> >> Updated patches so that the button labels in the AboutDialog are localized. >> >> Andrew A > Everything all together in one big patch file as per request. > > Andrew A Hi! Pushed[1] Few nits - I have added prefix to you properties keys - fixed by accident dirty netx-dist-tests-whitelist - you have been added to AUTHORS well news file should be updated.... I will do this with one minor About improvement. This was huge commit. Please double chek I did it correctly (clone, build verify commit message and my push diff and whatever cross your mind) Nice work! Thank you J. [1] http://icedtea.classpath.org/hg/icedtea-web/rev/c806308b6529 From omajid at redhat.com Wed Jul 10 09:58:41 2013 From: omajid at redhat.com (Omair Majid) Date: Wed, 10 Jul 2013 12:58:41 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DD6C89.1010000@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> Message-ID: <51DD92C1.7010303@redhat.com> On 07/10/2013 10:15 AM, Andrew Azores wrote: > Everything all together in one big patch file as per request. One suggestion: > + (cd $$NETX_SRCDIR/..; \ > + mkdir -p html-gen; \ > + cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ > + cd html-gen/; \ > + for FILE in NEWS AUTHORS COPYING ChangeLog; \ > + do \ > + sed -r \ > + -e "s/\t/ /g" $(: Convert tabs into four spaces) \ > + -e "s/\&/\&/g" $(: "&" -> "&") \ > + -e "s/ /\ \ /g" $(: Double-spaces into HTML whitespace for formatting) \ > + -e "s/ "<") \ > + -e "s/>/\>/g" $(: ">" -> ">") \ > + -e 's/(\<)?(https?:\/\/[^ ]*)(\>| |$$)/\1\2<\/a>\3/i' $(: Creates hyperlinks from http/https URLs) \ > + -e 's/\<(.*@.*)\>/\<\1<\/a>\>/i' $(: Create mailto links from email addresses formatted as ) \ > + -e "s/$$/
/g" $(: "\n" -> "
") \ > + "./$$FILE" > "./$$FILE.html"; \ > + done; \ > + sed -i '4i
' AUTHORS.html; \ > + sed -i '5i
Jam Icon

' AUTHORS.html; $(: Insert jamIcon into AUTHORS.html and center the authors list)\ > + echo "
" >> AUTHORS.html; \ > + for FILE in NEWS.html ChangeLog.html; \ > + do \ > + mv $$FILE "$$FILE.old"; \ > + COUNTER=0; \ > + while read LINE; \ > + do \ > + BOLD=1; \ > + if [[ $$FILE == "NEWS.html" ]]; \ > + then \ > + if [[ $$LINE =~ New\ in\ release* ]]; \ > + then \ > + BOLD=0; \ > + COUNTER=$$(( $$COUNTER + 1 )); \ > + fi; \ > + if [[ $$COUNTER -gt 2 ]]; $(: Cut to two releases)\ > + then \ > + break; \ > + fi; \ > + else \ > + if [[ $$LINE =~ .*\<\;.*\@.*\>\; ]]; $(: Matches eg , after HTML-escaping)\ > + then \ > + BOLD=0; \ > + fi; \ > + if [[ $$LINE =~ [0-9]{4}-[0-9]{2}-[0-9]{2}* ]]; $(: Matches eg 2013-07-01)\ > + then \ > + COUNTER=$$(( $$COUNTER + 1 )); \ > + fi; \ > + if [[ $$COUNTER -gt 10 ]]; $(: Cut to ten changesets)\ > + then \ > + break; \ > + fi; \ > + fi; \ > + if [[ $$BOLD -eq 0 ]]; $(: Highlight "New In Release" in News, and author name lines in ChangeLog) \ > + then \ > + echo "$$LINE" >> $$FILE; \ > + else \ > + echo "$$LINE" >> $$FILE; \ > + fi; \ > + done < "$$FILE.old"; \ > + rm $$FILE.old; \ > + done) At some point, it might be a good idea to make this a stand-alone script and invoke it from make. Keeping all this included in the Makefile (with all the line-continuations) looks rather painful. Cheers, Omair From aazores at redhat.com Wed Jul 10 09:57:22 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 10 Jul 2013 12:57:22 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DD8D52.3010604@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD8D52.3010604@redhat.com> Message-ID: <51DD9272.4010507@redhat.com> On 07/10/2013 12:35 PM, Jiri Vanek wrote: > On 07/10/2013 04:15 PM, Andrew Azores wrote: >> On 07/09/2013 01:28 PM, Andrew Azores wrote: >>> On 07/09/2013 12:23 PM, Andrew Azores wrote: >>>> On 07/09/2013 11:46 AM, Andrew Azores wrote: >>>>> Changelog: >>>>> * Makefile.am (stamps/netx-html-gen): removed logic for >>>>> extras.jar, added new stamp to create >>>>> HTML for AboutDialog >>>>> * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of >>>>> extras into netx and renamed >>>>> from Main. New Swing layout and uses HTML files generated in >>>>> Makefile. >>>>> * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of >>>>> extras into netx. Added ability >>>>> to click hyperlinks. >>>>> * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, >>>>> getJNLPFile, itwInfoMessage): >>>>> changed way of launching About dialog to using new static display >>>>> method rather than JNLP >>>>> launch. Removed methods relating to JNLP launch. More informative >>>>> and nicely formatted -headless >>>>> information. >>>>> >>>>> * netx/net/sourceforge/jnlp/resources/Messages.properties >>>>> (BAboutITW, BFileInfoAuthors, >>>>> BFileInfoCopying, BFileInfoNews): added new messages for javaws >>>>> -about -headless launch >>>>> * netx/net/sourceforge/jnlp/resources/about.html: moved out of >>>>> extras into netx. Added more >>>>> content, changed formatting. >>>>> * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no >>>>> longer needed >>>>> * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for >>>>> About dialog. Modified version >>>>> of javaws_splash.png >>>>> * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of >>>>> extras into netx >>>>> >>>>> * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx >>>>> * extra/net/sourceforge/javaws/about/Main.java: same >>>>> * extra/net/sourceforge/javaws/about/resources/about.html: same >>>>> * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same >>>>> * extra/net/sourceforge/javaws/about/resources/applications.html: >>>>> removed >>>>> * extra/net/sourceforge/javaws/about/resources/notes.html: removed >>>> >>>> And here is the new itw_logo.png. >>>> >>>> Andrew A >>>> >>> Updated patches so that the button labels in the AboutDialog are >>> localized. >>> >>> Andrew A >> Everything all together in one big patch file as per request. >> >> Andrew A > > Hi! > > Pushed[1] > > Few nits > - I have added prefix to you properties keys > - fixed by accident dirty netx-dist-tests-whitelist > - you have been added to AUTHORS > > well news file should be updated.... I will do this with one minor > About improvement. > > > This was huge commit. Please double chek I did it correctly (clone, > build verify commit message and my push diff and whatever cross your > mind) > > > Nice work! > > Thank you > J. > > [1] http://icedtea.classpath.org/hg/icedtea-web/rev/c806308b6529 Noticed one minor thing, attached the patch for it... :) Otherwise, yes looks like everything is correct and worked properly. Thanks! I'm glad to see myself in the Authors tab of the About dialog(ue)... doubly rewarding! Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: temp_javaws_about.patch Type: text/x-patch Size: 742 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/5d76e99b/temp_javaws_about.patch From aazores at redhat.com Wed Jul 10 12:27:38 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 10 Jul 2013 15:27:38 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DD92C1.7010303@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> Message-ID: <51DDB5AA.2060500@redhat.com> On 07/10/2013 12:58 PM, Omair Majid wrote: > At some point, it might be a good idea to make this a stand-alone > script and invoke it from make. Keeping all this included in the > Makefile (with all the line-continuations) looks rather painful. Excellent idea. Changelog: * Makefile.am (stamps/html-gen): moved plaintext-to-HTML logic into new shell script. * html-gen.sh: contains plaintext-to-HTML logic previously found in Makefile.am. Added a sed command to cause changelog file listing entries to be underlined. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: refactor1.patch Type: text/x-patch Size: 5219 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130710/00759f5c/refactor1.patch From andrew at icedtea.classpath.org Wed Jul 10 13:25:02 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 10 Jul 2013 20:25:02 +0000 Subject: /hg/release/icedtea6-1.11: 2 new changesets Message-ID: changeset 768fb94a9989 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=768fb94a9989 author: Andrew John Hughes date: Wed Jul 10 20:14:07 2013 +0100 Fix ChangeLog to remove fragment that wasn't backported. 2013-07-10 Andrew John Hughes * ChangeLog: Remove fragment that wasn't backported. changeset 898aa9174be7 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=898aa9174be7 author: Andrew John Hughes date: Wed Jul 10 21:24:54 2013 +0100 Start 1.11.13 release cycle. 2013-07-10 Andrew John Hughes * configure.ac: Set to 1.11.13pre. * NEWS: Add 1.11.13 section. diffstat: ChangeLog | 14 ++++++++++---- NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diffs (49 lines): diff -r b8d450756cc9 -r 898aa9174be7 ChangeLog --- a/ChangeLog Wed Jul 10 13:40:03 2013 +0100 +++ b/ChangeLog Wed Jul 10 21:24:54 2013 +0100 @@ -1,3 +1,13 @@ +2013-07-10 Andrew John Hughes + + * configure.ac: Set to 1.11.13pre. + * NEWS: Add 1.11.13 section. + +2013-07-10 Andrew John Hughes + + * ChangeLog: Remove fragment that wasn't + backported. + 2013-07-10 Andrew John Hughes * NEWS: Bump release date. @@ -19,10 +29,6 @@ * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException. - (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, - no-sun-classes, bootstrap-tools and xbootclasspath - patches from icedtea.patch. Make the latter two - conditional. * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath and -Xbootclasspath/a by prepending, setting or appending its value to the bootclasspath option used to ecj, diff -r b8d450756cc9 -r 898aa9174be7 NEWS --- a/NEWS Wed Jul 10 13:40:03 2013 +0100 +++ b/NEWS Wed Jul 10 21:24:54 2013 +0100 @@ -11,6 +11,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.11.13 (2013-XX-XX): + New in release 1.11.12 (2013-07-10): * Security fixes diff -r b8d450756cc9 -r 898aa9174be7 configure.ac --- a/configure.ac Wed Jul 10 13:40:03 2013 +0100 +++ b/configure.ac Wed Jul 10 21:24:54 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.11.12],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.11.13pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Wed Jul 10 13:26:48 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 10 Jul 2013 20:26:48 +0000 Subject: /hg/release/icedtea6-1.12: Start 1.12.7 release cycle. Message-ID: changeset a8496c2dd880 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=a8496c2dd880 author: Andrew John Hughes date: Wed Jul 10 21:26:41 2013 +0100 Start 1.12.7 release cycle. 2013-07-10 Andrew John Hughes * configure.ac: Set to 1.12.7pre. * NEWS: Add 1.12.7 section. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r c0fe7f2171d4 -r a8496c2dd880 ChangeLog --- a/ChangeLog Wed Jul 10 17:08:55 2013 +0100 +++ b/ChangeLog Wed Jul 10 21:26:41 2013 +0100 @@ -1,3 +1,8 @@ +2013-07-10 Andrew John Hughes + + * configure.ac: Set to 1.12.7pre. + * NEWS: Add 1.12.7 section. + 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: diff -r c0fe7f2171d4 -r a8496c2dd880 NEWS --- a/NEWS Wed Jul 10 17:08:55 2013 +0100 +++ b/NEWS Wed Jul 10 21:26:41 2013 +0100 @@ -11,6 +11,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.12.7 (2013-XX-XX): + New in release 1.12.6 (2013-07-10): * Security fixes diff -r c0fe7f2171d4 -r a8496c2dd880 configure.ac --- a/configure.ac Wed Jul 10 17:08:55 2013 +0100 +++ b/configure.ac Wed Jul 10 21:26:41 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.12.6],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.12.7pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From omajid at redhat.com Wed Jul 10 14:38:56 2013 From: omajid at redhat.com (Omair Majid) Date: Wed, 10 Jul 2013 17:38:56 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DDB5AA.2060500@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> Message-ID: <51DDD470.9090901@redhat.com> Hi, On 07/10/2013 03:27 PM, Andrew Azores wrote: > On 07/10/2013 12:58 PM, Omair Majid wrote: >> At some point, it might be a good idea to make this a stand-alone >> script and invoke it from make. Keeping all this included in the >> Makefile (with all the line-continuations) looks rather painful. > > Excellent idea. I am going to assume there were no errors or typos in moving the code ;) One style nit: we spaces for indentation, as much as possible. > diff --git a/html-gen.sh b/html-gen.sh > new file mode 100755 > --- /dev/null > +++ b/html-gen.sh > @@ -0,0 +1,91 @@ > +#!/bin/sh I see a bunch of bash-isms in this script (including "[["), so you probably want /bin/bash here. bash invoked as /bin/sh is normally more lenient than other closer-to-sh shells (like dash). May I suggest adding a one or two line comment to say what this script does and how to run it? > + sed -i -r \ > + -e "s/\t/ /g" ${c: Convert tabs into four spaces}\ > + -e "s/\&/\&/g" ${c: "&" -> "&"}\ > + -e "s/ /\ \ /g" ${c: Double-spaces into HTML whitespace for formatting}\ > + -e "s/ "<"}\ > + -e "s/>/\>/g" ${c: ">" -> ">"}\ > + -e 's_(\<)?(https?://[^ ]*)(\>| |$$)_\1
\2\3_i' ${c: Creates hyperlinks from http/https URLs}\ > + -e 's/\<(.*@.*)\>/\<\1<\/a>\>/i' ${c: Create mailto links from email addresses formatted as }\ > + -e "s/$/
/g" ${c: "\n" -> "
"}\ > + "./$FILE" I would have just used multiple sed invocations + bash comments here, instead of the (rather clever) parameter expansion. But it's your call. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From bugzilla-daemon at icedtea.classpath.org Wed Jul 10 18:23:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 11 Jul 2013 01:23:58 +0000 Subject: [Bug 1494] Eclipse repeated crashes In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1494 Martin Ellison changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Martin Ellison --- As bug author, I'm closing this as it is evidently not an IcedTea issue. The latest download from http://developer.android.com/sdk/index.html#download still has a Juno release of Eclipse with the bug present, however the work-around still works for it. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/454dad7b/attachment.html From jvanek at redhat.com Wed Jul 10 23:20:05 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 11 Jul 2013 08:20:05 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DD9272.4010507@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD8D52.3010604@redhat.com> <51DD9272.4010507@redhat.com> Message-ID: <51DE4E95.3010805@redhat.com> On 07/10/2013 06:57 PM, Andrew Azores wrote: > On 07/10/2013 12:35 PM, Jiri Vanek wrote: >> On 07/10/2013 04:15 PM, Andrew Azores wrote: >>> On 07/09/2013 01:28 PM, Andrew Azores wrote: >>>> On 07/09/2013 12:23 PM, Andrew Azores wrote: >>>>> On 07/09/2013 11:46 AM, Andrew Azores wrote: >>>>>> Changelog: >>>>>> * Makefile.am (stamps/netx-html-gen): removed logic for extras.jar, added new stamp to create >>>>>> HTML for AboutDialog >>>>>> * netx/net/sourceforge/jnlp/about/AboutDialog.java: Moved out of extras into netx and renamed >>>>>> from Main. New Swing layout and uses HTML files generated in Makefile. >>>>>> * netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras into netx. Added ability >>>>>> to click hyperlinks. >>>>>> * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, getJNLPFile, itwInfoMessage): >>>>>> changed way of launching About dialog to using new static display method rather than JNLP >>>>>> launch. Removed methods relating to JNLP launch. More informative and nicely formatted -headless >>>>>> information. >>>>>> >>>>>> * netx/net/sourceforge/jnlp/resources/Messages.properties (BAboutITW, BFileInfoAuthors, >>>>>> BFileInfoCopying, BFileInfoNews): added new messages for javaws -about -headless launch >>>>>> * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras into netx. Added more >>>>>> content, changed formatting. >>>>>> * netx/net/sourceforge/jnlp/resources/about.jnlp: removed, no longer needed >>>>>> * netx/net/sourceforge/jnlp/resources/itw_logo.png: new image for About dialog. Modified version >>>>>> of javaws_splash.png >>>>>> * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: moved out of extras into netx >>>>>> >>>>>> * extra/net/sourceforge/javaws/about/HTMLPanel.java: moved into netx >>>>>> * extra/net/sourceforge/javaws/about/Main.java: same >>>>>> * extra/net/sourceforge/javaws/about/resources/about.html: same >>>>>> * extra/net/sourceforge/javaws/about/resources/jamIcon.jpg: same >>>>>> * extra/net/sourceforge/javaws/about/resources/applications.html: removed >>>>>> * extra/net/sourceforge/javaws/about/resources/notes.html: removed >>>>> >>>>> And here is the new itw_logo.png. >>>>> >>>>> Andrew A >>>>> >>>> Updated patches so that the button labels in the AboutDialog are localized. >>>> >>>> Andrew A >>> Everything all together in one big patch file as per request. >>> >>> Andrew A >> >> Hi! >> >> Pushed[1] >> >> Few nits >> - I have added prefix to you properties keys >> - fixed by accident dirty netx-dist-tests-whitelist >> - you have been added to AUTHORS >> >> well news file should be updated.... I will do this with one minor About improvement. >> >> >> This was huge commit. Please double chek I did it correctly (clone, build verify commit message >> and my push diff and whatever cross your mind) >> >> >> Nice work! >> >> Thank you >> J. >> >> [1] http://icedtea.classpath.org/hg/icedtea-web/rev/c806308b6529 > > Noticed one minor thing, attached the patch for it... :) > > Otherwise, yes looks like everything is correct and worked properly. Thanks! I'm glad to see myself > in the Authors tab of the About dialog(ue)... doubly rewarding! :) > > Andrew A When fixing this - do you mind to update also NEWS file? To mention that new about dialogue was done? > > temp_javaws_about.patch > After one more round with NEWS. it will be ok to push. > > diff --git a/netx/net/sourceforge/jnlp/about/AboutDialog.java b/netx/net/sourceforge/jnlp/about/AboutDialog.java > --- a/netx/net/sourceforge/jnlp/about/AboutDialog.java > +++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java > @@ -84,7 +84,7 @@ public class AboutDialog extends JPanel > > aboutPanel = new HTMLPanel(res_about, R("AboutDialogueTabAbout")); > authorsPanel = new HTMLPanel(res_authors, R("AboutDialogueTabAuthors")); > - newsPanel = new HTMLPanel(res_news, R("News")); > + newsPanel = new HTMLPanel(res_news, R("AboutDialogueTabNews")); > changelogPanel = new HTMLPanel(res_changelog, R("AboutDialogueTabChangelog")); > copyingPanel = new HTMLPanel(res_copying, R("AboutDialogueTabGPLv2")); > > From aazores at redhat.com Thu Jul 11 06:25:47 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 11 Jul 2013 09:25:47 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DE4E95.3010805@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD8D52.3010604@redhat.com> <51DD9272.4010507@redhat.com> <51DE4E95.3010805@redhat.com> Message-ID: <51DEB25B.8020704@redhat.com> On 07/11/2013 02:20 AM, Jiri Vanek wrote: > When fixing this - do you mind to update also NEWS file? To mention > that new about dialogue was done? Not the most descriptive thing I've ever written... but I didn't want to ramble on in the release notes about the details of it all :) Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: temp_javaws_about.patch Type: text/x-patch Size: 1174 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/5308a49c/temp_javaws_about.patch From aazores at redhat.com Thu Jul 11 07:33:40 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 11 Jul 2013 10:33:40 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DDD470.9090901@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> <51DDD470.9090901@redhat.com> Message-ID: <51DEC244.3010102@redhat.com> On 07/10/2013 05:38 PM, Omair Majid wrote: > Hi, > > On 07/10/2013 03:27 PM, Andrew Azores wrote: >> On 07/10/2013 12:58 PM, Omair Majid wrote: >>> At some point, it might be a good idea to make this a stand-alone >>> script and invoke it from make. Keeping all this included in the >>> Makefile (with all the line-continuations) looks rather painful. >> Excellent idea. > I am going to assume there were no errors or typos in moving the code ;) > > One style nit: we spaces for indentation, as much as possible. Fixed, I accidentally left expandtab unset. And I don't believe there are any errors or typos left, I've run this through its paces and it seems to work just the same as it used to while inlined in the Makefile. But there were definitely quite a few errors with it when I first moved it over. > >> diff --git a/html-gen.sh b/html-gen.sh >> new file mode 100755 >> --- /dev/null >> +++ b/html-gen.sh >> @@ -0,0 +1,91 @@ >> +#!/bin/sh > I see a bunch of bash-isms in this script (including "[["), so you > probably want /bin/bash here. bash invoked as /bin/sh is normally more > lenient than other closer-to-sh shells (like dash). Good call, I'm just too used to writing very small, definitely-sh-compliant scripts, so that shebang line is just sort of muscle memory. > May I suggest adding a one or two line comment to say what this script > does and how to run it? Also a good idea. I ended up writing a small novel. > >> + sed -i -r \ >> + -e "s/\t/ /g" ${c: Convert tabs into four spaces}\ >> + -e "s/\&/\&/g" ${c: "&" -> "&"}\ >> + -e "s/ /\ \ /g" ${c: Double-spaces into HTML whitespace for formatting}\ >> + -e "s/ "<"}\ >> + -e "s/>/\>/g" ${c: ">" -> ">"}\ >> + -e 's_(\<)?(https?://[^ ]*)(\>| |$$)_\1
\2\3_i' ${c: Creates hyperlinks from http/https URLs}\ >> + -e 's/\<(.*@.*)\>/\<\1<\/a>\>/i' ${c: Create mailto links from email addresses formatted as }\ >> + -e "s/$/
/g" ${c: "\n" -> "
"}\ >> + "./$FILE" > I would have just used multiple sed invocations + bash comments here, > instead of the (rather clever) parameter expansion. But it's your call. I've gone and done that and it does look cleaner, although now there's a "./$FILE" after every line instead of just once, and the -i -r flags every time as well. Also the script does have an elapsed time printout in "debug" mode and changing it from one monster of a sed invocation to several more manageable ones seems to have increased the total runtime of the script by about a factor of 3 (although that really means it's about a third of a second now rather than a tenth ;-) ). But this is still acceptable, I think. Changelog: * Makefile.am (stamps/html-gen): moved plaintext-to-HTML logic into new shell script. * html-gen.sh: contains plaintext-to-HTML logic previously found in Makefile.am. Added a sed expression to cause changelog file listing entries to be underlined. * AUTHORS: fixed formatting of one line (removed extra space) Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: refactor1.patch Type: text/x-patch Size: 6962 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/aedeb6e3/refactor1.patch From omajid at redhat.com Thu Jul 11 08:12:09 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 11 Jul 2013 11:12:09 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DEC244.3010102@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> <51DDD470.9090901@redhat.com> <51DEC244.3010102@redhat.com> Message-ID: <51DECB49.7060109@redhat.com> Hi, On 07/11/2013 10:33 AM, Andrew Azores wrote: > On 07/10/2013 05:38 PM, Omair Majid wrote: >> May I suggest adding a one or two line comment to say what this script >> does and how to run it? > > Also a good idea. I ended up writing a small novel. Whoops, one more thing I forgot: please add a license header to the file as well. >> >>> + sed -i -r \ >>> + -e "s/\t/ /g" ${c: Convert tabs into four spaces}\ >>> + -e "s/\&/\&/g" ${c: "&" -> "&"}\ >>> + -e "s/ /\ \ /g" ${c: Double-spaces into HTML >>> whitespace for formatting}\ >>> + -e "s/ "<"}\ >>> + -e "s/>/\>/g" ${c: ">" -> ">"}\ >>> + -e 's_(\<)?(https?://[^ ]*)(\>| |$$)_\1
>> href="\2">\2\3_i' ${c: Creates hyperlinks from http/https URLs}\ >>> + -e 's/\<(.*@.*)\>/\<>> href="mailto:\1\?subject=IcedTea-Web">\1<\/a>\>/i' ${c: Create >>> mailto links from email addresses formatted as }\ >>> + -e "s/$/
/g" ${c: "\n" -> "
"}\ >>> + "./$FILE" >> I would have just used multiple sed invocations + bash comments here, >> instead of the (rather clever) parameter expansion. But it's your call. > > I've gone and done that and it does look cleaner, although now there's a > "./$FILE" after every line instead of just once, and the -i -r flags > every time as well. Also the script does have an elapsed time printout > in "debug" mode and changing it from one monster of a sed invocation to > several more manageable ones seems to have increased the total runtime > of the script by about a factor of 3 (although that really means it's > about a third of a second now rather than a tenth ;-) ). But this is > still acceptable, I think. If this is invoked only once during the build and is sub-second, I think it's acceptable. > Changelog: > * Makefile.am (stamps/html-gen): moved plaintext-to-HTML logic into new > shell script. > * html-gen.sh: contains plaintext-to-HTML logic previously found in > Makefile.am. Added a sed expression to cause changelog file listing entries > to be underlined. > * AUTHORS: fixed formatting of one line (removed extra space) > > Andrew A Looks good to me. Please include a hg export'ed patch and I will be happy to push it for you. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From aazores at redhat.com Thu Jul 11 08:53:36 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 11 Jul 2013 11:53:36 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DECB49.7060109@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> <51DDD470.9090901@redhat.com> <51DEC244.3010102@redhat.com> <51DECB49.7060109@redhat.com> Message-ID: <51DED500.4040305@redhat.com> On 07/11/2013 11:12 AM, Omair Majid wrote: > Looks good to me. Please include a hg export'ed patch and I will be > happy to push it for you. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: javaws_about_exported.patch Type: text/x-patch Size: 9104 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/3e6afbfc/javaws_about_exported.patch From omajid at redhat.com Thu Jul 11 09:10:00 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 11 Jul 2013 12:10:00 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DED500.4040305@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> <51DDD470.9090901@redhat.com> <51DEC244.3010102@redhat.com> <51DECB49.7060109@redhat.com> <51DED500.4040305@redhat.com> Message-ID: <51DED8D8.1060306@redhat.com> On 07/11/2013 11:53 AM, Andrew Azores wrote: > On 07/11/2013 11:12 AM, Omair Majid wrote: >> Looks good to me. Please include a hg export'ed patch and I will be >> happy to push it for you. > Please include a ChangeLog in the commit itself. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From aazores at redhat.com Thu Jul 11 10:34:16 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 11 Jul 2013 13:34:16 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DED8D8.1060306@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> <51DDD470.9090901@redhat.com> <51DEC244.3010102@redhat.com> <51DECB49.7060109@redhat.com> <51DED500.4040305@redhat.com> <51DED8D8.1060306@redhat.com> Message-ID: <51DEEC98.7000106@redhat.com> On 07/11/2013 12:10 PM, Omair Majid wrote: > On 07/11/2013 11:53 AM, Andrew Azores wrote: >> On 07/11/2013 11:12 AM, Omair Majid wrote: >>> Looks good to me. Please include a hg export'ed patch and I will be >>> happy to push it for you. > Please include a ChangeLog in the commit itself. > > Thanks, > Omair > > Sorry :) Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: javaws_about_exported.patch Type: text/x-patch Size: 9628 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/2d644eb2/javaws_about_exported.patch From omajid at icedtea.classpath.org Thu Jul 11 10:58:40 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 11 Jul 2013 17:58:40 +0000 Subject: /hg/icedtea-web: Refactored HTML processing out of Makefile.am i... Message-ID: changeset 7c111977045d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7c111977045d author: Andrew Azores date: Thu Jul 11 13:30:52 2013 -0400 Refactored HTML processing out of Makefile.am into html-gen.sh. diffstat: AUTHORS | 2 +- ChangeLog | 10 +++- Makefile.am | 61 +------------------------ html-gen.sh | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 60 deletions(-) diffs (245 lines): diff -r c806308b6529 -r 7c111977045d AUTHORS --- a/AUTHORS Wed Jul 10 18:31:48 2013 +0200 +++ b/AUTHORS Thu Jul 11 13:30:52 2013 -0400 @@ -2,7 +2,7 @@ Please keep this list in alphabetical order. Lillian Angel -Andrew Azores +Andrew Azores Deepak Bhole Ricardo Mart??n Camarero Danesh Dadachanji diff -r c806308b6529 -r 7c111977045d ChangeLog --- a/ChangeLog Wed Jul 10 18:31:48 2013 +0200 +++ b/ChangeLog Thu Jul 11 13:30:52 2013 -0400 @@ -1,4 +1,12 @@ -2013-06-06 Jiri Vanek +2013-07-11 Andrew Azores + + * Makefile.am (stamps/html-gen): moved plaintext-to-HTML logic into new + shell script + * html-gen.sh: contains plaintext-to-HTML logic previously found in + Makefile.am. Added a sed expression to cause ChangeLog file listing + entries to be underlined. + +2013-07-06 Jiri Vanek Andrew Azores New about dialogue diff -r c806308b6529 -r 7c111977045d Makefile.am --- a/Makefile.am Wed Jul 10 18:31:48 2013 +0200 +++ b/Makefile.am Thu Jul 11 13:30:52 2013 -0400 @@ -462,64 +462,9 @@ (cd $$NETX_SRCDIR/..; \ mkdir -p html-gen; \ cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ - cd html-gen/; \ - for FILE in NEWS AUTHORS COPYING ChangeLog; \ - do \ - sed -r \ - -e "s/\t/ /g" $(: Convert tabs into four spaces) \ - -e "s/\&/\&/g" $(: "&" -> "&") \ - -e "s/ /\ \ /g" $(: Double-spaces into HTML whitespace for formatting) \ - -e "s/ "<") \ - -e "s/>/\>/g" $(: ">" -> ">") \ - -e 's/(\<)?(https?:\/\/[^ ]*)(\>| |$$)/\1
\2<\/a>\3/i' $(: Creates hyperlinks from http/https URLs) \ - -e 's/\<(.*@.*)\>/\<\1<\/a>\>/i' $(: Create mailto links from email addresses formatted as ) \ - -e "s/$$/
/g" $(: "\n" -> "
") \ - "./$$FILE" > "./$$FILE.html"; \ - done; \ - sed -i '4i
' AUTHORS.html; \ - sed -i '5i
Jam Icon

' AUTHORS.html; $(: Insert jamIcon into AUTHORS.html and center the authors list)\ - echo "
" >> AUTHORS.html; \ - for FILE in NEWS.html ChangeLog.html; \ - do \ - mv $$FILE "$$FILE.old"; \ - COUNTER=0; \ - while read LINE; \ - do \ - BOLD=1; \ - if [[ $$FILE == "NEWS.html" ]]; \ - then \ - if [[ $$LINE =~ New\ in\ release* ]]; \ - then \ - BOLD=0; \ - COUNTER=$$(( $$COUNTER + 1 )); \ - fi; \ - if [[ $$COUNTER -gt 2 ]]; $(: Cut to two releases)\ - then \ - break; \ - fi; \ - else \ - if [[ $$LINE =~ .*\<\;.*\@.*\>\; ]]; $(: Matches eg , after HTML-escaping)\ - then \ - BOLD=0; \ - fi; \ - if [[ $$LINE =~ [0-9]{4}-[0-9]{2}-[0-9]{2}* ]]; $(: Matches eg 2013-07-01)\ - then \ - COUNTER=$$(( $$COUNTER + 1 )); \ - fi; \ - if [[ $$COUNTER -gt 10 ]]; $(: Cut to ten changesets)\ - then \ - break; \ - fi; \ - fi; \ - if [[ $$BOLD -eq 0 ]]; $(: Highlight "New In Release" in News, and author name lines in ChangeLog) \ - then \ - echo "$$LINE" >> $$FILE; \ - else \ - echo "$$LINE" >> $$FILE; \ - fi; \ - done < "$$FILE.old"; \ - rm $$FILE.old; \ - done) + export HTML_GEN_DEBUG=true; \ + bash html-gen.sh; \ + unset HTML_GEN_DEBUG) ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR) rm -r $(NETX_SRCDIR)/../html-gen/ mkdir -p stamps diff -r c806308b6529 -r 7c111977045d html-gen.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/html-gen.sh Thu Jul 11 13:30:52 2013 -0400 @@ -0,0 +1,141 @@ +#!/bin/bash + +# html-gen.sh +# Copyright (C) 2013 Red Hat +# +# This file is part of IcedTea. +# +# IcedTea is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# IcedTea 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 for more details. +# +# You should have received a copy of the GNU General Public License +# along with IcedTea; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +################################################################################ + +# This script is used by the stamps/html-gen target in Makefile.am. Its purpose +# is to produce HTML-escaped and formatted documents from a set of plaintext +# documents, namely AUTHORS, NEWS, ChangeLog, and COPYING, located in the +# same directory as this script. These generated HTML documents are then used +# in the netx About Dialog, which can be invoked with "javaws -about". + +# Currently the script is not configurable in any way and the files it processes +# are hardcoded. To run the script manually, create a directory "html-gen" in the +# same directory as this script, containing files named AUTHORS, NEWS, ChangeLog, +# and COPYING. Note that these files WILL be modified in-place during the HTML +# "conversion" process. Setting the environment variable "HTML_GEN_DEBUG" to "true" +# will enable some output from the script, which may be useful if you encounter +# issues with this script's processing of an input file. + +if [ -z "$HTML_GEN_DEBUG" ]; then HTML_GEN_DEBUG="false"; fi + +print_debug() { + if [ "$HTML_GEN_DEBUG" == "true" ]; then echo "$1"; fi +} + +start_time=$(date +%s.%N) + +cd html-gen + +print_debug "Starting sed substitutions" +for FILE in NEWS AUTHORS COPYING ChangeLog +do + print_debug "Processing $FILE..." + sed -i -r 's/\t/ /g' "./$FILE" # Convert tabs into four spaces + sed -i -r 's/\&/\&/g' "./$FILE" # "&" -> "&" + sed -i -r 's/ /\ \ /g' "./$FILE" # Double-spaces into HTML whitespace for format preservation + sed -i -r 's/ "<" + sed -i -r 's/>/\>/g' "./$FILE" # ">" -> ">" + sed -i -r 's_(\<)?(https?://[^ ]*)(\>| |$)_\1
\2\3_i' "./$FILE" # Create hyperlinks from http(s) URLs + sed -i -r 's/\<(.*@.*)\>/\<\1<\/a>\>/i' "./$FILE" # Create mailto links from email addresses formatted as + sed -i -r 's/$/
/' "./$FILE" # "\n" -> "
" + + mv "$FILE" "$FILE.html" + print_debug "$FILE.html finished." +done + +print_debug "Done sed subs. Starting in-place additions" + +# Centre the column of author names in the Authors file +sed -i '4i
' AUTHORS.html +# Insert jamIcon above author names +sed -i '5i
Jam Icon

' AUTHORS.html +echo "
" >> AUTHORS.html + +print_debug "Done. Starting formatting (bolding, mailto and hyperlink creation)" + +for FILE in NEWS.html ChangeLog.html +do + print_debug "Processing $FILE..." + mv $FILE "$FILE.old" + COUNTER=0 + while read LINE + do + BOLD=1 + if [[ $FILE == "NEWS.html" ]] + then + if [[ $LINE =~ New\ in\ release* ]] + then + BOLD=0 + COUNTER=$(( $COUNTER + 1 )) + fi + if [[ $COUNTER -gt 2 ]] # Cut to two releases + then + break + fi + else + if [[ $LINE =~ .*\<\;.*\@.*\>\; ]] # Matches eg , after HTML-escaping + then + BOLD=0 + fi + if [[ $LINE =~ [0-9]{4}-[0-9]{2}-[0-9]{2}* ]] # Matches eg 2013-07-01 + then + COUNTER=$(( $COUNTER + 1 )) + fi + if [[ $COUNTER -gt 10 ]] # Cut to ten changesets + then + break + fi + fi + if [[ $BOLD -eq 0 ]] # Highlight "New In Release" in News, and author name lines in ChangeLog + then + LINE="$LINE" + fi + echo "$LINE" >> $FILE + done < "$FILE.old" + rm "$FILE.old" + print_debug "$FILE finished" +done + +sed -i -r 's|(\*\ .*):|\1:|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:" + +end_time=$(date +%s.%N) + +print_debug "HTML generation complete" +print_debug "Total elapsed time: $(echo "$end_time - $start_time" | bc )" From omajid at redhat.com Thu Jul 11 10:59:41 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 11 Jul 2013 13:59:41 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DEEC98.7000106@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD92C1.7010303@redhat.com> <51DDB5AA.2060500@redhat.com> <51DDD470.9090901@redhat.com> <51DEC244.3010102@redhat.com> <51DECB49.7060109@redhat.com> <51DED500.4040305@redhat.com> <51DED8D8.1060306@redhat.com> <51DEEC98.7000106@redhat.com> Message-ID: <51DEF28D.6060208@redhat.com> On 07/11/2013 01:34 PM, Andrew Azores wrote: > On 07/11/2013 12:10 PM, Omair Majid wrote: >> On 07/11/2013 11:53 AM, Andrew Azores wrote: >>> On 07/11/2013 11:12 AM, Omair Majid wrote: >>>> Looks good to me. Please include a hg export'ed patch and I will be >>>> happy to push it for you. Thanks for the patch! Pushed: http://icedtea.classpath.org/hg/icedtea-web/rev/7c111977045d Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From bugzilla-daemon at icedtea.classpath.org Thu Jul 11 13:07:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 11 Jul 2013 20:07:25 +0000 Subject: [Bug 1495] New: a java website freezes firefox Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 Bug ID: 1495 Summary: a java website freezes firefox Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: kjslag at gmail.com CC: unassigned at icedtea.classpath.org Loading the following website freezes firefox. I then have to kill firefox and restart it. The website's java applets don't work in chromium either (except chromium doesn't crash). I run Archlinux on x64. http://www.ibiblio.org/e-notes/ Below is my terminal output when using firefox: java version "1.7.0_40" OpenJDK Runtime Environment (IcedTea 2.4.1) (ArchLinux build 7.u40_2.4.1-1-x86_64) OpenJDK 64-Bit Server VM (build 24.0-b50, mixed mode) java.io.FileNotFoundException: /home/k/.icedtea/deployment.properties (No such file or directory) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.(FileInputStream.java:146) at java.io.FileReader.(FileReader.java:72) at net.sourceforge.jnlp.config.DeploymentConfiguration.parsePropertiesFile(DeploymentConfiguration.java:604) at net.sourceforge.jnlp.config.DeploymentConfiguration.findSystemConfigFile(DeploymentConfiguration.java:424) at net.sourceforge.jnlp.config.DeploymentConfiguration.load(DeploymentConfiguration.java:236) at net.sourceforge.jnlp.config.DeploymentConfiguration.load(DeploymentConfiguration.java:205) at net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:194) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:252) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:270) at sun.applet.PluginMain.main(PluginMain.java:109) java.lang.NullPointerException at javax.swing.SwingUtilities.appContextGet(SwingUtilities.java:1857) at javax.swing.SwingUtilities.getSharedOwnerFrame(SwingUtilities.java:1827) at javax.swing.JWindow.(JWindow.java:185) at javax.swing.JWindow.(JWindow.java:137) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.(JNLPSecurityManager.java:121) at net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:232) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:252) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:270) at sun.applet.PluginMain.main(PluginMain.java:109) Something very bad happened. I don't know what to do, so I am going to exit :( I then made an empty /home/k/.icedtea/deployment.properties file to try and fix the errors above. Unfortunately, I merely got a new error: java version "1.7.0_40" OpenJDK Runtime Environment (IcedTea 2.4.1) (ArchLinux build 7.u40_2.4.1-1-x86_64) OpenJDK 64-Bit Server VM (build 24.0-b50, mixed mode) java.lang.NullPointerException at javax.swing.SwingUtilities.appContextGet(SwingUtilities.java:1857) at javax.swing.SwingUtilities.getSharedOwnerFrame(SwingUtilities.java:1827) at javax.swing.JWindow.(JWindow.java:185) at javax.swing.JWindow.(JWindow.java:137) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.(JNLPSecurityManager.java:121) at net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:232) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:252) at sun.applet.PluginAppletSecurityContext.(PluginAppletSecurityContext.java:270) at sun.applet.PluginMain.main(PluginMain.java:109) Something very bad happened. I don't know what to do, so I am going to exit :( thanks! Kevin -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/0ee88c69/attachment.html From andrew at icedtea.classpath.org Thu Jul 11 15:43:21 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 11 Jul 2013 22:43:21 +0000 Subject: /hg/icedtea6: 6 new changesets Message-ID: changeset affe15667ff7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=affe15667ff7 author: Andrew John Hughes date: Thu Jul 11 22:06:36 2013 +0100 Backport additional fixes. Additional fixes were applied to jdk7u as part of the security release. This patch includes a subset of them. 2013-07-01 Omair Majid * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, * patches/openjdk/8009217-fix_test_compile.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8009610-blacklist_malware_certificate.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011992-MlibOpsTest_failed.patch, * patches/openjdk/8012112-MlibOpsTest_fails.patch, * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, * patches/openjdk/8012933-appcontext_disposed_too_early.patch, * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014427-raster_regresssion.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am: (ICEDTEA_PATCHES): Apply the above. * patches/ecj/override.patch: Add new hunk for BufferedImage. changeset 13722351f760 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=13722351f760 author: Andrew John Hughes date: Thu Jul 11 22:08:22 2013 +0100 Additional fixes that go along with the security update Backport additional fixes from 7 that went along with the security update. 2013-07-03 Omair Majid * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8009996-emitter_bean.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010727-empty_logger_name.patch, * patches/openjdk/8010939-logmanager_deadlock.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014718-remove_logging_suntoolkit.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am: (ICEDTEA_PATCHES): Apply the above. changeset 9b08602ea62f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9b08602ea62f author: Andrew John Hughes date: Thu Jul 11 22:31:34 2013 +0100 Remove unused patches and cleanup HotSpot security patches. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Readd parts of patch removed without note in an earlier backport and fix copyright headers to apply (2011 instead of 2010). 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8014427-raster_regresssion.patch: Dropped superfluous 's' from name. * Makefile.am: (ICEDTEA_PATCHES): Move back to using HotSpot patches without '-it6' suffix. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. changeset 5bf213987d1b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5bf213987d1b author: Andrew John Hughes date: Wed Jul 10 15:13:09 2013 +0100 Make 7158805 patch apply again. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Make patch apply again. changeset e325e900c775 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e325e900c775 author: Andrew John Hughes date: Thu Jul 11 23:41:57 2013 +0100 Remove reference to removed patch. 2013-07-11 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Remove reference to removed patch. changeset 11f837636a0a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=11f837636a0a author: Andrew John Hughes date: Thu Jul 11 23:43:09 2013 +0100 Add release notes for latest security updates. 2013-07-11 Andrew John Hughes * NEWS: Add 1.11.12 and 1.12.6 release notes. diffstat: ChangeLog | 118 + Makefile.am | 57 +- NEWS | 204 + patches/ecj/ant.patch | 20 - patches/ecj/jcp-importsources.patch | 10 + patches/openjdk/6541350-tz_display_names_l10n.patch | 300 + patches/openjdk/6821191-tz_display_names_l10n.patch | 125 + patches/openjdk/6977550-tzdata2010l.patch | 1208 + patches/openjdk/6990754-handle_renames.patch | 925 - patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18949 ---------- patches/openjdk/6996686-tzdata2010o.patch | 93 + patches/openjdk/7008809-report_class_in_arraystoreexception.patch | 189 - patches/openjdk/7014851-unused_parallel_compaction_code.patch | 810 - patches/openjdk/7017732-move_static_fields_to_class.patch | 3079 - patches/openjdk/7017800-tzdata2011b.patch | 254 + patches/openjdk/7027387-tzdata2011d.patch | 502 + patches/openjdk/7033174-tzdata2011e.patch | 117 + patches/openjdk/7036747-elfstringtable.patch | 130 - patches/openjdk/7039469-tzdata2011g.patch | 116 + patches/openjdk/7086585-flexible_field_injection.patch | 3424 - patches/openjdk/7090843-tzdata2011j.patch | 1228 + patches/openjdk/7103108-tzdata2011l.patch | 1593 + patches/openjdk/7103405-correct_display_names.patch | 118 + patches/openjdk/7104126-headers_tzdata.patch | 530 + patches/openjdk/7158483-tzdata2012c.patch | 1436 + patches/openjdk/7188114-alternate_command_line_parser.patch | 611 + patches/openjdk/7198570-tzdata2012f.patch | 841 + patches/openjdk/7199143-OCSP_timeout.patch | 53 + patches/openjdk/8002070-remove_logger_stack_search.patch | 152 + patches/openjdk/8002070-remove_logger_stack_search_2.patch | 546 + patches/openjdk/8002225-tzdata2012i.patch | 261 + patches/openjdk/8006120-server_jre.patch | 60 + patches/openjdk/8006536-remove_trailing_slashes.patch | 43 + patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch | 68 + patches/openjdk/8009217-fix_test_compile.patch | 91 + patches/openjdk/8009463-space_and_final_backslash.patch | 33 + patches/openjdk/8009610-blacklist_malware_certificate.patch | 64 + patches/openjdk/8009987-tzdata2013b.patch | 2165 + patches/openjdk/8009996-emitter_bean.patch | 27 + patches/openjdk/8010118-caller_sensitive.patch | 2950 + patches/openjdk/8010213-set_socketoptions_windows.patch | 29 + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch | 345 + patches/openjdk/8010727-empty_logger_name.patch | 99 + patches/openjdk/8010939-logmanager_deadlock.patch | 264 + patches/openjdk/8011139-revise_checking_getenclosingclass.patch | 58 + patches/openjdk/8011154-awt_regression.patch | 20 + patches/openjdk/8011313-OCSP_timeout_wrong_value.patch | 31 + patches/openjdk/8011990-logger_test_urls.patch | 55 + patches/openjdk/8011992-MlibOpsTest_failed.patch | 89 + patches/openjdk/8012112-MlibOpsTest_fails.patch | 51 + patches/openjdk/8012243-serial_regression.patch | 42 + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch | 480 + patches/openjdk/8012933-appcontext_disposed_too_early.patch | 153 + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 + patches/openjdk/8013380-handle_renames.patch | 107 + patches/openjdk/8013380-logger_stack_walk_glassfish.patch | 936 + patches/openjdk/8014205-blank_swing_dialogs_windows.patch | 146 + patches/openjdk/8014427-raster_regression.patch | 20 + patches/openjdk/8014676-javadebugger_space_in_paths.patch | 32 + patches/openjdk/8014718-remove_logging_suntoolkit.patch | 112 + patches/openjdk/8014745-logger_stack_walk_switch.patch | 199 + patches/openjdk/8014968-OCSP_timeout_default.patch | 19 + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 717 - patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 53 +- patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 - patches/security/20130618/8001330-checking_order_improvement.patch | 37 +- patches/security/20130618/hs_merge-01.patch | 284 - patches/security/20130618/hs_merge-02.patch | 155 - patches/security/20130618/hs_merge-03.patch | 18 - patches/security/20130618/hs_merge-04.patch | 44 - patches/sparc.patch | 1808 - 71 files changed, 19384 insertions(+), 31077 deletions(-) diffs (truncated from 50872 to 500 lines): diff -r 47fc9f561578 -r 11f837636a0a ChangeLog --- a/ChangeLog Tue Jul 09 17:22:26 2013 -0400 +++ b/ChangeLog Thu Jul 11 23:43:09 2013 +0100 @@ -1,3 +1,121 @@ +2013-07-11 Andrew John Hughes + + * NEWS: + Add 1.11.12 and 1.12.6 release notes. + +2013-07-11 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch. + +2013-07-10 Andrew John Hughes + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Make patch apply again. + +2013-07-10 Andrew John Hughes + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Readd parts of patch removed without note in + an earlier backport and fix copyright headers to + apply (2011 instead of 2010). + +2013-07-09 Andrew John Hughes + + * patches/ecj/ant.patch, + * patches/openjdk/6990754-handle_renames.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, + * patches/security/20130618/8001330-checking_order_improvement-it6.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/sparc.patch: + Remove unused patches. + * patches/openjdk/8011154-awt_regresssion.patch, + * patches/openjdk/8014427-raster_regresssion.patch: + Dropped superfluous 's' from name. + * Makefile.am: + (ICEDTEA_PATCHES): Move back to using HotSpot patches without '-it6' suffix. + * patches/ecj/override.patch: Drop recent addition. In accordance with + PR1397, we should avoid extending this patch in favour of either not + including @Override additions or setting source/target correctly. + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch: + Replace with Chris' patches, regenerated as unified diffs. + +2013-07-03 Omair Majid + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8009996-emitter_bean.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010727-empty_logger_name.patch, + * patches/openjdk/8010939-logmanager_deadlock.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014718-remove_logging_suntoolkit.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch: + New file. Backport from icedtea/openjdk 7. + * Makefile.am: + (ICEDTEA_PATCHES): Apply the above. + +2013-07-01 Omair Majid + + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, + * patches/openjdk/8009217-fix_test_compile.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8009610-blacklist_malware_certificate.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, + * patches/openjdk/8011154-awt_regresssion.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011992-MlibOpsTest_failed.patch, + * patches/openjdk/8012112-MlibOpsTest_fails.patch, + * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, + * patches/openjdk/8012933-appcontext_disposed_too_early.patch, + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014427-raster_regresssion.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. + Backport from icedtea/openjdk 7. + * Makefile.am: + (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/override.patch: Add new hunk for BufferedImage. + 2013-07-09 Omair Majid * patches/ecj/needs-6.patch: Build additional code using -source 6. diff -r 47fc9f561578 -r 11f837636a0a Makefile.am --- a/Makefile.am Tue Jul 09 17:22:26 2013 -0400 +++ b/Makefile.am Thu Jul 11 23:43:09 2013 +0100 @@ -439,8 +439,8 @@ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ patches/security/20130416/8009699.patch \ - patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ - patches/security/20130618/8001330-checking_order_improvement-it6.patch + patches/security/20130618/7158805-nested_subroutine_rewriting.patch \ + patches/security/20130618/8001330-checking_order_improvement.patch endif SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch @@ -647,7 +647,58 @@ patches/jtreg-LayoutLimits.patch \ patches/jtreg-ComponentOrientationTests.patch \ patches/jtreg-TextLayoutBoundsChecks.patch \ - patches/openjdk/7171223-strict_aliasing.patch + patches/openjdk/7171223-strict_aliasing.patch \ + patches/openjdk/7188114-alternate_command_line_parser.patch \ + patches/openjdk/7199143-OCSP_timeout.patch \ + patches/openjdk/8006120-server_jre.patch \ + patches/openjdk/8006536-remove_trailing_slashes.patch \ + patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \ + patches/openjdk/8009217-fix_test_compile.patch \ + patches/openjdk/8009463-space_and_final_backslash.patch \ + patches/openjdk/8009610-blacklist_malware_certificate.patch \ + patches/openjdk/8010213-set_socketoptions_windows.patch \ + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \ + patches/openjdk/8011154-awt_regression.patch \ + patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \ + patches/openjdk/8011992-MlibOpsTest_failed.patch \ + patches/openjdk/8012112-MlibOpsTest_fails.patch \ + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ + patches/openjdk/8012933-appcontext_disposed_too_early.patch \ + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8014205-blank_swing_dialogs_windows.patch \ + patches/openjdk/8014427-raster_regression.patch \ + patches/openjdk/8014676-javadebugger_space_in_paths.patch \ + patches/openjdk/8014968-OCSP_timeout_default.patch \ + patches/openjdk/8002070-remove_logger_stack_search.patch \ + patches/openjdk/8002070-remove_logger_stack_search_2.patch \ + patches/openjdk/8010118-caller_sensitive.patch \ + patches/openjdk/8010727-empty_logger_name.patch \ + patches/openjdk/8010939-logmanager_deadlock.patch \ + patches/openjdk/8011990-logger_test_urls.patch \ + patches/openjdk/8013380-logger_stack_walk_glassfish.patch \ + patches/openjdk/8013380-handle_renames.patch \ + patches/openjdk/8014745-logger_stack_walk_switch.patch \ + patches/openjdk/8012243-serial_regression.patch \ + patches/openjdk/8014718-remove_logging_suntoolkit.patch \ + patches/openjdk/8011139-revise_checking_getenclosingclass.patch \ + patches/openjdk/8009996-emitter_bean.patch \ + patches/openjdk/6541350-tz_display_names_l10n.patch \ + patches/openjdk/6821191-tz_display_names_l10n.patch \ + patches/openjdk/6977550-tzdata2010l.patch \ + patches/openjdk/6996686-tzdata2010o.patch \ + patches/openjdk/7017800-tzdata2011b.patch \ + patches/openjdk/7027387-tzdata2011d.patch \ + patches/openjdk/7033174-tzdata2011e.patch \ + patches/openjdk/7039469-tzdata2011g.patch \ + patches/openjdk/7090843-tzdata2011j.patch \ + patches/openjdk/7103108-tzdata2011l.patch \ + patches/openjdk/7104126-headers_tzdata.patch \ + patches/openjdk/7103405-correct_display_names.patch \ + patches/openjdk/7158483-tzdata2012c.patch \ + patches/openjdk/7198570-tzdata2012f.patch \ + patches/openjdk/8002225-tzdata2012i.patch \ + patches/openjdk/8009987-tzdata2013b.patch + if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 47fc9f561578 -r 11f837636a0a NEWS --- a/NEWS Tue Jul 09 17:22:26 2013 -0400 +++ b/NEWS Thu Jul 11 23:43:09 2013 +0100 @@ -35,6 +35,210 @@ - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives +New in release 1.12.6 (2013-07-10): + +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* Backports + - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 + - S6541350: TimeZone display names localization + - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications. + - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong + - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute + - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers + - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue + - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form + - S6821191: Timezone display name localization + - S6851834: Javadoc doclet needs a structured approach to generate the output HTML. + - S6888167: memory leaks in the medialib glue code + - S6961178: Allow doclet.xml to contain XML attributes + - S6977550: (tz) Support tzdata2010l + - S6996686: (tz) Support tzdata2010o + - S7006270: Several javadoc regression tests are failing on windows + - S7017800: (tz) Support tzdata2011b + - S7027387: (tz) Support tzdata2011d + - S7033174: (tz) Support tzdata2011e + - S7039469: (tz) Support tzdata2011g + - S7090843: (tz) Support tzdata2011j + - S7103108: (tz) Support tzdata2011l + - S7103405: Correct display names for Pacific/Apia timezone + - S7104126: Insert openjdk copyright header back into TZdata files + - S7158483: (tz) Support tzdata2012c + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S7198570: (tz) Support tzdata2012f + - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node + - S8002225: (tz) Support tzdata2012i + - S8009165: Fix for 8006435 needs revision + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009530: ICU Kern table support broken + - S8009610: Blacklist certificate used with malware. + - S8009987: (tz) Support tzdata2013b + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010939: Deadlock in LogManager + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011557: Improve reflection utility classes + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + +New in release 1.11.12 (2013-07-10): + +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* Backports + - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 + - S6541350: TimeZone display names localization + - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications. + - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong + - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute + - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers + - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue + - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form + - S6821191: Timezone display name localization + - S6851834: Javadoc doclet needs a structured approach to generate the output HTML. + - S6888167: memory leaks in the medialib glue code + - S6961178: Allow doclet.xml to contain XML attributes + - S6977550: (tz) Support tzdata2010l + - S6996686: (tz) Support tzdata2010o + - S7006270: Several javadoc regression tests are failing on windows + - S7017800: (tz) Support tzdata2011b + - S7027387: (tz) Support tzdata2011d + - S7033174: (tz) Support tzdata2011e + - S7039469: (tz) Support tzdata2011g + - S7090843: (tz) Support tzdata2011j + - S7103108: (tz) Support tzdata2011l + - S7103405: Correct display names for Pacific/Apia timezone + - S7104126: Insert openjdk copyright header back into TZdata files + - S7158483: (tz) Support tzdata2012c + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S7198570: (tz) Support tzdata2012f + - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node + - S8002225: (tz) Support tzdata2012i + - S8009165: Fix for 8006435 needs revision + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009530: ICU Kern table support broken + - S8009610: Blacklist certificate used with malware. + - S8009987: (tz) Support tzdata2013b + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010939: Deadlock in LogManager + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011557: Improve reflection utility classes + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + New in release 1.12.5 (2013-04-24): * New features diff -r 47fc9f561578 -r 11f837636a0a patches/ecj/ant.patch --- a/patches/ecj/ant.patch Tue Jul 09 17:22:26 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500 -@@ -80,6 +80,7 @@ - endif - - ifdef ALT_BOOTDIR -+ ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - endif - ---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500 -@@ -109,6 +109,7 @@ - memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}" - excludes="com/sun/tools/internal/txw2/**"> -+ - - - diff -r 47fc9f561578 -r 11f837636a0a patches/ecj/jcp-importsources.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/jcp-importsources.patch Thu Jul 11 23:43:09 2013 +0100 @@ -0,0 +1,10 @@ +--- openjdk-ecj/jdk/make/org/jcp/Makefile.orig 2013-07-10 10:02:13.715336690 +0100 ++++ openjdk-ecj/jdk/make/org/jcp/Makefile 2013-07-10 10:02:55.359996584 +0100 +@@ -31,6 +31,7 @@ + PACKAGE = org.jcp + PRODUCT = jcp + include $(BUILDDIR)/common/Defs.gmk ++SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java) + + # + # Files to compile diff -r 47fc9f561578 -r 11f837636a0a patches/openjdk/6541350-tz_display_names_l10n.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6541350-tz_display_names_l10n.patch Thu Jul 11 23:43:09 2013 +0100 @@ -0,0 +1,300 @@ +# HG changeset patch +# User yhuang +# Date 1261700777 28800 +# Node ID 1397ae8dc558c9128d84818afc9ec55d23714c35 +# Parent 7bf839e2e9ce58d5f205280bf5a06f00227f2240 +6541350: TimeZone display names localization +Reviewed-by: yhuang, peytoia + +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java +@@ -83,8 +83,8 @@ + "Zentrale Sommerzeit", "CDT"}; + String CTT[] = new String[] {"Chinesische Normalzeit", "CST", + "Chinesische Sommerzeit", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", ++ "Kubanische Sommerzeit", "CDT"}; + String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST", + "Zentrale Sommerzeit (Northern Territory)", "CST"}; + String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", +@@ -594,8 +594,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST", ++ "Zentral-Westliche Sommerzeit (Australien)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +--- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java ++++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java +@@ -83,8 +83,8 @@ + "Hora de verano Central", "CDT"}; + String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST", + "Hora de verano de China", "CDT"}; +- String CUBA[] = new String[] {"Cuba Standard Time", "CST", +- "Cuba Daylight Time", "CDT"}; ++ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST", ++ "Hora de verano de Cuba", "CDT"}; + String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST", + "Hora de verano Central (territorio del Norte)", "CST"}; + String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT", From bugzilla-daemon at icedtea.classpath.org Thu Jul 11 15:43:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 11 Jul 2013 22:43:44 +0000 Subject: [Bug 1397] [IcedTea6] Remove needed for override patch by building source/target 6 throughout In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1397 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=9b08602ea62f author: Andrew John Hughes date: Thu Jul 11 22:31:34 2013 +0100 Remove unused patches and cleanup HotSpot security patches. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Readd parts of patch removed without note in an earlier backport and fix copyright headers to apply (2011 instead of 2010). 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8014427-raster_regresssion.patch: Dropped superfluous 's' from name. * Makefile.am: (ICEDTEA_PATCHES): Move back to using HotSpot patches without '-it6' suffix. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/34d1074b/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jul 11 18:19:53 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 01:19:53 +0000 Subject: [Bug 1395] Bug javaws.itweb / icedtea with JNLP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1395 Sachin Garg changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bugreporter at gargsach.in --- Comment #1 from Sachin Garg --- Similar issue with the PDFScissors JNLP (downloaded from http://www.pdfscissors.com/) $ javaws pdfscissors-offline.jnlp Exception in thread "main" java.lang.NullPointerException at javax.swing.SwingUtilities.appContextGet(SwingUtilities.java:1857) at javax.swing.SwingUtilities.getSharedOwnerFrame(SwingUtilities.java:1827) at javax.swing.JWindow.(JWindow.java:185) at javax.swing.JWindow.(JWindow.java:137) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.(JNLPSecurityManager.java:121) at net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:232) at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:181) at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:51) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:172) -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/903cf529/attachment.html From jvanek at redhat.com Fri Jul 12 01:44:15 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 12 Jul 2013 10:44:15 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51DEB25B.8020704@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> <51C85510.9000000@redhat.com> <51D2D68C.6080407@redhat.com> <51D7324A.6060605@redhat.com> <51DAD6BB.5080500@redhat.com> <51DC3056.1070006@redhat.com> <51DC38F0.5060505@redhat.com> <51DC4821.2070804@redhat.com> <51DD6C89.1010000@redhat.com> <51DD8D52.3010604@redhat.com> <51DD9272.4010507@redhat.com> <51DE4E95.3010805@redhat.com> <51DEB25B.8020704@redhat.com> Message-ID: <51DFC1DF.9080009@redhat.com> I think you should have an push privileges now. So (Add Changelog entry and ... ) go on and push :) J. On 07/11/2013 03:25 PM, Andrew Azores wrote: > On 07/11/2013 02:20 AM, Jiri Vanek wrote: >> When fixing this - do you mind to update also NEWS file? To mention that new about dialogue was done? > > Not the most descriptive thing I've ever written... but I didn't want to ramble on in the release > notes about the details of it all :) > > Andrew A > > temp_javaws_about.patch > > > diff --git a/NEWS b/NEWS > --- a/NEWS > +++ b/NEWS > @@ -16,6 +16,7 @@ New in release 1.5 (2013-XX-XX): > - Netx can now parse malformed jnlp files using tagsoup > - PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation > - PR1473 - javaws should not depend on name of local file > + - Redesigned About dialogue layout and contents > * Plugin > - PR854: Resizing an applet several times causes 100% CPU load > > diff --git a/netx/net/sourceforge/jnlp/about/AboutDialog.java b/netx/net/sourceforge/jnlp/about/AboutDialog.java > --- a/netx/net/sourceforge/jnlp/about/AboutDialog.java > +++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java > @@ -84,7 +84,7 @@ public class AboutDialog extends JPanel > > aboutPanel = new HTMLPanel(res_about, R("AboutDialogueTabAbout")); > authorsPanel = new HTMLPanel(res_authors, R("AboutDialogueTabAuthors")); > - newsPanel = new HTMLPanel(res_news, R("News")); > + newsPanel = new HTMLPanel(res_news, R("AboutDialogueTabNews")); > changelogPanel = new HTMLPanel(res_changelog, R("AboutDialogueTabChangelog")); > copyingPanel = new HTMLPanel(res_copying, R("AboutDialogueTabGPLv2")); > > From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 02:45:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 09:45:43 +0000 Subject: [Bug 1455] JVM crashing - SSL_write causing the issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1455 senthil.jayakumar at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|WONTFIX |--- Severity|normal |critical --- Comment #3 from senthil.jayakumar at gmail.com --- Hi, We have update the openjdk version to 1.12.5 as suggested, however the issue reported earlier is still reproducible, please help in this regard. # java -version java version "1.6.0_27" OpenJDK Runtime Environment (IcedTea6 1.12.5) (6b27-1.12.5-1) OpenJDK 64-Bit Server VM (build 20.0-b12, mixed mode) ------------------------------------------------------------------------ Thread 4 (Thread 12428): #0 0x00007f81e87501fc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f81e7a5d9db in os::PlatformEvent::park() () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #2 0x00007f81e7a4ff1d in ObjectMonitor::wait(long, bool, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #3 0x00007f81e7b22ae9 in ObjectSynchronizer::wait(Handle, long, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #4 0x00007f81e78eb09e in JVM_MonitorWait () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #5 0x00007f81e24a5b4f in ?? () #6 0x00007f81d2227930 in ?? () #7 0x00007f81e7b229c4 in ObjectSynchronizer::notify(Handle, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #8 0x00007f81e24948da in ?? () #9 0x0000000000000000 in ?? () Thread 3 (Thread 12427): #0 0x00007f81e87501fc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f81e7a5d9db in os::PlatformEvent::park() () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #2 0x00007f81e7a4ff1d in ObjectMonitor::wait(long, bool, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #3 0x00007f81e7b22ae9 in ObjectSynchronizer::wait(Handle, long, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #4 0x00007f81e78eb09e in JVM_MonitorWait () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #5 0x00007f81e24a5b4f in ?? () #6 0x00007f81d2328930 in ?? () #7 0x00007f81e7b229c4 in ObjectSynchronizer::notify(Handle, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #8 0x00007f81e24948da in ?? () #9 0x0000000000000000 in ?? () Thread 2 (Thread 12426): #0 0x00007f81e87501fc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/libpthread.so.0 #1 0x00007f81e7a5d9db in os::PlatformEvent::park() () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #2 0x00007f81e7a4ff1d in ObjectMonitor::wait(long, bool, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #3 0x00007f81e7b22ae9 in ObjectSynchronizer::wait(Handle, long, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #4 0x00007f81e78eb09e in JVM_MonitorWait () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #5 0x00007f81e24a5b4f in ?? () #6 0x00007f81d2429930 in ?? () #7 0x00007f81e7b229c4 in ObjectSynchronizer::notify(Handle, Thread*) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #8 0x00007f81e24948da in ?? () #9 0x0000000000000000 in ?? () Thread 1 (Thread 12425): #0 0x00007f81e800d1b5 in raise () from /lib/libc.so.6 #1 0x00007f81e800ffc0 in abort () from /lib/libc.so.6 #2 0x00007f81e7a587b9 in os::abort(bool) () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so ---Type to continue, or q to quit--- #3 0x00007f81e7b8f03b in VMError::report_and_die() () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #4 0x00007f81e7a5f7f0 in JVM_handle_linux_signal () from /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so #5 #6 0x00007f81d8817b04 in SSL_write () from /opt/sonus/ema/jboss/bin/META-INF/lib/linux2/x64/libssl.so.0.9.8 #7 0x00007f81d89450af in ssl_socket_send (sock=0x7f81d4690b90, buf=0x7f81c403b000 "HTTP/1.1 200 OK\r\nServer: Apache-Coyote/1.1\r\nContent-Length: 0\r\nDate: Tue, 09 Jul 2013 16:14:17 GMT\r\n\r\n-Type: application/json;charset=ISO-8859-1\r\nContent-Length: 37\r\nDate: Tue, 09 Jul 2013 16:13:00 GM"..., len=0x7f81d252a520) at src/sslnetwork.c:458 #8 0x00007f81d8949ef5 in Java_org_apache_tomcat_jni_Socket_sendibb (e=, o=, sock=, offset=0, len=102) at src/network.c:635 #9 0x00007f81e24a5b4f in ?? () #10 0x00007f81d252a598 in ?? () #11 0x00007f81e2494a33 in ?? () #12 0x00007f81e2494a33 in ?? () #13 0x0000000000000066 in ?? () #14 0x00007f81d252a550 in ?? () #15 0x0000000000000000 in ?? () ------------------------------------------------------------------------ Thanks, Senthil Jayakumar -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/7a04ff7a/attachment.html From andrew at icedtea.classpath.org Fri Jul 12 03:40:31 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 12 Jul 2013 10:40:31 +0000 Subject: /hg/icedtea7: Update to u40 b31. Message-ID: changeset cee33aed78b6 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=cee33aed78b6 author: Andrew John Hughes date: Fri Jul 12 11:40:21 2013 +0100 Update to u40 b31. 2013-07-12 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to b31. (CORBA_CHANGESET): Update to current HEAD. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * hotspot.map: Update default to current HEAD. 2013-07-01 Andrew John Hughes * patches/boot/ecj-diamond.patch, * patches/boot/ecj-multicatch.patch: Add new cases. * patches/boot/ecj-stringswitch.patch: Update MethodHandleNatives patch, including adding new case. * patches/boot/tobin.patch: Update following move from sun.awt.X11 to sun.awt. * patches/rhino.patch, * patches/systemtap_gc.patch: Regenerated. diffstat: ChangeLog | 33 +++ Makefile.am | 26 +- hotspot.map | 2 +- patches/boot/ecj-diamond.patch | 60 ++++++ patches/boot/ecj-multicatch.patch | 51 +++++ patches/boot/ecj-stringswitch.patch | 345 ++++++++++++++++++++--------------- patches/boot/tobin.patch | 38 ++- patches/rhino.patch | 54 ++-- patches/systemtap_gc.patch | 54 ++-- 9 files changed, 426 insertions(+), 237 deletions(-) diffs (truncated from 1028 to 500 lines): diff -r 6b8afdb43912 -r cee33aed78b6 ChangeLog --- a/ChangeLog Mon Jul 08 18:02:07 2013 +0100 +++ b/ChangeLog Fri Jul 12 11:40:21 2013 +0100 @@ -1,3 +1,36 @@ +2013-07-12 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to b31. + (CORBA_CHANGESET): Update to current HEAD. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update default to current HEAD. + +2013-07-01 Andrew John Hughes + + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-multicatch.patch: + Add new cases. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives patch, including + adding new case. + * patches/boot/tobin.patch: + Update following move from sun.awt.X11 + to sun.awt. + * patches/rhino.patch, + * patches/systemtap_gc.patch: + Regenerated. + 2013-06-11 Andrew John Hughes * NEWS: Add release notes for 2.1.9, 2.2.9, diff -r 6b8afdb43912 -r cee33aed78b6 Makefile.am --- a/Makefile.am Mon Jul 08 18:02:07 2013 +0100 +++ b/Makefile.am Fri Jul 12 11:40:21 2013 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b20 +OPENJDK_VERSION = b31 JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = fd00f67b65c4 -JAXP_CHANGESET = 7dc9a882c6f8 -JAXWS_CHANGESET = ea9a36dfd4ee -JDK_CHANGESET = 3f1f89553b54 -LANGTOOLS_CHANGESET = 68c60cde94a7 -OPENJDK_CHANGESET = 78c6b2167b94 +CORBA_CHANGESET = 2abbbec3c03c +JAXP_CHANGESET = 9ce0c87f3e87 +JAXWS_CHANGESET = 7278e9a73874 +JDK_CHANGESET = afaedb56b499 +LANGTOOLS_CHANGESET = c523dcea4ff3 +OPENJDK_CHANGESET = 424e7e279ef6 -CORBA_SHA256SUM = 57e71ca50c31456ef8a3086cfe81e6ff627ea207645bbd4dced1e73c51528c56 -JAXP_SHA256SUM = 293bcceac6557965c201437b123cef23c5855dbb22b25f487ba87ccdd1991355 -JAXWS_SHA256SUM = 814fc497356289efb153509837cd97d5a019c388f7f9b1ad98247cf445b9c11d -JDK_SHA256SUM = ca8ff71beba0303d2593f97706a8638ea1948d8387a533a16fce70d6bb85bf88 -LANGTOOLS_SHA256SUM = 807e8d5301dee8e0f532096237987f4b812c472e3d9182d349c1b3371676ec59 -OPENJDK_SHA256SUM = 8de6db8e7b249577f8cfbd343de3a76068200af5ead43255e8f77de3ac34a38f +CORBA_SHA256SUM = 659a2018c44ecc7bc3c287431bd92b5504270ccad81d22f3ff0bcc8aa92a1b75 +JAXP_SHA256SUM = 465110701521ee63e73fde3476c1254b3abdbbcf98a95d83d3ad6319b25cec95 +JAXWS_SHA256SUM = 8c41fcc880171b77e4cfed7a03655770776f4f69ba0c936c3baff5f394e87812 +JDK_SHA256SUM = 1f949d7ecf55cd580c2bba9c81cf3436640ead98a3ea17fcf60b9fdadbb1919b +LANGTOOLS_SHA256SUM = 5ec38227964325397a649c0d1d12b9a64e2a81a35f69da4447708b48b3ad6fd7 +OPENJDK_SHA256SUM = 9fd129437c81a2d8da3b8b176d1dd2a58e656115e08547e4ad819996b5d136d9 CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -r 6b8afdb43912 -r cee33aed78b6 hotspot.map --- a/hotspot.map Mon Jul 08 18:02:07 2013 +0100 +++ b/hotspot.map Fri Jul 12 11:40:21 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 25fe5bf8dee3 844c0c901bda689dd28f3e7846973431bf354bed1efc793d75b78844e21107ce +default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2efa7b70e843 332e1ccf4a3255a82cfbe962d3e5bee0fe7d3fe6b60bf11572c01262a7183adf diff -r 6b8afdb43912 -r cee33aed78b6 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Mon Jul 08 18:02:07 2013 +0100 +++ b/patches/boot/ecj-diamond.patch Fri Jul 12 11:40:21 2013 +0100 @@ -6997,3 +6997,63 @@ List threads = new ArrayList(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-06-27 16:06:42.289384018 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-06-27 16:07:06.489768521 +0100 +@@ -1164,7 +1164,7 @@ + end = end.getSuperclass(); + } + +- HashSet oscNames = new HashSet<>(3); ++ HashSet oscNames = new HashSet(3); + + for (ObjectStreamClass d = this; d != null; d = d.superDesc) { + if (oscNames.contains(d.name)) { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-06-27 16:06:53.297558922 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-06-27 16:07:32.294178507 +0100 +@@ -106,7 +106,7 @@ + * Note that this only applies to createFont() from an InputStream object. + */ + private static class TempFileDeletionHook { +- private static HashMap files = new HashMap<>(); ++ private static HashMap files = new HashMap(); + + private static Thread t = null; + static void init() { +diff --git a/src/share/classes/com/sun/media/sound/AbstractLine.java b/src/share/classes/com/sun/media/sound/AbstractLine.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java +@@ -54,7 +54,7 @@ + * Contains event dispatcher per thread group. + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * Constructs a new AbstractLine. +diff --git a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +@@ -59,7 +59,7 @@ + * dispatcher instance with a factory in EventDispatcher + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * All RealTimeSequencers share this info object. +diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-06-27 20:05:19.200970932 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-06-27 20:05:33.857203747 +0100 +@@ -113,7 +113,7 @@ + SocketAddress[] saa) + { + SecurityManager sm = System.getSecurityManager(); +- Set set = new HashSet<>(saa.length); ++ Set set = new HashSet(saa.length); + for (SocketAddress sa : saa) { + set.add(getRevealedLocalAddress(sa, sm)); + } diff -r 6b8afdb43912 -r cee33aed78b6 patches/boot/ecj-multicatch.patch --- a/patches/boot/ecj-multicatch.patch Mon Jul 08 18:02:07 2013 +0100 +++ b/patches/boot/ecj-multicatch.patch Fri Jul 12 11:40:21 2013 +0100 @@ -401,3 +401,54 @@ throw new InternalError(e.toString()); } catch (InvocationTargetException e) { Throwable t = e.getCause(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2013-06-27 15:56:57.456088537 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2013-06-27 16:02:12.857102777 +0100 +@@ -402,7 +402,13 @@ + try { + ServerNotifForwarder.checkMBeanPermission(this.mBeanServer, + candidate.getObjectName(),"addNotificationListener"); +- } catch (InstanceNotFoundException | SecurityException e) { ++ } catch (InstanceNotFoundException e) { ++ if (logger.debugOn()) { ++ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e); ++ } ++ ++nextSeq; ++ continue; ++ } catch (SecurityException e) { + if (logger.debugOn()) { + logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-06-27 15:56:27.295609027 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-06-27 16:00:59.631938678 +0100 +@@ -1024,10 +1024,10 @@ + dir, + redirects, + redirectErrorStream); +- } catch (IOException | IllegalArgumentException e) { ++ } catch (IOException e) { + String exceptionInfo = ": " + e.getMessage(); + Throwable cause = e; +- if ((e instanceof IOException) && security != null) { ++ if (security != null) { + // Can not disclose the fail reason for read-protected files. + try { + security.checkRead(prog); +@@ -1039,6 +1039,16 @@ + // It's much easier for us to create a high-quality error + // message than the low-level C code which found the problem. + throw new IOException( ++ "Cannot run program \"" + prog + "\"" ++ + (dir == null ? "" : " (in directory \"" + dir + "\")") ++ + exceptionInfo, ++ cause); ++ } catch (IllegalArgumentException e) { ++ String exceptionInfo = ": " + e.getMessage(); ++ Throwable cause = e; ++ // It's much easier for us to create a high-quality error ++ // message than the low-level C code which found the problem. ++ throw new IOException( + "Cannot run program \"" + prog + "\"" + + (dir == null ? "" : " (in directory \"" + dir + "\")") + + exceptionInfo, diff -r 6b8afdb43912 -r cee33aed78b6 patches/boot/ecj-stringswitch.patch --- a/patches/boot/ecj-stringswitch.patch Mon Jul 08 18:02:07 2013 +0100 +++ b/patches/boot/ecj-stringswitch.patch Fri Jul 12 11:40:21 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 13:22:25.036506097 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-02 03:38:10.090272900 +0100 @@ -350,19 +350,16 @@ if (attrCommands != null) { Object lkey = Attribute.keyForLookup(ctype, name); @@ -32,8 +32,8 @@ // Find canonical instance of the requested attribute. Attribute a = Attribute.lookup(Package.attrDefs, ctype, name); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 13:22:25.048506291 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-02 03:38:10.106273156 +0100 @@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -91,8 +91,8 @@ if (logFile != null && !logFile.equals("")) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 13:22:25.052506355 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-02 03:38:10.106273156 +0100 @@ -1116,30 +1116,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -144,8 +144,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-04-04 13:22:25.056506419 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-07-02 03:38:10.106273156 +0100 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -182,9 +182,9 @@ fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-04 13:32:45.886517863 +0100 -@@ -327,12 +327,11 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-07-02 03:42:53.718781065 +0100 +@@ -328,12 +328,11 @@ Object[] appendixResult) { try { if (defc == MethodHandle.class && refKind == REF_invokeVirtual) { @@ -202,59 +202,24 @@ } } catch (Throwable ex) { if (ex instanceof LinkageError) -@@ -395,111 +394,106 @@ - static boolean isCallerSensitive(MemberName mem) { - if (!mem.isInvocable()) return false; // fields are not caller sensitive - Class defc = mem.getDeclaringClass(); -- switch (mem.getName()) { +@@ -403,122 +402,118 @@ + // this method is also called by test/sun/reflect/CallerSensitiveFinder + // to validate the hand-maintained list + private static boolean isCallerSensitiveMethod(Class defc, String method) { +- switch (method) { - case "doPrivileged": - case "doPrivilegedWithCombiner": -+ String memName = mem.getName(); -+ if ("doPrivileged".equals(memName) || -+ "doPrivilegedWithCombiner".equals(memName)) { ++ if ("doPrivileged".equals(method) || ++ "doPrivilegedWithCombiner".equals(method)) { return defc == java.security.AccessController.class; - case "checkMemberAccess": -+ } else if ("checkMemberAccess".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.SecurityManager.class); +- return defc == java.lang.SecurityManager.class; - case "getUnsafe": - return defc == sun.misc.Unsafe.class; - case "lookup": -+ } else if ("getUnsafe".equals(memName)) { -+ return defc == sun.misc.Unsafe.class; -+ } else if ("lookup".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.class; -- case "findStatic": -- case "findVirtual": -- case "findConstructor": -- case "findSpecial": -- case "findGetter": -- case "findSetter": -- case "findStaticGetter": -- case "findStaticSetter": -- case "bind": -- case "unreflect": -- case "unreflectSpecial": -- case "unreflectConstructor": -- case "unreflectGetter": -- case "unreflectSetter": -+ } else if ("findStatic".equals(memName) || -+ "findVirtual".equals(memName) || -+ "findConstructor".equals(memName) || -+ "findSpecial".equals(memName) || -+ "findGetter".equals(memName) || -+ "findSetter".equals(memName) || -+ "findStaticGetter".equals(memName) || -+ "findStaticSetter".equals(memName) || -+ "bind".equals(memName) || -+ "unreflect".equals(memName) || -+ "unreflectSpecial".equals(memName) || -+ "unreflectConstructor".equals(memName) || -+ "unreflectGetter".equals(memName) || -+ "unreflectSetter".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.Lookup.class; +- return defc == java.lang.invoke.MethodHandles.class; - case "invoke": -+ } else if ("invoke".equals(memName)) { - return defc == java.lang.reflect.Method.class; +- return defc == java.lang.reflect.Method.class; - case "get": - case "getBoolean": - case "getByte": @@ -273,33 +238,17 @@ - case "setLong": - case "setFloat": - case "setDouble": -+ } else if ("get".equals(memName) || -+ "getBoolean".equals(memName) || -+ "getByte".equals(memName) || -+ "getChar".equals(memName) || -+ "getShort".equals(memName) || -+ "getInt".equals(memName) || -+ "getFloat".equals(memName) || -+ "getDouble".equals(memName) || -+ "set".equals(memName) || -+ "setBoolean".equals(memName) || -+ "setByte".equals(memName) || -+ "setChar".equals(memName) || -+ "setShort".equals(memName) || -+ "setInt".equals(memName) || -+ "setLong".equals(memName) || -+ "setFloat".equals(memName) || -+ "setDouble".equals(memName)) { - return defc == java.lang.reflect.Field.class; +- return defc == java.lang.reflect.Field.class; - case "newInstance": -+ } else if ("newInstance".equals(memName)) { - if (defc == java.lang.reflect.Constructor.class) return true; - if (defc == java.lang.Class.class) return true; +- if (defc == java.lang.reflect.Constructor.class) return true; +- if (defc == java.lang.Class.class) return true; - break; +- case "getFields": +- return defc == java.lang.Class.class || +- defc == javax.sql.rowset.serial.SerialJavaObject.class; - case "forName": - case "getClassLoader": - case "getClasses": -- case "getFields": - case "getMethods": - case "getConstructors": - case "getDeclaredClasses": @@ -312,88 +261,178 @@ - case "getDeclaredField": - case "getDeclaredMethod": - case "getDeclaredConstructor": -+ } else if ("forName".equals(memName) || -+ "getClassLoader".equals(memName) || -+ "getClasses".equals(memName) || -+ "getFields".equals(memName) || -+ "getMethods".equals(memName) || -+ "getConstructors".equals(memName) || -+ "getDeclaredClasses".equals(memName) || -+ "getDeclaredFields".equals(memName) || -+ "getDeclaredMethods".equals(memName) || -+ "getDeclaredConstructors".equals(memName) || -+ "getField".equals(memName) || -+ "getMethod".equals(memName) || -+ "getConstructor".equals(memName) || -+ "getDeclaredField".equals(memName) || -+ "getDeclaredMethod".equals(memName) || -+ "getDeclaredConstructor".equals(memName)) { - return defc == java.lang.Class.class; +- case "getEnclosingClass": +- case "getEnclosingMethod": +- case "getEnclosingConstructor": +- return defc == java.lang.Class.class; - case "getConnection": - case "getDriver": - case "getDrivers": - case "deregisterDriver": -+ } else if ("getConnection".equals(memName) || -+ "getDriver".equals(memName) || -+ "getDrivers".equals(memName) || -+ "deregisterDriver".equals(memName)) { - return defc == java.sql.DriverManager.class; +- return defc == java.sql.DriverManager.class; - case "newUpdater": -+ } else if ("newUpdater".equals(memName)) { - if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; - if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; - if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; - break; - case "getContextClassLoader": +- return defc == java.lang.Thread.class; +- case "getPackage": +- case "getPackages": +- return defc == java.lang.Package.class; +- case "getParent": +- case "getSystemClassLoader": +- return defc == java.lang.ClassLoader.class; +- case "load": +- case "loadLibrary": +- if (defc == java.lang.Runtime.class) return true; +- if (defc == java.lang.System.class) return true; +- break; +- case "getCallerClass": +- if (defc == sun.reflect.Reflection.class) return true; +- if (defc == java.lang.System.class) return true; +- break; +- case "getCallerClassLoader": +- return defc == java.lang.ClassLoader.class; +- case "registerAsParallelCapable": +- return defc == java.lang.ClassLoader.class; +- case "getProxyClass": +- case "newProxyInstance": +- return defc == java.lang.reflect.Proxy.class; +- case "asInterfaceInstance": +- return defc == java.lang.invoke.MethodHandleProxies.class; +- case "getBundle": +- case "clearCache": +- return defc == java.util.ResourceBundle.class; +- case "getType": +- return defc == java.io.ObjectStreamField.class; +- case "forClass": +- return defc == java.io.ObjectStreamClass.class; +- case "getLogger": +- return defc == java.util.logging.Logger.class; +- case "getAnonymousLogger": +- return defc == java.util.logging.Logger.class; +- } +- return false; ++ } else if ("checkMemberAccess".equals(method)) { ++ return defc == java.lang.SecurityManager.class; ++ } else if ("getUnsafe".equals(method)) { ++ return defc == sun.misc.Unsafe.class; ++ } else if ("lookup".equals(method)) { ++ return defc == java.lang.invoke.MethodHandles.class; ++ } else if ("invoke".equals(method)) { ++ return defc == java.lang.reflect.Method.class; ++ } else if ("get".equals(method) || ++ "getBoolean".equals(method) || ++ "getByte".equals(method) || ++ "getChar".equals(method) || ++ "getShort".equals(method) || ++ "getInt".equals(method) || ++ "getLong".equals(method) || ++ "getFloat".equals(method) || ++ "getDouble".equals(method) || ++ "set".equals(method) || ++ "setBoolean".equals(method) || ++ "setByte".equals(method) || ++ "setChar".equals(method) || ++ "setShort".equals(method) || ++ "setInt".equals(method) || ++ "setLong".equals(method) || ++ "setFloat".equals(method) || ++ "setDouble".equals(method)) { ++ return defc == java.lang.reflect.Field.class; ++ } else if ("newInstance".equals(method)) { ++ if (defc == java.lang.reflect.Constructor.class) return true; ++ if (defc == java.lang.Class.class) return true; ++ } else if ("getFields".equals(method)) { ++ return defc == java.lang.Class.class || ++ defc == javax.sql.rowset.serial.SerialJavaObject.class; ++ } else if ("forName".equals(method) || ++ "getClassLoader".equals(method) || ++ "getClasses".equals(method) || ++ "getFields".equals(method) || ++ "getMethods".equals(method) || From jvanek at redhat.com Fri Jul 12 07:04:47 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 12 Jul 2013 16:04:47 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification Message-ID: <51E00CFF.3070301@redhat.com> Attempt two :) Well this test nearly cost me my sanity (not that there is to much left but...) but here it is again. As Omair have signed himself off this review (after saying that by concept it is ok) this patch is looking for volunteer. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: xdgSpecification-impl.patch Type: text/x-patch Size: 30666 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/8ef0796d/xdgSpecification-impl.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: xdgSpecification-test.patch Type: text/x-patch Size: 55227 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/8ef0796d/xdgSpecification-test.patch From aazores at redhat.com Fri Jul 12 08:09:19 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 12 Jul 2013 11:09:19 -0400 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <51E00CFF.3070301@redhat.com> References: <51E00CFF.3070301@redhat.com> Message-ID: <51E01C1F.4050707@redhat.com> On 07/12/2013 10:04 AM, Jiri Vanek wrote: > Attempt two :) > > Well this test nearly cost me my sanity (not that there is to much > left but...) but here it is again. > > As Omair have signed himself off this review (after saying that by > concept it is ok) this patch is looking for volunteer. > > J. All looks good to me other than a couple style nitpicks, but nothing important. Just things like missing spaces around + when concatenating strings, hardly worth changing :) I think this looks pretty good as it is. I tried to apply the patches in my VM with latest ITW - the tests patch succeeded (as expected since it's just file additions), but the other patch just about entirely failed :( I used hg patch -f --no-commit for this. I tried to use the "patch" command but it complained about a malformed line, so maybe I was just not using it correctly. Not sure what that's about, hopefully it's just a problem on my end though and won't result in some merge conflict! Andrew A From jvanek at redhat.com Fri Jul 12 08:25:25 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 12 Jul 2013 17:25:25 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <51E01C1F.4050707@redhat.com> References: <51E00CFF.3070301@redhat.com> <51E01C1F.4050707@redhat.com> Message-ID: <51E01FE5.2080900@redhat.com> On 07/12/2013 05:09 PM, Andrew Azores wrote: > On 07/12/2013 10:04 AM, Jiri Vanek wrote: >> Attempt two :) >> >> Well this test nearly cost me my sanity (not that there is to much left but...) but here it is >> again. >> >> As Omair have signed himself off this review (after saying that by concept it is ok) this patch is >> looking for volunteer. >> >> J. > > All looks good to me other than a couple style nitpicks, but nothing important. Just things like > missing spaces around + when concatenating strings, hardly worth changing :) I think this looks > pretty good as it is. > > I tried to apply the patches in my VM with latest ITW - the tests patch succeeded (as expected since > it's just file additions), but the other patch just about entirely failed :( I used hg patch -f > --no-commit for this. I tried to use the "patch" command but it complained about a malformed line, > so maybe I was just not using it correctly. Not sure what that's about, hopefully it's just a > problem on my end though and won't result in some merge conflict! > > Andrew A aargh, yah, I have not updated underlying repo. I will post new patch on top of head and with proper reformatting. Tahnx for check! J. From jvanek at redhat.com Fri Jul 12 08:37:49 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 12 Jul 2013 17:37:49 +0200 Subject: More propagated about dialogue - part1 itw-settings Message-ID: <51E022CD.1090208@redhat.com> Since about dialogue is no longer something we have to be ashamed for, I would like to make it more easily reachable. This patch is adding it to itw-settings. The next will add it to splash and so into plugin and javaws loading state. Any opinions? As .. Is it good idea at all? Thanx! J. -------------- next part -------------- A non-text attachment was scrubbed... Name: morePropagatedAboutDialogue1.patch Type: text/x-patch Size: 2710 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/0311dfd5/morePropagatedAboutDialogue1.patch From andrew at icedtea.classpath.org Fri Jul 12 11:32:05 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 12 Jul 2013 18:32:05 +0000 Subject: /hg/icedtea7: Fix regression with compilers that don't support 1... Message-ID: changeset 0a8108854365 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0a8108854365 author: Andrew John Hughes date: Fri Jul 12 19:31:57 2013 +0100 Fix regression with compilers that don't support 1.7 features. 2013-07-12 Andrew John Hughes * patches/boot/ecj-diamond.patch: Regenerate. Add new cases in com.sun.org.apache.xml.internal.serializer.Encodings, sun.nio.ch.EPollArrayWrapper and sun.nio.ch.EPollSelectorImpl. Remove case in sun.util.logging.PlatformLogger. * patches/boot/ecj-multicatch.patch: Add new case in com.sun.org.apache.xml.internal.serializer.Encodings. diffstat: ChangeLog | 12 + patches/boot/ecj-diamond.patch | 1363 ++++++++++++++++++------------------ patches/boot/ecj-multicatch.patch | 14 + 3 files changed, 725 insertions(+), 664 deletions(-) diffs (truncated from 3590 to 500 lines): diff -r cee33aed78b6 -r 0a8108854365 ChangeLog --- a/ChangeLog Fri Jul 12 11:40:21 2013 +0100 +++ b/ChangeLog Fri Jul 12 19:31:57 2013 +0100 @@ -1,3 +1,15 @@ +2013-07-12 Andrew John Hughes + + * patches/boot/ecj-diamond.patch: + Regenerate. Add new cases in + com.sun.org.apache.xml.internal.serializer.Encodings, + sun.nio.ch.EPollArrayWrapper and + sun.nio.ch.EPollSelectorImpl. + Remove case in sun.util.logging.PlatformLogger. + * patches/boot/ecj-multicatch.patch: + Add new case in + com.sun.org.apache.xml.internal.serializer.Encodings. + 2013-07-12 Andrew John Hughes * Makefile.am: diff -r cee33aed78b6 -r 0a8108854365 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Fri Jul 12 11:40:21 2013 +0100 +++ b/patches/boot/ecj-diamond.patch Fri Jul 12 19:31:57 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-03 14:17:36.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-04 18:13:31.220314739 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-08 22:40:57.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-12 16:26:50.787265104 +0100 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,9 +11,9 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-03 14:17:36.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-04 18:13:31.232314934 +0100 -@@ -1316,7 +1316,7 @@ +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-08 22:40:57.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-12 16:26:50.803265359 +0100 +@@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set oaset; synchronized (this) { @@ -23,8 +23,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-03 14:17:36.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-04 18:13:31.236314998 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-08 22:40:57.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-12 16:26:50.803265359 +0100 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -43,9 +43,32 @@ } for (WorkerThread wt : copy) { +diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:55.970380942 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:29.097954416 +0100 +@@ -297,8 +297,8 @@ + // + private final static class EncodingInfos { + // These maps are final and not modified after initialization. +- private final Map _encodingTableKeyJava = new HashMap<>(); +- private final Map _encodingTableKeyMime = new HashMap<>(); ++ private final Map _encodingTableKeyJava = new HashMap(); ++ private final Map _encodingTableKeyMime = new HashMap(); + // This map will be added to after initialization: make sure it's + // thread-safe. This map should not be used frequently - only in cases + // where the mapping requested was not declared in the Encodings.properties +@@ -449,7 +449,7 @@ + + // create instances of EncodingInfo from the loaded mapping + Enumeration keys = props.keys(); +- Map canonicals = new HashMap<>(); ++ Map canonicals = new HashMap(); + while (keys.hasMoreElements()) { + final String javaName = (String) keys.nextElement(); + final String[] mimes = parseMimeTypes(props.getProperty(javaName)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-04 18:13:31.240315064 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-12 16:26:50.803265359 +0100 @@ -62,9 +62,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -61,8 +84,8 @@ private Reference loader; private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-04 18:13:31.244315128 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-12 16:26:50.803265359 +0100 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -82,8 +105,8 @@ CACHE.put(actual, map); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-04 18:13:31.252315258 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-12 16:26:50.815265549 +0100 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -155,8 +178,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-04 18:13:31.272315583 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-12 16:10:24.659639905 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-12 16:26:50.815265549 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -219,8 +242,8 @@ return true; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 18:12:33.863382065 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 18:13:31.276315648 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-12 16:10:24.511637561 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-12 16:26:50.815265549 +0100 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -231,8 +254,8 @@ InnerClass ic = new InnerClass(readClassRef(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-04 18:13:31.280315713 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-12 16:26:50.815265549 +0100 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -269,8 +292,8 @@ if (popset.add(values[i])) popvals.add(values[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-04 18:13:31.284315778 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-12 16:26:50.819265612 +0100 @@ -402,7 +402,7 @@ private static Map codeMap; @@ -281,8 +304,8 @@ Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-04 18:13:31.292315907 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-12 16:26:50.819265612 +0100 @@ -919,7 +919,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -311,8 +334,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 18:13:31.292315907 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-12 16:10:24.659639905 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-12 16:26:50.819265612 +0100 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -350,8 +373,8 @@ for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-04 18:13:31.296315973 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-12 16:26:50.819265612 +0100 @@ -45,7 +45,7 @@ private final ArrayList flist; @@ -362,8 +385,8 @@ for (int i = 0 ; i < capacity ; i++) { flist.add(null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 18:12:33.863382065 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 18:13:31.304316103 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-12 16:10:24.511637561 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-12 16:26:50.819265612 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map attrDefs; @@ -519,8 +542,8 @@ // Add to the end of ths list: if (!fileSet.contains(cls.file)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-04 18:13:31.308316167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-12 16:10:24.659639905 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-12 16:26:50.819265612 +0100 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -634,8 +657,8 @@ ClassEntry thisClass = curClass.thisClass; ClassEntry superClass = curClass.superClass; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-04 18:13:31.312316233 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-12 16:10:24.659639905 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-12 16:26:50.819265612 +0100 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -691,8 +714,8 @@ for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-04 18:13:31.316316297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-12 16:26:50.819265612 +0100 @@ -183,8 +183,8 @@ final Map attrDefs; final Map attrCommands; @@ -723,8 +746,8 @@ for (JarEntry je : Collections.list(jf.entries())) { InFile inFile = new InFile(jf, je); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-04 18:13:31.316316297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-12 16:26:50.819265612 +0100 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -735,8 +758,8 @@ maxForDebug += fillp; int min = Integer.MIN_VALUE; // farthest from the center diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-04 18:13:31.320316362 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-12 16:10:24.663639968 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-12 16:26:50.819265612 +0100 @@ -48,8 +48,8 @@ */ @@ -767,8 +790,8 @@ while (res.remove(null)); return res; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-04 18:13:31.324316427 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-12 16:26:50.823265675 +0100 @@ -58,12 +58,12 @@ private final Map memberEntries; @@ -789,8 +812,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-04 18:13:31.328316492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-12 16:10:24.663639968 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-12 16:26:50.823265675 +0100 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -801,8 +824,8 @@ String name = file.nameString; JarEntry je = new JarEntry(Utils.getJarEntryName(name)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-04 18:13:31.328316492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-12 16:10:24.663639968 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-12 16:26:50.823265675 +0100 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -812,9 +835,33 @@ // convenience methods to access the TL globals static TLGlobals getTLGlobals() { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-12 16:26:51.039269101 +0100 +@@ -54,7 +54,7 @@ + * Contains event dispatcher per thread group. + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * Constructs a new AbstractLine. +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-12 16:26:51.039269101 +0100 +@@ -59,7 +59,7 @@ + * dispatcher instance with a factory in EventDispatcher + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * All RealTimeSequencers share this info object. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-04-04 18:13:31.752323374 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-12 16:26:50.823265675 +0100 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -825,8 +872,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-04-04 18:13:31.752323374 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-12 16:26:50.823265675 +0100 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -837,8 +884,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-04 18:13:31.332316557 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-12 16:26:50.823265675 +0100 @@ -1284,7 +1284,7 @@ */ public Collection toCollection() throws SQLException { @@ -858,8 +905,8 @@ // create a copy CachedRowSetImpl crsTemp; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-04 18:13:31.336316622 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-12 16:26:50.827265739 +0100 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -870,8 +917,8 @@ if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { iMatchKey = cRowset.findColumn(strMatchKey); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-04 18:13:31.340316687 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-07-12 16:26:50.827265739 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -886,8 +933,8 @@ ConfirmationInfo confirmation = new ConfirmationInfo(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-04 18:13:31.344316752 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-07-12 16:26:50.827265739 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -916,8 +963,8 @@ String value; while (peek(";") == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-04 18:13:31.344316752 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-07-12 16:26:50.827265739 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -928,8 +975,8 @@ // initial state private Subject subject; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-04 18:13:31.348316816 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-07-12 16:26:50.827265739 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -940,8 +987,8 @@ certList.add(fromKeyStore[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-04 18:13:31.352316882 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-07-12 16:26:50.827265739 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -952,8 +999,8 @@ /** * Initialize this LoginModule. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-04-04 18:13:31.352316882 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-07-12 16:26:50.827265739 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -964,8 +1011,8 @@ /** * Initialize this LoginModule. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-04-04 18:13:31.356316946 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-07-12 16:26:50.827265739 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -976,8 +1023,8 @@ while (i < certs.length) { userCertList.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-04-04 18:13:31.360317012 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-07-12 16:26:50.831265803 +0100 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -988,8 +1035,8 @@ EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2013-04-04 18:13:31.360317012 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2013-07-12 16:26:50.831265803 +0100 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -1018,9 +1065,9 @@ } return targetBeanInfo; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-04-04 18:13:31.364317076 +0100 -@@ -42,7 +42,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-07-12 16:26:50.831265803 +0100 +@@ -41,7 +41,7 @@ */ final class ThreadGroupContext { @@ -1029,7 +1076,7 @@ /** * Returns the appropriate {@code AppContext} for the caller, -@@ -99,7 +99,7 @@ +@@ -100,7 +100,7 @@ BeanInfo putBeanInfo(Class type, BeanInfo info) { if (this.beanInfoCache == null) { @@ -1039,8 +1086,8 @@ return this.beanInfoCache.put(type, info); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-04-04 18:13:31.368317141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-07-12 16:26:50.831265803 +0100 @@ -34,7 +34,7 @@ */ @@ -1060,8 +1107,8 @@ // reverse the list to maintain previous jdk deletion order. // Last in first deleted. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2013-04-04 18:13:31.372317206 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2013-07-08 22:41:19.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2013-07-12 16:26:50.831265803 +0100 @@ -61,7 +61,7 @@ private volatile boolean closed = false; From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 12:12:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 19:12:50 +0000 Subject: [Bug 1495] a java website freezes firefox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole at redhat.com |aazores at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/71a515ee/attachment.html From aazores at icedtea.classpath.org Fri Jul 12 12:48:10 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Fri, 12 Jul 2013 19:48:10 +0000 Subject: /hg/icedtea-web: Added entry in NEWS about new About dialog. Fix... Message-ID: changeset f18dea419aec in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f18dea419aec author: Andrew Azores date: Fri Jul 12 15:47:04 2013 -0400 Added entry in NEWS about new About dialog. Fixed localization of News tab in AboutDialog.java diffstat: ChangeLog | 6 ++++++ NEWS | 1 + netx/net/sourceforge/jnlp/about/AboutDialog.java | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (36 lines): diff -r 7c111977045d -r f18dea419aec ChangeLog --- a/ChangeLog Thu Jul 11 13:30:52 2013 -0400 +++ b/ChangeLog Fri Jul 12 15:47:04 2013 -0400 @@ -1,3 +1,9 @@ +2013-07-11 Andrew Azores + + * NEWS: added entry regarding new About Dialogue + * netx/net/sourceforge/jnlp/about/AboutDialog.java: fixed localization of + label on News tab + 2013-07-11 Andrew Azores * Makefile.am (stamps/html-gen): moved plaintext-to-HTML logic into new diff -r 7c111977045d -r f18dea419aec NEWS --- a/NEWS Thu Jul 11 13:30:52 2013 -0400 +++ b/NEWS Fri Jul 12 15:47:04 2013 -0400 @@ -16,6 +16,7 @@ - Netx can now parse malformed jnlp files using tagsoup - PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation - PR1473 - javaws should not depend on name of local file + - Redesigned About dialogue layout and contents * Plugin - PR854: Resizing an applet several times causes 100% CPU load diff -r 7c111977045d -r f18dea419aec netx/net/sourceforge/jnlp/about/AboutDialog.java --- a/netx/net/sourceforge/jnlp/about/AboutDialog.java Thu Jul 11 13:30:52 2013 -0400 +++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java Fri Jul 12 15:47:04 2013 -0400 @@ -84,7 +84,7 @@ aboutPanel = new HTMLPanel(res_about, R("AboutDialogueTabAbout")); authorsPanel = new HTMLPanel(res_authors, R("AboutDialogueTabAuthors")); - newsPanel = new HTMLPanel(res_news, R("News")); + newsPanel = new HTMLPanel(res_news, R("AboutDialogueTabNews")); changelogPanel = new HTMLPanel(res_changelog, R("AboutDialogueTabChangelog")); copyingPanel = new HTMLPanel(res_copying, R("AboutDialogueTabGPLv2")); From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 13:41:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 20:41:44 +0000 Subject: [Bug 1363] [IcedTea7] Fedora 19 / rawhide FTBFS SIGILL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1363 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=bfd6b1164c18 author: chrisphi date: Thu Mar 21 11:17:13 2013 -0400 PR1363: Fedora 19 / rawhide FTBFS SIGILL Changed thumb2 PUSH & POP to inline functions, Added detection of reg alloc failure, fails compile of method. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/319dc39b/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 13:43:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 20:43:39 +0000 Subject: [Bug 1495] a java website freezes firefox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #1 from Andrew Azores --- Can you post pacman -Q | grep -e "icedtea\|openjdk" please? Here's mine: $ pacman -Q | grep -e "icedtea\|openjdk" icedtea-web-java7 1.4-1 jdk7-openjdk 7.u40_2.4.1-1 jre7-openjdk 7.u40_2.4.1-1 jre7-openjdk-headless 7.u40_2.4.1-1 openjdk7-src 7.u40_2.4.1-1 With latest IcedTea-Web build from mercurial in use as the browser plugin rather than icedtea-web-java7 (from "extra" repo), all of this works fine. However, with those packages installed and icedtea-web-java7 package in use, I see somewhat similar behaviour. The applets on the page fail to load with the same error messages, however my Firefox does not become unresponsive. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/d5c25493/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 13:49:19 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 20:49:19 +0000 Subject: [Bug 1495] a java website freezes firefox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 --- Comment #2 from Andrew Azores --- Tested on Fedora 18 as well. Website works fine with ITW installed normally using yum, as well as with latest mercurial build. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/de280661/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 14:39:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 21:39:02 +0000 Subject: [Bug 1495] a java website freezes firefox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 --- Comment #3 from Kevin --- Great! So I guess the bug is already fixed? However, that's strange that my firefox freezes and yours doesn't. Are you using firefox 22.0-1 (archlinux)? I get a freeze even with a fresh ~/.mozilla directory, although it takes a little more effort. But I can reliably get firefox to freeze in less than a minute by scrolling up and down http://www.ibiblio.org/e-notes/ and clicking a link and hitting the back button a couple times. Below is my pacman output. $ pacman -Q | grep -e "icedtea\|openjdk" icedtea-web-java7 1.4-1 jdk7-openjdk 7.u40_2.4.1-1 jre7-openjdk 7.u40_2.4.1-1 jre7-openjdk-headless 7.u40_2.4.1-1 thanks -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/237278c9/attachment.html From andrew at icedtea.classpath.org Fri Jul 12 14:40:31 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 12 Jul 2013 21:40:31 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: 30 new changesets Message-ID: changeset c55bef1f3c2e in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c55bef1f3c2e author: aph date: Thu Mar 15 07:53:52 2012 -0400 Add arm_port from IcedTea 6 changeset 733eef8af470 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=733eef8af470 author: aph date: Thu Mar 15 07:56:24 2012 -0400 Add patches/arm.patch from IcedTea 6 changeset bc91339fbc87 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=bc91339fbc87 author: aph date: Thu Mar 15 07:57:19 2012 -0400 Add patches/arm-debug.patch from IcedTea 6 changeset dcf6ee42e839 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=dcf6ee42e839 author: andrew date: Fri Jul 12 21:45:24 2013 +0100 Add patches/arm-hsdis.patch from IcedTea 6 changeset 6f09f57b684f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=6f09f57b684f author: aph date: Thu Mar 15 08:54:12 2012 -0400 Move arm-port files to the correct place changeset 721a0698d9c7 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=721a0698d9c7 author: aph date: Fri Jul 12 21:46:55 2013 +0100 Changes for HSX22 changeset 1b5ced49aa9f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=1b5ced49aa9f author: aph date: Fri Mar 16 08:36:04 2012 -0400 Use unified syntax for thumb code. 2012-03-16 Andrew Haley * hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax for thumb code. changeset 9d94a5fd37a7 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=9d94a5fd37a7 author: aph date: Tue Mar 27 09:40:08 2012 -0400 ARM: First cut of invokedynamic changeset e6035cca61fe in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e6035cca61fe author: aph date: Fri Mar 30 11:53:01 2012 -0400 invokedynamic and aldc for JIT changeset dc9aad1d1e45 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=dc9aad1d1e45 author: aph date: Fri Mar 30 13:34:30 2012 -0400 ARM: JIT-compilation of ldc methodHandle changeset b0e8fbcb7413 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=b0e8fbcb7413 author: aph date: Mon Apr 02 06:09:48 2012 -0400 Revert change to -O0 changeset 44561baab700 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=44561baab700 author: aph date: Tue Apr 10 12:22:01 2012 -0400 Tidy up, minor comment changes. changeset bbdfa2225c43 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=bbdfa2225c43 author: aph date: Wed Apr 11 09:22:39 2012 -0400 Minor review cleanups. changeset e6d602f07305 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e6d602f07305 author: adinn date: Tue May 01 16:13:47 2012 +0100 added jvmti event generation for dynamic_generate and compiled_method_load events to ARM JIT compiler changeset 181ca5501979 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=181ca5501979 author: adinn date: Wed May 16 11:21:07 2012 +0100 modified safepoint check to rely on memory protect signal instead of polling changeset 46de0f03f7d6 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=46de0f03f7d6 author: aph date: Thu May 17 13:45:50 2012 -0400 RTC Thumb2 JIT enhancements. 2012-05-16 Andrew Haley * src/cpu/zero/vm/thumb2.cpp: Throughout: T2EE_PRINT_* renamed to T2_PRINT_*. Route all debug info to stderr. We now do frameless compilation, so do all frame accesses relative to SP. Remove zombie detection pass. Remove dead code. Add OSPACE option. (H_LDC_W) (H_INVOKESTATIC_RESOLVED, H_INVOKESPECIAL_RESOLVED) (H_INVOKEVIRTUAL_RESOLVED, H_INVOKEVFINAL, H_MONITORENTER) (H_MONITOREXIT): New. (T2_* macros): Rename from T2EE_*. (SLOW_ENTRY_OFFSET, FAST_ENTRY_OFFSET): New. (THUMB2_CODEBUF_SIZE): Make this depend on PRODUCT. (H_GETSTATIC, H_PUTSTATIC, H_JSR, H_ZOMBIE, H_MONITOR): Delete. (H_DEADCODE, H_LDC_W, H_INVOKESTATIC_RESOLVED) (H_INVOKESPECIAL_RESOLVED, H_INVOKEVIRTUAL_RESOLVED) (H_INVOKEVFINAL): New. (DebugSwitch): New. (JAZ_V6): New local register. (Thumb2_pass1): Count reads and writes for register allocator. Delete zombie detection pass. (Thumb2_RegAlloc): New. (out_align, out_align_offset, nop_16, nop_32): New. (fullBarrier, storeBarrier): Chaeck for an MP OS. (load_local, store_local): Check for an istate reg. (load_istate, store_istate): New. (Thumb2_Load, Thumb2_LoadX2): Remove monitor stack adj. (Thumb2_Store, Thumb2_StoreX2): Likewise. (Debug): New. (Thumb2_save_locals, Thumb2_restore_locals, Thumb2_invoke_save) (Thumb2_invoke_restore, Thumb2_Exit): Remove monitor stackdepth adj. Move here from below. (Thumb2_Accessor): Rewrite for new method header layout. (Thumb2_Enter): Likewise. Do frameless setup. (Thumb2_load_long): Use a single ldrexd instruction. (Thumb2_codegen): Align branches. Call Debug if we're about to enter a synchronized method. (opc_jsr) Add handler. (opc_monitorenter, opc_monitorexit): Call handler instead of generating code. (Thumb2_Initialize): Disassmble ARM and Thumb code separately. * src/cpu/zero/vm/cppInterpreter_arm.S: Throughout: the thread pointer is now in a register, so use it everywhere. Set the thread pointer register at every entry point to the interpreter. Throughout: use the macros SLOW_ENTRY and FAST_ENTRY rather than ALIGN_CODE. Throughout: register tmp2 is no longer available, use other registers as appropriate. (T2JIT): Rename from THUMB2EE. (call_thumb2): Load all the thumb2 registers that have been allocated to locals. (accessor_entry): Check for stack overflow. (.fast_accessor_*): Delete dead code. (LOAD_FRAME): New. (Thumb2_invokevfinalresolved_stub) (Thumb2_invokevirtualresolved_stub): New. (Thumb2_invokestaticresolved_stub): New. (Thumb2_invokespecialresolved_stub): New. (Thumb2 stubs): Use FRAME_* rather than ISTATE_*; the frame pointer is no longer in a fixed register. (JAZ_REGSET, JAZ_*): Move delaration of JAZ registers here. (Thumb2_monitorenter): New. (normal_entry_synchronized): Rearrange so that we can load the thread pointer without exceeding the number of instructions that we can fit into the gap between SLOW_ENTRY and FAST_ENTRY. (normal_entry): Likewise. (MP_COMPILE_THRESHOLD, UP_COMPILE_THRESHOLD): Adjust. (TBIT): New. (FRAME_METHOD, FRAME_CONSTANTS, FRAME_BCP, FRAME_STACK_LIMIT) (FRAME_LOCALS, FRAME_STACK): New. (SLOW_ENTRY, FAST_ENTRY, SLOW_ENTRY_OFFSET, FAST_ENTRY_OFFSET): New. (LOAD_ISTATE): New. (DECACHE_STACK_USING_FRAME, DECACHE_JPC_USING_FRAME): New. (TRACE): Save and restore IP. Pass istate to my_trace(). (Opcode monitorenter): Remove all the assembler code and replace it with a call to Helper_monitorenter. * src/cpu/zero/vm/bytecodes_arm.def: Throughout: register tmp2 is no longer available, use other registers as appropriate. (lgetfield): Use ldrexd to load a jlong rather than an ldrexd/strexd loop. * src/cpu/zero/vm/asm_helper.cpp (ARCH_THUMB2): Renamed from ARCH_THUMBEE. (my_trace): New. (Helper_monitorenter): New. (Helper_monitorexit): New. changeset 0bebe238c22f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=0bebe238c22f author: aph date: Mon May 28 08:01:18 2012 -0400 Use ldrexd for atomic reads on ARMv7. 2012-05-28 Andrew Haley * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads on ARMv7. changeset 3d357a7b7112 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=3d357a7b7112 author: aph date: Mon May 28 08:48:42 2012 -0400 Adjust saved SP when safepointing. 2012-05-28 Andrew Haley * thumb2.cpp (Thumb2_Safepoint): Adjust saved SP when safepointing. changeset 7c2f5538e02d in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7c2f5538e02d author: aph date: Tue May 29 10:11:11 2012 -0400 Phase 1 changeset 5dced5a7d1e4 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=5dced5a7d1e4 author: aph date: Tue May 29 11:06:21 2012 -0400 Phase 2 changeset 41fd39ce5b99 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=41fd39ce5b99 author: aph date: Wed May 30 10:20:02 2012 -0400 Don't save locals at a return. changeset f678e6078f9a in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=f678e6078f9a author: aph date: Thu May 31 06:42:18 2012 -0400 Back out mistaken checkin of debug code. changeset 392b9d0730b8 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=392b9d0730b8 author: adinn date: Thu Jun 07 17:49:46 2012 +0100 corrected call from fast_method_handle_entry to CppInterpreter::method_handle_entry so that thread is loaded into r2 changeset 7e952fe03882 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7e952fe03882 author: aph date: Wed Jun 06 10:09:22 2012 -0400 Fix JIT bug that miscompiles org.eclipse.ui.internal.contexts.ContextAuthority.sourceChanged 2012-06-06 Andrew Haley * thumb2.cpp (Thumb2_Compile): Ask the CompilerOracle if we should compile this method. (Thumb2_iOp): Use a temporary to hold the shift count. changeset ec8bef596010 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ec8bef596010 author: aph date: Fri Jun 08 09:11:52 2012 -0400 ARM: Rename a bunch of misleadingly-named functions 2012-06-08 Andrew Haley * thumb2.cpp: Rename some functions: Thumb2_save_locals -> Thumb2_save_local_refs Thumb2_restore_locals -> Thumb2_restore_local_refs Thumb2_invoke_save -> Thumb2_save_all_locals Thumb2_invoke_restore -> Thumb2_restore_all_locals changeset 716e3ad6e2c6 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=716e3ad6e2c6 author: aph date: Fri Jun 08 10:25:37 2012 -0400 Fix call to handle_special_method(). Fix compareAndSwapLong. 2012-06-08 Andrew Haley * thumb2.cpp (Thumb2_codegen): Move call to handle_special_method() outside test. (handle_special_method: _compareAndSwapLong): Save/restore all locals, not just locals of ref type. changeset 8910dbb0a40f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=8910dbb0a40f author: chrisphi date: Thu Aug 30 11:53:27 2012 -0400 ARM: Fix trashed thread ptr after recursive re-entry from asm jit. changeset ad0849bb122e in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ad0849bb122e author: chrisphi date: Thu Mar 21 11:17:13 2013 -0400 PR1363: Fedora 19 / rawhide FTBFS SIGILL Changed thumb2 PUSH & POP to inline functions, added detection of reg alloc failure, fails compile of method. changeset 920cd25ec34c in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=920cd25ec34c author: Xerxes Ranby date: Tue May 28 19:43:58 2013 +0200 PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel Summary: The POPF1 macro used wrong destination register r0 instead of r1 on ARM armel causing issues with the frem bytecode. The frem bytecode was the only bytecode using the defect macro. changeset 84b9ad961553 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=84b9ad961553 author: chrisphi date: Fri Jul 12 22:18:15 2013 +0100 Changes for HSX23 diffstat: make/linux/makefiles/gcc.make | 2 + make/linux/makefiles/vm.make | 2 +- make/linux/makefiles/zeroshark.make | 35 + src/cpu/zero/vm/arm_cas.S | 31 + src/cpu/zero/vm/asm_helper.cpp | 730 + src/cpu/zero/vm/bytecodes_arm.def | 7847 ++++++++++++++++ src/cpu/zero/vm/bytecodes_zero.cpp | 52 +- src/cpu/zero/vm/bytecodes_zero.hpp | 41 +- src/cpu/zero/vm/cppInterpreter_arm.S | 7367 +++++++++++++++ src/cpu/zero/vm/cppInterpreter_zero.cpp | 11 + src/cpu/zero/vm/thumb2.cpp | 7952 +++++++++++++++++ src/cpu/zero/vm/vm_version_zero.hpp | 11 + src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 14 + src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 25 + src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 6 + src/share/tools/hsdis/Makefile | 10 +- src/share/tools/hsdis/hsdis.c | 5 + src/share/vm/prims/jvmtiExport.cpp | 41 + src/share/vm/prims/jvmtiExport.hpp | 6 + src/share/vm/utilities/vmError.cpp | 13 + src/share/vm/utilities/vmError.hpp | 8 + tools/mkbc.c | 607 + 22 files changed, 24810 insertions(+), 6 deletions(-) diffs (truncated from 25073 to 500 lines): diff -r 7e85081672b2 -r 84b9ad961553 make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Sun Jun 23 16:53:51 2013 +0100 +++ b/make/linux/makefiles/gcc.make Fri Jul 12 22:18:15 2013 +0100 @@ -262,6 +262,7 @@ FASTDEBUG_CFLAGS/amd64 = -g FASTDEBUG_CFLAGS/arm = -g FASTDEBUG_CFLAGS/ppc = -g + FASTDEBUG_CFLAGS/zero = -g FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) FASTDEBUG_CFLAGS += -gstabs @@ -271,6 +272,7 @@ OPT_CFLAGS/amd64 = -g OPT_CFLAGS/arm = -g OPT_CFLAGS/ppc = -g + OPT_CFLAGS/zero = -g OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) OPT_CFLAGS += -gstabs diff -r 7e85081672b2 -r 84b9ad961553 make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Sun Jun 23 16:53:51 2013 +0100 +++ b/make/linux/makefiles/vm.make Fri Jul 12 22:18:15 2013 +0100 @@ -223,7 +223,7 @@ # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. define findsrc $(notdir $(shell find $(1)/. ! -name . -prune \ - -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \ + -a \( -name \*.c -o -name \*.cpp -o -name \*.s -o -name \*.S \) \ -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \))) endef diff -r 7e85081672b2 -r 84b9ad961553 make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Sun Jun 23 16:53:51 2013 +0100 +++ b/make/linux/makefiles/zeroshark.make Fri Jul 12 22:18:15 2013 +0100 @@ -25,6 +25,41 @@ # Setup common to Zero (non-Shark) and Shark versions of VM +ifeq ($(ZERO_LIBARCH),arm) + +Obj_Files += asm_helper.o +Obj_Files += cppInterpreter_arm.o +Obj_Files += thumb2.o + +CFLAGS += -DHOTSPOT_ASM + +cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s +thumb2.o: offsets_arm.s + +offsets_arm.s: mkoffsets + @echo Generating assembler offsets + ./mkoffsets > $@ + +bytecodes_arm.s: bytecodes_arm.def mkbc + @echo Generatine ARM assembler bytecode sequences + $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) + +mkbc: $(GAMMADIR)/tools/mkbc.c + @echo Compiling mkbc tool + $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) + +mkoffsets: asm_helper.cpp + @echo Compiling offset generator + $(QUIETLY) $(REMOVE_TARGET) + $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + +endif + +%.o: %.S + @echo Assembling $< + $(QUIETLY) $(REMOVE_TARGET) + $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) + # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized diff -r 7e85081672b2 -r 84b9ad961553 src/cpu/zero/vm/arm_cas.S --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/zero/vm/arm_cas.S Fri Jul 12 22:18:15 2013 +0100 @@ -0,0 +1,31 @@ +#ifdef __ARM_ARCH_7A__ +@ jlong +@ arm_val_compare_and_swap_long(volatile void *ptr, +@ jlong oldval, +@ jlong newval) { + .pushsection .text + .global arm_val_compare_and_swap_long +#ifdef __thumb__ + .syntax unified + .thumb_func +#endif + .type arm_val_compare_and_swap_long, %function +arm_val_compare_and_swap_long: + stmfd sp!, {r4, r5, r6, r7} + ldrd r4, [sp, #16] + dmb sy +0: ldrexd r6, [r0] + cmp r6, r2 + it eq + cmpeq r7, r3 + bne 1f + strexd r1, r4, [r0] + cmp r1, #0 + bne 0b + dmb sy +1: mov r0, r6 + mov r1, r7 + ldmfd sp!, {r4, r5, r6, r7} + bx lr + .popsection +#endif // __ARM_ARCH_7A__ diff -r 7e85081672b2 -r 84b9ad961553 src/cpu/zero/vm/asm_helper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/zero/vm/asm_helper.cpp Fri Jul 12 22:18:15 2013 +0100 @@ -0,0 +1,730 @@ +/* + * Copyright 2009, 2010 Edward Nevill + * Copyright 2011, Red Hat + * + * 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. + * + * 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. + */ + +#ifdef __arm__ + +#define ARCH_THUMB2 (1<<16) +#define ARCH_VFP (1<<17) +#define ARCH_CLZ (1<<18) + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interp_masm_zero.hpp" +#include "interpreter/bytecodeInterpreter.hpp" +#include "interpreter/bytecodeInterpreter.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" + +#ifndef STATIC_OFFSETS + +#include +#include + +#define VECBUFF_SIZE 64 + +static char valuebuf[128]; + +// Return the name of the current method. Not multi-thread safe. +extern "C" char* +meth(interpreterState istate) { + istate->method()->name_and_sig_as_C_string(valuebuf, sizeof valuebuf); + char *p = valuebuf + strlen(valuebuf); + sprintf(p, ": " PTR_FORMAT " (bci %d)", + (intptr_t) istate->bcp(), + istate->method()->bci_from(istate->bcp())); + return valuebuf; +} + +// Used for debugging the interpreter. The macro TRACE in +// cppInterpreter_arm.S calls this routine, and you can trap on a +// particular method. +#define NAME1 "sun.nio.ch.FileChannelImpl$Unmapper.run()V" +#define EQ(S1, S2) (S1 && (strncmp(S1, S2, strlen(S2)) == 0)) +extern "C" void my_trace(void *jpc, void *istate) +{ + char *name = meth((interpreterState)istate); + if (EQ(name, NAME1)); + asm volatile("nop"); // Somewhere to put a breakpoint +} + +extern "C" unsigned hwcap(void) +{ + int fd; + unsigned vecs[VECBUFF_SIZE]; + unsigned *p; + int i, n; + unsigned rc = 0; + unsigned arch = 4; + + fd = open("/proc/self/auxv", O_RDONLY); + if (fd < 0) return 0; + do { + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); + p = vecs; + i = n/8; + while (--i >= 0) { + unsigned tag = *p++; + unsigned value = *p++; + if (tag == 0) goto fini; + if (tag == AT_HWCAP) { + if (value & HWCAP_THUMBEE) rc |= ARCH_THUMB2; + if (value & HWCAP_VFP) rc |= ARCH_VFP; + } else if (tag == AT_PLATFORM) { + const char *s = (const char *)value; + int c; + + if (*s++ == 'v') { + arch = 0; + while ((isdigit)(c = *s++)) arch = arch * 10 + c - '0'; + } + } + } + } while (n == VECBUFF_SIZE * sizeof(unsigned)); +fini: + close(fd); +// printf("arch = %d, rc = 0x%08x\n", arch, rc); + if (arch >= 5) rc |= ARCH_CLZ; + if (arch >= 7) rc |= ARCH_THUMB2; + return rc | (1<is_lock_owned(r1); +} + +extern "C" HeapWord **CollectedHeap_top_addr(CollectedHeap *r0) +{ + return r0->top_addr(); +} + +extern "C" HeapWord **CollectedHeap_end_addr(CollectedHeap *r0) +{ + return r0->end_addr(); +} + +extern "C" char *SharedRuntime_generate_class_cast_message(const char *name, const char *klass) +{ + return SharedRuntime::generate_class_cast_message(name, klass); +} + +#define HELPER_THROW(thread, name, msg) Exceptions::_throw_msg(thread, __FILE__, __LINE__, name, msg) + +class VMStructs { +public: + static inline klassOop klass_at_addr(constantPoolOop constants, u2 index) { + return (klassOop) *constants->obj_at_addr_raw(index); + } +}; + +extern "C" oop Helper_new(interpreterState istate, unsigned index) +{ + JavaThread *thread = istate->thread(); + + constantPoolOop constants = istate->method()->constants(); + oop result = NULL; + if (!constants->tag_at(index).is_unresolved_klass()) { + // Make sure klass is initialized and doesn't have a finalizer + oop entry = VMStructs::klass_at_addr(constants, index); + klassOop k_entry = (klassOop) entry; + instanceKlass* ik = (instanceKlass*) k_entry->klass_part(); + if ( ik->is_initialized() && ik->can_be_fastpath_allocated() ) { + size_t obj_size = ik->size_helper(); + // If the TLAB isn't pre-zeroed then we'll have to do it + bool need_zero = !ZeroTLAB; + if (UseTLAB) { + result = (oop) thread->tlab().allocate(obj_size); + } + if (result == NULL && !CMSIncrementalMode) { + need_zero = true; + // Try allocate in shared eden + retry: + HeapWord* compare_to = *Universe::heap()->top_addr(); + HeapWord* new_top = compare_to + obj_size; + if (new_top <= *Universe::heap()->end_addr()) { + if (Atomic::cmpxchg_ptr(new_top, Universe::heap()->top_addr(), compare_to) != compare_to) { + goto retry; + } + result = (oop) compare_to; + } + } + if (result != NULL) { + // Initialize object (if nonzero size and need) and then the header + if (need_zero ) { + HeapWord* to_zero = (HeapWord*) result + sizeof(oopDesc) / oopSize; + obj_size -= sizeof(oopDesc) / oopSize; + if (obj_size > 0 ) { + memset(to_zero, 0, obj_size * HeapWordSize); + } + } + if (UseBiasedLocking) { + result->set_mark(ik->prototype_header()); + } else { + result->set_mark(markOopDesc::prototype()); + } + result->set_klass_gap(0); + result->set_klass(k_entry); + return result; + } + } + } + // Slow case allocation + InterpreterRuntime::_new(thread, istate->method()->constants(), index); + result = thread->vm_result(); + thread->set_vm_result(NULL); + return result; +} + +extern "C" int Helper_instanceof(interpreterState istate, unsigned index, oop tos) +{ + if (tos == NULL) return 0; + + // Constant pool may have actual klass or unresolved klass. If it is + // unresolved we must resolve it + if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) { + InterpreterRuntime::quicken_io_cc(istate->thread()); + if (istate->thread()->has_pending_exception()) return 0; + } + klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index); + klassOop objKlassOop = tos->klass(); + // + // Check for compatibilty. This check must not GC!! + // Seems way more expensive now that we must dispatch + // + return objKlassOop == klassOf || objKlassOop->klass_part()->is_subtype_of(klassOf); +} + +extern "C" oop Helper_checkcast(interpreterState istate, unsigned index, oop tos) +{ + if (tos == NULL) return NULL; + + // Constant pool may have actual klass or unresolved klass. If it is + // unresolved we must resolve it + if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) { + oop except_oop; + InterpreterRuntime::quicken_io_cc(istate->thread()); + if (except_oop = istate->thread()->pending_exception()) return except_oop; + } + klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index); + klassOop objKlassOop = tos->klass(); //ebx + // + // Check for compatibilty. This check must not GC!! + // Seems way more expensive now that we must dispatch + // + if (objKlassOop != klassOf && !objKlassOop->klass_part()->is_subtype_of(klassOf)) { + ResourceMark rm(istate->thread()); + const char* objName = Klass::cast(objKlassOop)->external_name(); + const char* klassName = Klass::cast(klassOf)->external_name(); + char* message = SharedRuntime::generate_class_cast_message(objName, klassName); + ThreadInVMfromJava trans(istate->thread()); + HELPER_THROW(istate->thread(), vmSymbols::java_lang_ClassCastException(), message); + } + return istate->thread()->pending_exception(); +} + +extern "C" oop Helper_monitorenter(interpreterState istate, oop lockee) +{ + BasicObjectLock* limit = istate->monitor_base(); + BasicObjectLock* most_recent = (BasicObjectLock*) istate->stack_base(); + BasicObjectLock* entry = NULL; + markOop displaced; + JavaThread *thread = istate->thread(); + + if (lockee == NULL) { + HELPER_THROW(istate->thread(), vmSymbols::java_lang_NullPointerException(), ""); + goto handle_exception; + } + while (most_recent != limit ) { + if (most_recent->obj() == NULL) entry = most_recent; + else if (most_recent->obj() == lockee) break; + most_recent++; + } + if (entry == NULL) { + int monitor_words = frame::interpreter_frame_monitor_size(); + ZeroStack *stack = thread->zero_stack(); + + if (monitor_words > stack->available_words()) { + InterpreterRuntime::throw_StackOverflowError(thread); + goto handle_exception; + } else { + stack->alloc(monitor_words * wordSize); + + for (intptr_t *p = istate->stack() + 1; p < istate->stack_base(); p++) + *(p - monitor_words) = *p; + + istate->set_stack_limit(istate->stack_limit() - monitor_words); + istate->set_stack(istate->stack() - monitor_words); + istate->set_stack_base(istate->stack_base() - monitor_words); + + entry = (BasicObjectLock *) istate->stack_base(); + } + } + entry->set_obj(lockee); + displaced = lockee->mark()->set_unlocked(); + entry->lock()->set_displaced_header(displaced); + if (Atomic::cmpxchg_ptr(entry, lockee->mark_addr(), displaced) != displaced) { + // Is it simple recursive case? + if (thread->is_lock_owned((address) displaced->clear_lock_bits())) { + entry->lock()->set_displaced_header(NULL); + } else { + InterpreterRuntime::monitorenter(thread, entry); + } + } +handle_exception: + return thread->pending_exception(); +} + +extern "C" oop Helper_monitorexit(interpreterState istate, oop lockee) +{ + BasicObjectLock* limit = istate->monitor_base(); + BasicObjectLock* most_recent = (BasicObjectLock*) istate->stack_base(); + JavaThread *thread = istate->thread(); + + if (lockee == NULL) { + HELPER_THROW(istate->thread(), vmSymbols::java_lang_NullPointerException(), ""); + goto handle_exception; + } + while (most_recent != limit ) { + if ((most_recent)->obj() == lockee) { + BasicLock* lock = most_recent->lock(); + markOop header = lock->displaced_header(); + most_recent->set_obj(NULL); + if (header != NULL) { + if (Atomic::cmpxchg_ptr(header, lockee->mark_addr(), lock) != lock) { + // restore object for the slow case + most_recent->set_obj(lockee); + InterpreterRuntime::monitorexit(thread, most_recent); + } + } + return thread->pending_exception(); + } + most_recent++; + } + InterpreterRuntime::throw_illegal_monitor_state_exception(thread); +handle_exception: + return thread->pending_exception(); +} + +extern "C" oop Helper_aastore(interpreterState istate, oop value, int index, arrayOop arrayref) +{ + if (arrayref == NULL) { + ThreadInVMfromJava trans(istate->thread()); + HELPER_THROW(istate->thread(), vmSymbols::java_lang_NullPointerException(), ""); + } else if ((uint32_t)index >= (uint32_t)arrayref->length()) { + char message[jintAsStringSize]; + sprintf(message, "%d", index); + HELPER_THROW(istate->thread(), vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message); + } else { + if (value != NULL) { + /* Check assignability of value into arrayref */ + klassOop rhsKlassOop = value->klass(); // EBX (subclass) + klassOop elemKlassOop = ((objArrayKlass*) arrayref->klass()->klass_part())->element_klass(); + // + // Check for compatibilty. This check must not GC!! + // Seems way more expensive now that we must dispatch + // + if (rhsKlassOop != elemKlassOop && !rhsKlassOop->klass_part()->is_subtype_of(elemKlassOop)) { + HELPER_THROW(istate->thread(), vmSymbols::java_lang_ArrayStoreException(), ""); + goto handle_exception; + } + } + oop* elem_loc = (oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)); + // *(oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)) = value; + *elem_loc = value; + // Mark the card + BarrierSet* bs = Universe::heap()->barrier_set(); + static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base); + OrderAccess::release_store(&_byte_map_base[(uintptr_t)elem_loc >> CardTableModRefBS::card_shift], 0); + } +handle_exception: + return istate->thread()->pending_exception(); +} + +extern "C" void Helper_aputfield(oop obj) +{ + BarrierSet* bs = Universe::heap()->barrier_set(); + static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base); + OrderAccess::release_store(&_byte_map_base[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0); +} + +extern "C" oop Helper_synchronized_enter(JavaThread *thread, BasicObjectLock *mon) +{ + BasicLock *lock = mon->lock(); + markOop displaced = lock->displaced_header(); From bugzilla-daemon at icedtea.classpath.org Fri Jul 12 14:40:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 12 Jul 2013 21:40:40 +0000 Subject: [Bug 1363] [IcedTea7] Fedora 19 / rawhide FTBFS SIGILL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1363 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ad0849bb122e author: chrisphi date: Thu Mar 21 11:17:13 2013 -0400 PR1363: Fedora 19 / rawhide FTBFS SIGILL Changed thumb2 PUSH & POP to inline functions, added detection of reg alloc failure, fails compile of method. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130712/7c06b560/attachment.html From jvanek at redhat.com Sat Jul 13 04:21:14 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 13 Jul 2013 13:21:14 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <51E01FE5.2080900@redhat.com> References: <51E00CFF.3070301@redhat.com> <51E01C1F.4050707@redhat.com> <51E01FE5.2080900@redhat.com> Message-ID: <51E1382A.5010303@redhat.com> On 07/12/2013 05:25 PM, Jiri Vanek wrote: > On 07/12/2013 05:09 PM, Andrew Azores wrote: >> On 07/12/2013 10:04 AM, Jiri Vanek wrote: >>> Attempt two :) >>> >>> Well this test nearly cost me my sanity (not that there is to much left but...) but here it is >>> again. >>> >>> As Omair have signed himself off this review (after saying that by concept it is ok) this patch is >>> looking for volunteer. >>> >>> J. >> >> All looks good to me other than a couple style nitpicks, but nothing important. Just things like >> missing spaces around + when concatenating strings, hardly worth changing :) I think this looks >> pretty good as it is. >> >> I tried to apply the patches in my VM with latest ITW - the tests patch succeeded (as expected since >> it's just file additions), but the other patch just about entirely failed :( I used hg patch -f >> --no-commit for this. I tried to use the "patch" command but it complained about a malformed line, >> so maybe I was just not using it correctly. Not sure what that's about, hopefully it's just a >> problem on my end though and won't result in some merge conflict! >> >> Andrew A > > aargh, yah, I have not updated underlying repo. > > I will post new patch on top of head and with proper reformatting. > > Tahnx for check! > > J. > here we go! (note changelog and neews added to patch) Thanx, J. -------------- next part -------------- A non-text attachment was scrubbed... Name: xdgSpecification4.patch Type: text/x-patch Size: 89818 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130713/0236c3b1/xdgSpecification4.patch From jvanek at redhat.com Sat Jul 13 07:05:43 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 13 Jul 2013 16:05:43 +0200 Subject: More propagated about dialogue - part2 plugin Message-ID: <51E15EB7.5080400@redhat.com> This patch made "version caption" of splash click-able, to show about dialogue. As side effect I changed window from JFrame to Dialogue. IMHO it should be Dialogu since begging, but I needed the modal functionality (otherwise dialogue is not accessible from other modal dialogue) 2013-07-13 Jiri Vanek About dialogue made accessible from plugin * netx/net/sourceforge/jnlp/about/AboutDialog.java: (frame) redeclared to be Dialogue instead of JFrame and allowed to be modal if necessary. Caption internationalized. * netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java: Added listener for upper right caption to show AboutDialog * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java: (drawBase) if enough space, adding about "button" * netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java: added about button * tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java: minor modifications related to this change -------------- next part -------------- A non-text attachment was scrubbed... Name: aboutForPlugin.diff Type: text/x-patch Size: 14386 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130713/21f4a441/aboutForPlugin.diff From ptisnovs at icedtea.classpath.org Mon Jul 15 02:44:29 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 15 Jul 2013 09:44:29 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests. Message-ID: changeset 6afb31a503a8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6afb31a503a8 author: Pavel Tisnovsky date: Mon Jul 15 11:48:10 2013 +0200 Ten new tests added into BitBltBasicTests. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 151 +++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) diffs (173 lines): diff -r 0012ad8bfa59 -r 6afb31a503a8 ChangeLog --- a/ChangeLog Thu Jul 04 13:02:34 2013 +0200 +++ b/ChangeLog Mon Jul 15 11:48:10 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests. + 2013-07-04 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltCropImage.java: diff -r 0012ad8bfa59 -r 6afb31a503a8 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Jul 04 13:02:34 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Mon Jul 15 11:48:10 2013 +0200 @@ -4702,6 +4702,157 @@ } /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Mon Jul 15 02:52:16 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 15 Jul 2013 09:52:16 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset d1d3441dc622 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d1d3441dc622 author: Pavel Tisnovsky date: Mon Jul 15 11:55:59 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into ScriptExceptionClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/ScriptExceptionClassTest.java | 62 +++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletions(-) diffs (124 lines): diff -r a6b644899da0 -r d1d3441dc622 ChangeLog --- a/ChangeLog Thu Jul 04 13:09:05 2013 +0200 +++ b/ChangeLog Mon Jul 15 11:55:59 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-15 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptExceptionClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into ScriptExceptionClassTest. + 2013-07-04 Pavel Tisnovsky * src/org/RhinoTests/CompilableClassTest.java: diff -r a6b644899da0 -r d1d3441dc622 src/org/RhinoTests/ScriptExceptionClassTest.java --- a/src/org/RhinoTests/ScriptExceptionClassTest.java Thu Jul 04 13:09:05 2013 +0200 +++ b/src/org/RhinoTests/ScriptExceptionClassTest.java Mon Jul 15 11:55:59 2013 +0200 @@ -52,12 +52,13 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.ScriptException; - /** * Set of tests which check the API of ScriptException class using * Java reflection API. @@ -285,6 +286,7 @@ */ protected void testGetConstructors() { // map of constructors which should exists + @SuppressWarnings("unused") Map testedConstructors = null; Map testedConstructors_jdk6 = new HashMap(); Map testedConstructors_jdk7 = new HashMap(); @@ -338,6 +340,7 @@ */ protected void testGetDeclaredConstructors() { // map of constructors which should exists + @SuppressWarnings("unused") Map testedConstructors = null; Map testedConstructors_jdk6 = new HashMap(); Map testedConstructors_jdk7 = new HashMap(); @@ -1013,12 +1016,15 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -1173,6 +1179,60 @@ } /** + * Test for method javax.script.ScriptException.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.scriptExceptionClass.getGenericSuperclass(); + assertNotNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.ScriptException.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // get the right array of field signatures + String[] genericInterfaceNames = null; + switch (getJavaVersion()) { + case 6: + genericInterfaceNames = genericInterfaceNames_jdk6; + break; + case 7: + genericInterfaceNames = genericInterfaceNames_jdk7; + break; + case 8: + genericInterfaceNames = genericInterfaceNames_jdk8; + break; + } + + // get all generic interfaces + Type[] genericInterfaces = this.scriptExceptionClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length); + + // and transform the array into a list of field names + List interfacesAsString = new ArrayList(); + for (Type genericInterface : genericInterfaces) { + interfacesAsString.add(genericInterface.toString()); + } + + // check if all required interfaces really exists + for (String interfaceThatShouldExists : genericInterfaceNames) { + assertTrue(interfacesAsString.contains(interfaceThatShouldExists), + "interface " + interfaceThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptException */ @SuppressWarnings("cast") From gitne at excite.co.jp Mon Jul 15 07:21:40 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Mon, 15 Jul 2013 23:21:40 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIExvY2FsaXplZCBhYm91dCBtZXNzYWdlcw==?= Message-ID: <201307151421.r6FELeTp028276@mail-web03.excite.co.jp> Hello, since refactoring the about dialog has added new messages, I hereby provide localized DE and PL messages. The message RCantBackup has been added to accomodate an error message for handling backup errors on filesystems that do not allow overwrite on rename. Unfortunatelly, I do not recall the status on that. Jiri, maybe you know more? Apart from that it sould be fine. Regards, Jacob From bugzilla-daemon at icedtea.classpath.org Mon Jul 15 07:39:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 15 Jul 2013 14:39:47 +0000 Subject: [Bug 1495] a java website freezes firefox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 --- Comment #4 from Andrew Azores --- Yes, same Firefox version. I can reproduce the freeze on Arch if I click a link and go back to the original page, as you said, but only when using the IcedTea-Web package from the repos. The mercurial build still handles it fine. I've done a little digging to find out why this is affecting Arch and not Fedora. Here's what I found. The Fedora package has received at least one update since the last time the Arch package was updated, namely this one: https://admin.fedoraproject.org/updates/FEDORA-2013-11291/icedtea-web-1.4-1.fc18 from 20 June. In the build info of this package I see this in the ChangeLog: * Wed Jun 19 2013 Jiri Vanek 1.4.0-1 - added patch1 b25-appContextFix.patch to make it run with future openjdk I've also found this message in the mailing lists: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-June/023745.html which includes what should be our b25-appContextFix.patch. I've downloaded the Arch PKGBUILD and modified it to apply this patch, then repackaged and installed this modified package, and it seems to have fixed the issue. So this patch is definitely what you are missing to make this work. I will look into the next steps from here. Either that patch needs to be applied to the source tarball which the Arch package downloads, or the Arch maintainers of the ITW package need to be informed of this patch so that they can do what I did and apply the patch in their PKGBUILD and release an updated Arch package. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130715/2b1de6d3/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 15 08:17:42 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 15 Jul 2013 15:17:42 +0000 Subject: [Bug 1495] a java website freezes firefox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from Andrew Azores --- The patch is to be applied by the maintainers of the ITW package for each distro. A bug report for this issue already exists in the Arch bug tracker but has been closed due to the maintainer expecting the fix to come from upstream: https://bugs.archlinux.org/task/36082 I have requested the bug be reopened and have outlined the issue there. Finally, this report is actually a duplicate of 1492 as well. Kevin, I suggest you watch the archlinux bug tracker. Thanks for the report! *** This bug has been marked as a duplicate of bug 1492 *** -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130715/b75853da/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 15 08:17:42 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 15 Jul 2013 15:17:42 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kjslag at gmail.com --- Comment #4 from Andrew Azores --- *** Bug 1495 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130715/52a17bf4/attachment.html From gitne at excite.co.jp Mon Jul 15 08:54:59 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 16 Jul 2013 00:54:59 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBMb2NhbGl6ZWQgYWJvdXQgbWVzc2FnZXM=?= Message-ID: <201307151554.r6FFsxOW011584@mail-web02.excite.co.jp> "Jacob Wisor" wrote: > Hello, > > since refactoring the about dialog has added new messages, I hereby provide localized DE and PL messages. > > The message RCantBackup has been added to accomodate an error message for handling backup errors on filesystems that do not allow overwrite on rename. Unfortunatelly, I do not recall the status on that. Jiri, maybe you know more? Apart from that it sould be fine. > > Regards, > Jacob Oh not again :( The mailer dropped the attachment. -------------- next part -------------- A non-text attachment was scrubbed... Name: Localized about messages.patch Type: text/x-patch Size: 3616 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130716/882cc990/ISO-2022-JPBTG9jYWxpemVkIGFib3V0IG1lc3NhZ2VzLnBhdGNo.patch From andrew at icedtea.classpath.org Mon Jul 15 09:02:40 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 15 Jul 2013 16:02:40 +0000 Subject: /hg/icedtea6-hg: 15 new changesets Message-ID: changeset 427412f94dc4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=427412f94dc4 author: Xerxes Ranby date: Tue May 28 19:56:33 2013 +0200 PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. 2013-05-28 Xerxes Ranby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (POPF1): The POPF1 macro used wrong destination register r0 instead of r1 on ARM armel causing issues with the frem bytecode. The frem bytecode was the only bytecode using the defect macro. * NEWS: Updated. changeset 809bd0fb849e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=809bd0fb849e author: Andrew John Hughes date: Tue Jul 09 12:43:05 2013 -0400 2013/06/18 Security Patches 2013-07-09 Omair Majid * hotspot.map: Update to latest hs23. * Makefile.am (ICEDTEA_PATCHES): Make hotspot-specific patches conditional. 2013-06-22 Andrew John Hughes * patches/idresolver_fix.patch: Removed. Part of 6469266. * patches/apache-xml-internal-fix-bug-38655.patch: Removed. Part of 6469266. * Makefile.am: (SECURITY_PATCHES): Add new ones. (SPECIAL_SECURITY_PATCH_1): Renamed from SPECIAL_SECURITY_PATCH. (SPECIAL_SECURITY_PATCH_2): Add 8009071, which needs to be applied after some AWT backports. (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES as must be applied before 8004584. Add 7171223 to end. * patches/openjdk/6307603-xrender-01.patch, * patches/openjdk/6469266-xmlsec_1.4.2.patch, * patches/openjdk/6656651-windows_lcd_glyphs.patch, * patches/openjdk/6786028-wcag_bold_tags.patch, * patches/openjdk/6786682-wcag_lang.patch, * patches/openjdk/6786688-wcag_table.patch, * patches/openjdk/6786690-wcag_dl.patch, * patches/openjdk/6802694-no_deprecated.patch, * patches/openjdk/6851834-restructure.patch, * patches/openjdk/6888167-medialib_memory_leaks.patch, * patches/openjdk/6961178-doclet_xml.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7006270-regressions.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7171223-strict_aliasing.patch, * patches/openjdk/7195301-no_instanceof_node.patch, * patches/security/20130618/6741606-apache_santuario.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/7170730-windows_network_stack.patch, * patches/security/20130618/8000638-improve_deserialization.patch, * patches/security/20130618/8000642-better_transportation_handling.patch, * patches/security/20130618/8001032-restrict_object_access-corba.patch, * patches/security/20130618/8001032-restrict_object_access-jdk.patch, * patches/security/20130618/8001033-refactor_address_handling.patch, * patches/security/20130618/8001034-memory_management.patch, * patches/security/20130618/8001038-resourcefully_handle_resources.patch, * patches/security/20130618/8001043-clarify_definition_restrictions.patch, * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, * patches/security/20130618/8001318-6_fixup.patch, * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, * patches/security/20130618/8001330-checking_order_improvement.patch, * patches/security/20130618/8001330-improve_checking_order.patch, * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, * patches/security/20130618/8004584-augment_applet_contextualization.patch, * patches/security/20130618/8005007-better_glyph_processing.patch, * patches/security/20130618/8006328-6_fixup.patch, * patches/security/20130618/8006328-sound_class_robustness.patch, * patches/security/20130618/8006611-improve_scripting.patch, * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, * patches/security/20130618/8007471-6_fixup.patch, * patches/security/20130618/8007471-improve_mbean_notifications.patch, * patches/security/20130618/8007812-getenclosingmethod.patch, * patches/security/20130618/8008120-improve_jmx_class_checking.patch, * patches/security/20130618/8008124-better_compliance_testing.patch, * patches/security/20130618/8008128-better_jmx_api_coherence.patch, * patches/security/20130618/8008132-better_serialization.patch, * patches/security/20130618/8008585-jmx_data_handling.patch, * patches/security/20130618/8008593-better_urlclassloader.patch, * patches/security/20130618/8008603-jmx_provider_provision.patch, * patches/security/20130618/8008611-6_fixup.patch, * patches/security/20130618/8008611-jmx_annotations.patch, * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, * patches/security/20130618/8008623-mbeanserver_handling.patch, * patches/security/20130618/8008744-6741606_rework.patch, * patches/security/20130618/8008982-jmx_interface_changes.patch, * patches/security/20130618/8009004-rmi_connection_improvement.patch, * patches/security/20130618/8009013-t2k_glyphs.patch, * patches/security/20130618/8009034-jmx_notification_improvement.patch, * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, * patches/security/20130618/8009067-improve_key_storing.patch, * patches/security/20130618/8009071-improve_shape_handling.patch, * patches/security/20130618/8009235-improve_tsa_data_handling.patch, * patches/security/20130618/8009554-serialjavaobject.patch, * patches/security/20130618/8011243-improve_imaginglib.patch, * patches/security/20130618/8011248-better_component_rasters.patch, * patches/security/20130618/8011253-better_short_component_rasters.patch, * patches/security/20130618/8011257-better_byte_component_rasters.patch, * patches/security/20130618/8011557-improve_reflection.patch, * patches/security/20130618/8012375-javadoc_framing.patch, * patches/security/20130618/8012421-better_positioning.patch, * patches/security/20130618/8012438-better_image_validation.patch, * patches/security/20130618/8012597-better_image_channel_validation.patch, * patches/security/20130618/8012601-better_layout_validation.patch, * patches/security/20130618/8014281-better_xml_signature_checking.patch, * patches/security/20130618/8015997-more_javadoc_framing.patch, * patches/security/20130618/diamond_fix.patch, * patches/security/20130618/handle_npe.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/security/20130618/javac_issue.patch, * patches/security/20130618/langtools_generics.patch, * patches/security/20130618/langtools_merge-01.patch, * patches/security/20130618/langtools_merge-02.patch, * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. changeset f8ab99438f3a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f8ab99438f3a author: Andrew John Hughes date: Tue Jul 09 13:17:30 2013 -0400 Correct issues found in building security patches. 2013-06-24 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move 8009071 after library patch. * NEWS: Correct bug ID referenced for OJ3. * patches/ecj/needs-6.patch: Add cases for javax.sound and javax.management, due to @Override annotations in the security patches. * patches/openjdk/6307603-xrender-01.patch: Regenerated again as wrong last time. * patches/security/20130618/8009071-improve_shape_handling.patch: Include sizecalc.h in gif_lib.h. changeset 9ba5f31e9323 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9ba5f31e9323 author: Omair Majid date: Wed Jun 26 10:47:13 2013 -0400 Fix patches to work with patch tools that can not handle renames 2013-06-26 Omair Majid * Makefile.am: (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and patches/openjdk/6851834-handle_renames.patch * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't rename files using extended-diff-style. * patches/openjdk/6990754-handle_renames.patch: New file. Contains the rename portion of 6990754 since some patch programs can not handle renames. * patches/openjdk/6851834-restructure.patch: Don't rename files using extended-diff-style. * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename porition of 6851834 since some patch programs can not handle renames. changeset 9accc50c9c1f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9accc50c9c1f author: Omair Majid date: Wed Jun 26 13:45:20 2013 -0400 Drop unnecessary patch for S8009554 2013-06-26 Omair Majid Severin Gehwolf * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/8009554-serialjavaobject.patch. * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This was adding redundant permission check changeset adfdf70ea171 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=adfdf70ea171 author: Chris Phillips date: Tue Jul 09 14:11:59 2013 -0400 Backport 20130618 sec fixes S7158805 and S8001330 2013-06-26 Chris Phillips * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/7158805-nested_subroutine_rewriting.patch patches/security/20130618/8001330-checking_order_improvement.patch patches/openjdk/7036747-elfstringtable.patch patches/openjdk/7017732-move_static_fields_to_class.patch patches/openjdk/6990754-use_native_memory_for_symboltable.patch patches/openjdk/6990754-handle_renames.patch patches/openjdk/7008809-report_class_in_arraystoreexception.patch patches/openjdk/7086585-flexible_field_injection.patch patches/security/20130618/hs_merge-01.patch patches/security/20130618/hs_merge-02.patch patches/security/20130618/hs_merge-03.patch patches/openjdk/7014851-unused_parallel_compaction_code.patch patches/security/20130618/hs_merge-04.patch Add: patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch patches/security/20130618/8001330-checking_order_improvement-it6.patch * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Backported fix for 7158805. * patches/security/20130618/8001330-checking_order_improvement-it6.patch: Backported fix for hs portion of 8001330. changeset 47fc9f561578 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=47fc9f561578 author: Omair Majid date: Tue Jul 09 17:22:26 2013 -0400 Build additional code using -source 6 2013-07-09 Omair Majid * patches/ecj/needs-6.patch: Build additional code using -source 6. changeset affe15667ff7 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=affe15667ff7 author: Andrew John Hughes date: Thu Jul 11 22:06:36 2013 +0100 Backport additional fixes. Additional fixes were applied to jdk7u as part of the security release. This patch includes a subset of them. 2013-07-01 Omair Majid * patches/openjdk/7188114-alternate_command_line_parser.patch, * patches/openjdk/7199143-OCSP_timeout.patch, * patches/openjdk/8006120-server_jre.patch, * patches/openjdk/8006536-remove_trailing_slashes.patch, * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, * patches/openjdk/8009217-fix_test_compile.patch, * patches/openjdk/8009463-space_and_final_backslash.patch, * patches/openjdk/8009610-blacklist_malware_certificate.patch, * patches/openjdk/8010213-set_socketoptions_windows.patch, * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, * patches/openjdk/8011992-MlibOpsTest_failed.patch, * patches/openjdk/8012112-MlibOpsTest_fails.patch, * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, * patches/openjdk/8012933-appcontext_disposed_too_early.patch, * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, * patches/openjdk/8014427-raster_regresssion.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/openjdk/8014676-javadebugger_space_in_paths.patch, * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am: (ICEDTEA_PATCHES): Apply the above. * patches/ecj/override.patch: Add new hunk for BufferedImage. changeset 13722351f760 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=13722351f760 author: Andrew John Hughes date: Thu Jul 11 22:08:22 2013 +0100 Additional fixes that go along with the security update Backport additional fixes from 7 that went along with the security update. 2013-07-03 Omair Majid * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002070-remove_logger_stack_search.patch, * patches/openjdk/8002070-remove_logger_stack_search_2.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8009996-emitter_bean.patch, * patches/openjdk/8010118-caller_sensitive.patch, * patches/openjdk/8010727-empty_logger_name.patch, * patches/openjdk/8010939-logmanager_deadlock.patch, * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, * patches/openjdk/8011990-logger_test_urls.patch, * patches/openjdk/8012243-serial_regression.patch, * patches/openjdk/8013380-handle_renames.patch, * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, * patches/openjdk/8014718-remove_logging_suntoolkit.patch, * patches/openjdk/8014745-logger_stack_walk_switch.patch: New file. Backport from icedtea/openjdk 7. * Makefile.am: (ICEDTEA_PATCHES): Apply the above. changeset 9b08602ea62f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9b08602ea62f author: Andrew John Hughes date: Thu Jul 11 22:31:34 2013 +0100 Remove unused patches and cleanup HotSpot security patches. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Readd parts of patch removed without note in an earlier backport and fix copyright headers to apply (2011 instead of 2010). 2013-07-09 Andrew John Hughes * patches/ecj/ant.patch, * patches/openjdk/6990754-handle_renames.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, * patches/security/20130618/8001330-checking_order_improvement-it6.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/sparc.patch: Remove unused patches. * patches/openjdk/8011154-awt_regresssion.patch, * patches/openjdk/8014427-raster_regresssion.patch: Dropped superfluous 's' from name. * Makefile.am: (ICEDTEA_PATCHES): Move back to using HotSpot patches without '-it6' suffix. * patches/ecj/override.patch: Drop recent addition. In accordance with PR1397, we should avoid extending this patch in favour of either not including @Override additions or setting source/target correctly. * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/8001330-checking_order_improvement.patch: Replace with Chris' patches, regenerated as unified diffs. changeset 5bf213987d1b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5bf213987d1b author: Andrew John Hughes date: Wed Jul 10 15:13:09 2013 +0100 Make 7158805 patch apply again. 2013-07-10 Andrew John Hughes * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: Make patch apply again. changeset e325e900c775 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e325e900c775 author: Andrew John Hughes date: Thu Jul 11 23:41:57 2013 +0100 Remove reference to removed patch. 2013-07-11 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Remove reference to removed patch. changeset 11f837636a0a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=11f837636a0a author: Andrew John Hughes date: Thu Jul 11 23:43:09 2013 +0100 Add release notes for latest security updates. 2013-07-11 Andrew John Hughes * NEWS: Add 1.11.12 and 1.12.6 release notes. changeset a2839754d553 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a2839754d553 author: Andrew John Hughes date: Mon Jul 15 14:56:16 2013 +0100 Merge changeset 2bcbba03ee49 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2bcbba03ee49 author: Andrew John Hughes date: Mon Jul 15 17:02:08 2013 +0100 Drop upstreamed patches. 2013-07-11 Andrew John Hughes * patches/openjdk/7036559-concurrenthashmap_improvements.patch: Remove upstreamed patch. * Makefile.am: (ICEDTEA_PATCHES): Drop upstreamed patches. diffstat: ChangeLog | 404 +- Makefile.am | 192 +- NEWS | 205 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2 +- hotspot.map | 2 +- patches/apache-xml-internal-fix-bug-38655.patch | 11 - patches/copy_memory.patch | 36 - patches/ecj/ant.patch | 20 - patches/ecj/jcp-importsources.patch | 10 + patches/ecj/needs-6.patch | 36 + patches/ecj/override.patch | 51 + patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/idresolver_fix.patch | 194 - patches/openjdk/6307603-xrender-01.patch | 239 +- patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 + patches/openjdk/6541350-tz_display_names_l10n.patch | 300 + patches/openjdk/6656651-windows_lcd_glyphs.patch | 938 + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 4 +- patches/openjdk/6786028-wcag_bold_tags.patch | 2914 + patches/openjdk/6786682-wcag_lang.patch | 274 + patches/openjdk/6786688-wcag_table.patch | 2828 + patches/openjdk/6786690-wcag_dl.patch | 3230 + patches/openjdk/6802694-no_deprecated.patch | 601 + patches/openjdk/6821191-tz_display_names_l10n.patch | 125 + patches/openjdk/6851834-handle_renames.patch | 605 + patches/openjdk/6851834-restructure.patch | 26853 + patches/openjdk/6888167-medialib_memory_leaks.patch | 134 + patches/openjdk/6961178-doclet_xml.patch | 1989 + patches/openjdk/6977550-tzdata2010l.patch | 1208 + patches/openjdk/6980681-corba_deadlock.patch | 7 - patches/openjdk/6996686-tzdata2010o.patch | 93 + patches/openjdk/7006270-regressions.patch | 299 + patches/openjdk/7017800-tzdata2011b.patch | 254 + patches/openjdk/7027387-tzdata2011d.patch | 502 + patches/openjdk/7033174-tzdata2011e.patch | 117 + patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 - patches/openjdk/7039469-tzdata2011g.patch | 116 + patches/openjdk/7090843-tzdata2011j.patch | 1228 + patches/openjdk/7103108-tzdata2011l.patch | 1593 + patches/openjdk/7103405-correct_display_names.patch | 118 + patches/openjdk/7104126-headers_tzdata.patch | 530 + patches/openjdk/7158483-tzdata2012c.patch | 1436 + patches/openjdk/7162902-corba_fixes.patch | 21 - patches/openjdk/7171223-strict_aliasing.patch | 25 + patches/openjdk/7188114-alternate_command_line_parser.patch | 611 + patches/openjdk/7195301-no_instanceof_node.patch | 86 + patches/openjdk/7198570-tzdata2012f.patch | 841 + patches/openjdk/7199143-OCSP_timeout.patch | 53 + patches/openjdk/8002070-remove_logger_stack_search.patch | 152 + patches/openjdk/8002070-remove_logger_stack_search_2.patch | 546 + patches/openjdk/8002225-tzdata2012i.patch | 261 + patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8006120-server_jre.patch | 60 + patches/openjdk/8006536-remove_trailing_slashes.patch | 43 + patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch | 68 + patches/openjdk/8009217-fix_test_compile.patch | 91 + patches/openjdk/8009463-space_and_final_backslash.patch | 33 + patches/openjdk/8009610-blacklist_malware_certificate.patch | 64 + patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/8009987-tzdata2013b.patch | 2165 + patches/openjdk/8009996-emitter_bean.patch | 27 + patches/openjdk/8010118-caller_sensitive.patch | 2950 + patches/openjdk/8010213-set_socketoptions_windows.patch | 29 + patches/openjdk/8010714-xml_dsig_retrievalmethod.patch | 345 + patches/openjdk/8010727-empty_logger_name.patch | 99 + patches/openjdk/8010939-logmanager_deadlock.patch | 264 + patches/openjdk/8011139-revise_checking_getenclosingclass.patch | 58 + patches/openjdk/8011154-awt_regression.patch | 20 + patches/openjdk/8011313-OCSP_timeout_wrong_value.patch | 31 + patches/openjdk/8011990-logger_test_urls.patch | 55 + patches/openjdk/8011992-MlibOpsTest_failed.patch | 89 + patches/openjdk/8012112-MlibOpsTest_fails.patch | 51 + patches/openjdk/8012243-serial_regression.patch | 42 + patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch | 480 + patches/openjdk/8012933-appcontext_disposed_too_early.patch | 153 + patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 + patches/openjdk/8013380-handle_renames.patch | 107 + patches/openjdk/8013380-logger_stack_walk_glassfish.patch | 936 + patches/openjdk/8014205-blank_swing_dialogs_windows.patch | 146 + patches/openjdk/8014427-raster_regression.patch | 20 + patches/openjdk/8014676-javadebugger_space_in_paths.patch | 32 + patches/openjdk/8014718-remove_logging_suntoolkit.patch | 112 + patches/openjdk/8014745-logger_stack_walk_switch.patch | 199 + patches/openjdk/8014968-OCSP_timeout_default.patch | 19 + patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 ------- patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673.patch | 400 +- patches/security/20130416/8005432.patch | 48 +- patches/security/20130618/6741606-apache_santuario.patch | 8110 + patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 467 + patches/security/20130618/7170730-windows_network_stack.patch | 1057 + patches/security/20130618/8000638-improve_deserialization.patch | 26 + patches/security/20130618/8000642-better_transportation_handling.patch | 808 + patches/security/20130618/8001032-restrict_object_access-corba.patch | 544 + patches/security/20130618/8001032-restrict_object_access-jdk.patch | 21 + patches/security/20130618/8001033-refactor_address_handling.patch | 119 + patches/security/20130618/8001034-memory_management.patch | 78 + patches/security/20130618/8001038-resourcefully_handle_resources.patch | 236 + patches/security/20130618/8001043-clarify_definition_restrictions.patch | 92 + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch | 36 + patches/security/20130618/8001318-6_fixup.patch | 114 + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch | 470 + patches/security/20130618/8001330-checking_order_improvement.patch | 407 + patches/security/20130618/8001330-improve_checking_order.patch | 97 + patches/security/20130618/8003703-update_rmi_connection_dialog.patch | 131 + patches/security/20130618/8004584-augment_applet_contextualization.patch | 322 + patches/security/20130618/8005007-better_glyph_processing.patch | 118 + patches/security/20130618/8006328-6_fixup.patch | 31 + patches/security/20130618/8006328-sound_class_robustness.patch | 6936 + patches/security/20130618/8006611-improve_scripting.patch | 78 + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch | 108 + patches/security/20130618/8007471-6_fixup.patch | 25 + patches/security/20130618/8007471-improve_mbean_notifications.patch | 89 + patches/security/20130618/8007812-getenclosingmethod.patch | 89 + patches/security/20130618/8008120-improve_jmx_class_checking.patch | 332 + patches/security/20130618/8008124-better_compliance_testing.patch | 20 + patches/security/20130618/8008128-better_jmx_api_coherence.patch | 110 + patches/security/20130618/8008132-better_serialization.patch | 121 + patches/security/20130618/8008585-jmx_data_handling.patch | 69 + patches/security/20130618/8008593-better_urlclassloader.patch | 270 + patches/security/20130618/8008603-jmx_provider_provision.patch | 29 + patches/security/20130618/8008611-6_fixup.patch | 20 + patches/security/20130618/8008611-jmx_annotations.patch | 32 + patches/security/20130618/8008615-jmx_internal_api_robustness.patch | 70 + patches/security/20130618/8008623-mbeanserver_handling.patch | 121 + patches/security/20130618/8008744-6741606_rework.patch | 882 + patches/security/20130618/8008982-jmx_interface_changes.patch | 168 + patches/security/20130618/8009004-rmi_connection_improvement.patch | 54 + patches/security/20130618/8009013-t2k_glyphs.patch | 39 + patches/security/20130618/8009034-jmx_notification_improvement.patch | 30 + patches/security/20130618/8009038-jmx_notification_support_improvement.patch | 89 + patches/security/20130618/8009067-improve_key_storing.patch | 20 + patches/security/20130618/8009071-improve_shape_handling.patch | 1014 + patches/security/20130618/8009235-improve_tsa_data_handling.patch | 80 + patches/security/20130618/8011243-improve_imaginglib.patch | 618 + patches/security/20130618/8011248-better_component_rasters.patch | 51 + patches/security/20130618/8011253-better_short_component_rasters.patch | 140 + patches/security/20130618/8011257-better_byte_component_rasters.patch | 157 + patches/security/20130618/8011557-improve_reflection.patch | 132 + patches/security/20130618/8012375-javadoc_framing.patch | 61 + patches/security/20130618/8012421-better_positioning.patch | 100 + patches/security/20130618/8012438-better_image_validation.patch | 283 + patches/security/20130618/8012597-better_image_channel_validation.patch | 597 + patches/security/20130618/8012601-better_layout_validation.patch | 125 + patches/security/20130618/8014281-better_xml_signature_checking.patch | 49 + patches/security/20130618/8015997-more_javadoc_framing.patch | 21 + patches/security/20130618/diamond_fix.patch | 55 + patches/security/20130618/handle_npe.patch | 21 + patches/security/20130618/javac_issue.patch | 60 + patches/security/20130618/langtools_generics.patch | 600 + patches/security/20130618/langtools_merge-01.patch | 30 + patches/security/20130618/langtools_merge-02.patch | 30 + patches/security/20130618/langtools_merge-03.patch | 18 + patches/sparc.patch | 1808 - 192 files changed, 112103 insertions(+), 1072632 deletions(-) diffs (truncated from 1187187 to 500 lines): diff -r 632c42c569f8 -r 2bcbba03ee49 ChangeLog --- a/ChangeLog Mon May 27 11:00:32 2013 +0100 +++ b/ChangeLog Mon Jul 15 17:02:08 2013 +0100 @@ -1,3 +1,326 @@ +2013-07-11 Andrew John Hughes + + * patches/openjdk/7036559-concurrenthashmap_improvements.patch: + Remove upstreamed patch. + * Makefile.am: + (ICEDTEA_PATCHES): Drop upstreamed patches. + +2013-07-11 Andrew John Hughes + + * NEWS: + Add 1.11.12 and 1.12.6 release notes. + +2013-07-11 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch. + +2013-07-10 Andrew John Hughes + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Make patch apply again. + +2013-07-10 Andrew John Hughes + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Readd parts of patch removed without note in + an earlier backport and fix copyright headers to + apply (2011 instead of 2010). + +2013-07-09 Andrew John Hughes + + * patches/ecj/ant.patch, + * patches/openjdk/6990754-handle_renames.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, + * patches/security/20130618/8001330-checking_order_improvement-it6.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/sparc.patch: + Remove unused patches. + * patches/openjdk/8011154-awt_regresssion.patch, + * patches/openjdk/8014427-raster_regresssion.patch: + Dropped superfluous 's' from name. + * Makefile.am: + (ICEDTEA_PATCHES): Move back to using HotSpot patches without '-it6' suffix. + * patches/ecj/override.patch: Drop recent addition. In accordance with + PR1397, we should avoid extending this patch in favour of either not + including @Override additions or setting source/target correctly. + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch: + Replace with Chris' patches, regenerated as unified diffs. + +2013-07-03 Omair Majid + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8009996-emitter_bean.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010727-empty_logger_name.patch, + * patches/openjdk/8010939-logmanager_deadlock.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014718-remove_logging_suntoolkit.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch: + New file. Backport from icedtea/openjdk 7. + * Makefile.am: + (ICEDTEA_PATCHES): Apply the above. + +2013-07-01 Omair Majid + + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch, + * patches/openjdk/8009217-fix_test_compile.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8009610-blacklist_malware_certificate.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch, + * patches/openjdk/8011154-awt_regresssion.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011992-MlibOpsTest_failed.patch, + * patches/openjdk/8012112-MlibOpsTest_fails.patch, + * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch, + * patches/openjdk/8012933-appcontext_disposed_too_early.patch, + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014427-raster_regresssion.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch: New file. + Backport from icedtea/openjdk 7. + * Makefile.am: + (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/override.patch: Add new hunk for BufferedImage. + +2013-07-09 Omair Majid + + * patches/ecj/needs-6.patch: Build additional code using -source 6. + +2013-06-26 Chris Phillips + + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/7158805-nested_subroutine_rewriting.patch + patches/security/20130618/8001330-checking_order_improvement.patch + patches/openjdk/7036747-elfstringtable.patch + patches/openjdk/7017732-move_static_fields_to_class.patch + patches/openjdk/6990754-use_native_memory_for_symboltable.patch + patches/openjdk/6990754-handle_renames.patch + patches/openjdk/7008809-report_class_in_arraystoreexception.patch + patches/openjdk/7086585-flexible_field_injection.patch + patches/security/20130618/hs_merge-01.patch + patches/security/20130618/hs_merge-02.patch + patches/security/20130618/hs_merge-03.patch + patches/openjdk/7014851-unused_parallel_compaction_code.patch + patches/security/20130618/hs_merge-04.patch + Add: + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch + patches/security/20130618/8001330-checking_order_improvement-it6.patch + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Backported fix for 7158805. + * patches/security/20130618/8001330-checking_order_improvement-it6.patch: + Backported fix for hs portion of 8001330. + +2013-06-26 Omair Majid + Severin Gehwolf + + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/8009554-serialjavaobject.patch. + * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This + was adding redundant permission checking. + +2013-06-26 Omair Majid + + * Makefile.am: + (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and + patches/openjdk/6851834-handle_renames.patch + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't + rename files using extended-diff-style. + * patches/openjdk/6990754-handle_renames.patch: New file. Contains the + rename portion of 6990754 since some patch programs can not handle + renames. + * patches/openjdk/6851834-restructure.patch: Don't rename files using + extended-diff-style. + * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename + porition of 6851834 since some patch programs can not handle renames. + +2013-06-24 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Move 8009071 after library patch. + * NEWS: Correct bug ID referenced for OJ3. + * patches/ecj/needs-6.patch: + Add cases for javax.sound and javax.management, due + to @Override annotations in the security patches. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated again as wrong last time. + * patches/security/20130618/8009071-improve_shape_handling.patch: + Include sizecalc.h in gif_lib.h. + +2013-07-09 Omair Majid + + * hotspot.map: Update to latest hs23. + * Makefile.am (ICEDTEA_PATCHES): Make hotspot-specific patches + conditional. + +2013-06-22 Andrew John Hughes + + * patches/idresolver_fix.patch: + Removed. Part of 6469266. + * patches/apache-xml-internal-fix-bug-38655.patch: + Removed. Part of 6469266. + * Makefile.am: + (SECURITY_PATCHES): Add new ones. + (SPECIAL_SECURITY_PATCH_1): Renamed from + SPECIAL_SECURITY_PATCH. + (SPECIAL_SECURITY_PATCH_2): Add 8009071, which + needs to be applied after some AWT backports. + (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. + Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES + as must be applied before 8004584. Add 7171223 to + end. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated. + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6656651-windows_lcd_glyphs.patch, + * patches/openjdk/6786028-wcag_bold_tags.patch, + * patches/openjdk/6786682-wcag_lang.patch, + * patches/openjdk/6786688-wcag_table.patch, + * patches/openjdk/6786690-wcag_dl.patch, + * patches/openjdk/6802694-no_deprecated.patch, + * patches/openjdk/6851834-restructure.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/6961178-doclet_xml.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7006270-regressions.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7171223-strict_aliasing.patch, + * patches/openjdk/7195301-no_instanceof_node.patch, + * patches/security/20130618/6741606-apache_santuario.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/7170730-windows_network_stack.patch, + * patches/security/20130618/8000638-improve_deserialization.patch, + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch, + * patches/security/20130618/8001032-restrict_object_access-jdk.patch, + * patches/security/20130618/8001033-refactor_address_handling.patch, + * patches/security/20130618/8001034-memory_management.patch, + * patches/security/20130618/8001038-resourcefully_handle_resources.patch, + * patches/security/20130618/8001043-clarify_definition_restrictions.patch, + * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, + * patches/security/20130618/8001318-6_fixup.patch, + * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch, + * patches/security/20130618/8001330-improve_checking_order.patch, + * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, + * patches/security/20130618/8004584-augment_applet_contextualization.patch, + * patches/security/20130618/8005007-better_glyph_processing.patch, + * patches/security/20130618/8006328-6_fixup.patch, + * patches/security/20130618/8006328-sound_class_robustness.patch, + * patches/security/20130618/8006611-improve_scripting.patch, + * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, + * patches/security/20130618/8007471-6_fixup.patch, + * patches/security/20130618/8007471-improve_mbean_notifications.patch, + * patches/security/20130618/8007812-getenclosingmethod.patch, + * patches/security/20130618/8008120-improve_jmx_class_checking.patch, + * patches/security/20130618/8008124-better_compliance_testing.patch, + * patches/security/20130618/8008128-better_jmx_api_coherence.patch, + * patches/security/20130618/8008132-better_serialization.patch, + * patches/security/20130618/8008585-jmx_data_handling.patch, + * patches/security/20130618/8008593-better_urlclassloader.patch, + * patches/security/20130618/8008603-jmx_provider_provision.patch, + * patches/security/20130618/8008611-6_fixup.patch, + * patches/security/20130618/8008611-jmx_annotations.patch, + * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, + * patches/security/20130618/8008623-mbeanserver_handling.patch, + * patches/security/20130618/8008744-6741606_rework.patch, + * patches/security/20130618/8008982-jmx_interface_changes.patch, + * patches/security/20130618/8009004-rmi_connection_improvement.patch, + * patches/security/20130618/8009013-t2k_glyphs.patch, + * patches/security/20130618/8009034-jmx_notification_improvement.patch, + * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, + * patches/security/20130618/8009067-improve_key_storing.patch, + * patches/security/20130618/8009071-improve_shape_handling.patch, + * patches/security/20130618/8009235-improve_tsa_data_handling.patch, + * patches/security/20130618/8009554-serialjavaobject.patch, + * patches/security/20130618/8011243-improve_imaginglib.patch, + * patches/security/20130618/8011248-better_component_rasters.patch, + * patches/security/20130618/8011253-better_short_component_rasters.patch, + * patches/security/20130618/8011257-better_byte_component_rasters.patch, + * patches/security/20130618/8011557-improve_reflection.patch, + * patches/security/20130618/8012375-javadoc_framing.patch, + * patches/security/20130618/8012421-better_positioning.patch, + * patches/security/20130618/8012438-better_image_validation.patch, + * patches/security/20130618/8012597-better_image_channel_validation.patch, + * patches/security/20130618/8012601-better_layout_validation.patch, + * patches/security/20130618/8014281-better_xml_signature_checking.patch, + * patches/security/20130618/8015997-more_javadoc_framing.patch, + * patches/security/20130618/diamond_fix.patch, + * patches/security/20130618/handle_npe.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/security/20130618/javac_issue.patch, + * patches/security/20130618/langtools_generics.patch, + * patches/security/20130618/langtools_merge-01.patch, + * patches/security/20130618/langtools_merge-02.patch, + * patches/security/20130618/langtools_merge-03.patch: + 2013/06/18 security patches. + +2013-05-31 Andrew John Hughes + + * patches/copy_memory.patch, + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: + Drop upstreamed patches. + * Makefile.am: + (DROP_PATCHES): Remove JAXP patch. + (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. + +2013-05-28 Xerxes R??nby + + PR1188: ASM Interpreter and Thumb2 JIT javac miscompile + modulo reminder on armel. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (POPF1): The POPF1 macro used wrong destination register + r0 instead of r1 on ARM armel causing issues with the frem bytecode. + The frem bytecode was the only bytecode using the defect macro. + * NEWS: Updated. + 2013-05-15 Andrew John Hughes PR1458: Make use of bootstrap tools & -Xbootclasspath @@ -53,6 +376,18 @@ * patches/jtreg-TextLayoutBoundsChecks.patch: Fixed wrong JTreg test name in @run annotation. +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: @@ -70,6 +405,12 @@ * Makefile.am: Renamed three patches to be more consistent with other JTreg-related patches. +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + 2013-05-15 Pavel Tisnovsky * Makefile.am: @@ -314,7 +655,7 @@ * patches/security/20130416/8009857.patch: Add security patches. -2013-04-25 Andrew John Hughes +2013-04-25 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move aarch64.patch to original @@ -446,6 +787,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -1047,6 +1444,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r 632c42c569f8 -r 2bcbba03ee49 Makefile.am --- a/Makefile.am Mon May 27 11:00:32 2013 +0100 +++ b/Makefile.am Mon Jul 15 17:02:08 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -278,48 +278,11 @@ ICEDTEA_FSG_PATCHES = -DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch +DROP_PATCHES = SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ From aazores at redhat.com Mon Jul 15 11:10:18 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 15 Jul 2013 14:10:18 -0400 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <51E1382A.5010303@redhat.com> References: <51E00CFF.3070301@redhat.com> <51E01C1F.4050707@redhat.com> <51E01FE5.2080900@redhat.com> <51E1382A.5010303@redhat.com> Message-ID: <51E43B0A.7090001@redhat.com> On 07/13/2013 07:21 AM, Jiri Vanek wrote: > On 07/12/2013 05:25 PM, Jiri Vanek wrote: >> On 07/12/2013 05:09 PM, Andrew Azores wrote: >>> On 07/12/2013 10:04 AM, Jiri Vanek wrote: >>>> Attempt two :) >>>> >>>> Well this test nearly cost me my sanity (not that there is to much >>>> left but...) but here it is >>>> again. >>>> >>>> As Omair have signed himself off this review (after saying that by >>>> concept it is ok) this patch is >>>> looking for volunteer. >>>> >>>> J. >>> >>> All looks good to me other than a couple style nitpicks, but nothing >>> important. Just things like >>> missing spaces around + when concatenating strings, hardly worth >>> changing :) I think this looks >>> pretty good as it is. >>> >>> I tried to apply the patches in my VM with latest ITW - the tests >>> patch succeeded (as expected since >>> it's just file additions), but the other patch just about entirely >>> failed :( I used hg patch -f >>> --no-commit for this. I tried to use the "patch" command but it >>> complained about a malformed line, >>> so maybe I was just not using it correctly. Not sure what that's >>> about, hopefully it's just a >>> problem on my end though and won't result in some merge conflict! >>> >>> Andrew A >> >> aargh, yah, I have not updated underlying repo. >> >> I will post new patch on top of head and with proper reformatting. >> >> Tahnx for check! >> >> J. >> > > here we go! > (note changelog and neews added to patch) > > Thanx, J. > This one looks good to me! Andrew A From aazores at redhat.com Mon Jul 15 11:23:23 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 15 Jul 2013 14:23:23 -0400 Subject: More propagated about dialogue - part1 itw-settings In-Reply-To: <51E022CD.1090208@redhat.com> References: <51E022CD.1090208@redhat.com> Message-ID: <51E43E1B.7090908@redhat.com> On 07/12/2013 11:37 AM, Jiri Vanek wrote: > Since about dialogue is no longer something we have to be ashamed for, > I would like to make it more easily reachable. > > This patch is adding it to itw-settings. > > The next will add it to splash and so into plugin and javaws loading > state. > > Any opinions? As .. Is it good idea at all? > > > Thanx! > J. This looks good to me. And of course I'm glad that the new About is becoming more visible/reachable :) Andrew A From aazores at redhat.com Mon Jul 15 11:28:23 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 15 Jul 2013 14:28:23 -0400 Subject: More propagated about dialogue - part2 plugin In-Reply-To: <51E15EB7.5080400@redhat.com> References: <51E15EB7.5080400@redhat.com> Message-ID: <51E43F47.4080104@redhat.com> On 07/13/2013 10:05 AM, Jiri Vanek wrote: > This patch made "version caption" of splash click-able, to show about > dialogue. > As side effect I changed window from JFrame to Dialogue. IMHO it > should be Dialogu since begging, but I needed the modal functionality > (otherwise dialogue is not accessible from other modal dialogue) > > 2013-07-13 Jiri Vanek > > About dialogue made accessible from plugin > * netx/net/sourceforge/jnlp/about/AboutDialog.java: (frame) > redeclared > to be Dialogue instead of JFrame and allowed to be modal if > necessary. > Caption internationalized. > * > netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java: > Added listener for upper right caption to show AboutDialog > * > netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java: > (drawBase) if enough space, adding about "button" > * > netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java: > added about button > * > tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java: > minor modifications related to this change Looks good except one little thing. In AboutDialog.java, line 80 - JFrame.DISPOSE_ON_CLOSE should probably be changed to JDialog.DISPOSE_ON_CLOSE, and then the JFrame import can be removed as well. Andrew A From ptisnovs at icedtea.classpath.org Tue Jul 16 01:51:01 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 16 Jul 2013 08:51:01 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor. Message-ID: changeset f963af2be0b9 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f963af2be0b9 author: Pavel Tisnovsky date: Tue Jul 16 10:54:42 2013 +0200 Ten new tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 150 +++++++++++++++++++++ 2 files changed, 155 insertions(+), 0 deletions(-) diffs (172 lines): diff -r 6afb31a503a8 -r f963af2be0b9 ChangeLog --- a/ChangeLog Mon Jul 15 11:48:10 2013 +0200 +++ b/ChangeLog Tue Jul 16 10:54:42 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-16 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor. + 2013-07-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 6afb31a503a8 -r f963af2be0b9 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Jul 15 11:48:10 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Jul 16 10:54:42 2013 +0200 @@ -2560,6 +2560,156 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.blue. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.green. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.cyan. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.red. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.magenta. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.yellow. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + * Background color is set to Color.white. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.black. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.blue. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.green. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.green); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Tue Jul 16 01:56:09 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 16 Jul 2013 08:56:09 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset bf09f2da2f09 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=bf09f2da2f09 author: Pavel Tisnovsky date: Tue Jul 16 10:59:52 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into AbstractScriptEngineClassTest. diffstat: ChangeLog | 7 +++ src/org/RhinoTests/AbstractScriptEngineClassTest.java | 36 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletions(-) diffs (67 lines): diff -r d1d3441dc622 -r bf09f2da2f09 ChangeLog --- a/ChangeLog Mon Jul 15 11:55:59 2013 +0200 +++ b/ChangeLog Tue Jul 16 10:59:52 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-16 Pavel Tisnovsky + + * src/org/RhinoTests/AbstractScriptEngineClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into AbstractScriptEngineClassTest. + 2013-07-15 Pavel Tisnovsky * src/org/RhinoTests/ScriptExceptionClassTest.java: diff -r d1d3441dc622 -r bf09f2da2f09 src/org/RhinoTests/AbstractScriptEngineClassTest.java --- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java Mon Jul 15 11:55:59 2013 +0200 +++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java Tue Jul 16 10:59:52 2013 +0200 @@ -56,7 +56,8 @@ import java.lang.reflect.TypeVariable; import javax.script.AbstractScriptEngine; -import javax.script.ScriptEngineManager;import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptEngine; @@ -1287,6 +1288,39 @@ } /** + * Test for method javax.script.AbstractScriptEngine.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.abstractScriptEngineClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.AbstractScriptEngine.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.abstractScriptEngineClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.AbstractScriptEngine.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.abstractScriptEngineClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.AbstractScriptEngine.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.abstractScriptEngineClass.desiredAssertionStatus(), + "Method AbstractScriptEngine.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.AbstractScriptEngine */ @SuppressWarnings("cast") From omajid at redhat.com Tue Jul 16 07:42:05 2013 From: omajid at redhat.com (Omair Majid) Date: Tue, 16 Jul 2013 10:42:05 -0400 Subject: RFC: Fix mistake in backport of S8010118 Message-ID: <51E55BBD.2030405@redhat.com> Hi, I made a mistake when trying to backport S8010118 (Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive). I had assumed DriverManager.getCallerClass() returns the class of the caller (what Reflection.getCallerClass() does). But it does something completely different. The attached patch fixes the mistake by introducing a new getCallerClass method. This is similar to what's done in 7u [1] with the new isDriverAllowed(Driver,Class) method. This patch also ensures that the resulting 8010118-caller_sensitive.patch does not remove any getCallerClass methods. Okay to push to HEAD? Thanks, Omair [1] http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/d0e8dd6dd7a5 -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 -------------- next part -------------- A non-text attachment was scrubbed... Name: caller-sensitive-mistake.patch Type: text/x-patch Size: 3015 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130716/8de56f74/caller-sensitive-mistake.patch From bugzilla-daemon at icedtea.classpath.org Tue Jul 16 07:43:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 16 Jul 2013 14:43:33 +0000 Subject: [Bug 1395] Bug javaws.itweb / icedtea with JNLP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1395 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aazores at redhat.com --- Comment #2 from Andrew Azores --- (In reply to comment #1) > Similar issue with the PDFScissors JNLP (downloaded from > http://www.pdfscissors.com/) > > $ javaws pdfscissors-offline.jnlp > Exception in thread "main" java.lang.NullPointerException > at javax.swing.SwingUtilities.appContextGet(SwingUtilities.java:1857) > at > javax.swing.SwingUtilities.getSharedOwnerFrame(SwingUtilities.java:1827) > at javax.swing.JWindow.(JWindow.java:185) > at javax.swing.JWindow.(JWindow.java:137) > at > net.sourceforge.jnlp.runtime.JNLPSecurityManager.(JNLPSecurityManager. > java:121) > at > net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:232) > at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:181) > at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:51) > at java.security.AccessController.doPrivileged(Native Method) > at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:172) This looks like Bug ID 1492/1495 again. What version of IcedTea-Web do you have installed and which distribution are you running? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130716/98bb662d/attachment.html From gnu.andrew at redhat.com Tue Jul 16 09:48:17 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 16 Jul 2013 12:48:17 -0400 (EDT) Subject: RFC: Fix mistake in backport of S8010118 In-Reply-To: <51E55BBD.2030405@redhat.com> References: <51E55BBD.2030405@redhat.com> Message-ID: <1944669052.1285989.1373993297329.JavaMail.root@redhat.com> ----- Original Message ----- > Hi, > > I made a mistake when trying to backport S8010118 (Annotate jdk caller > sensitive methods with @sun.reflect.CallerSensitive). I had assumed > DriverManager.getCallerClass() returns the class of the caller (what > Reflection.getCallerClass() does). But it does something completely > different. > > The attached patch fixes the mistake by introducing a new getCallerClass > method. This is similar to what's done in 7u [1] with the new > isDriverAllowed(Driver,Class) method. This patch also ensures that > the resulting 8010118-caller_sensitive.patch does not remove any > getCallerClass methods. > > Okay to push to HEAD? > > Thanks, > Omair > > [1] http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/d0e8dd6dd7a5 > -- > PGP Key: 66484681 (http://pgp.mit.edu/) > Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 > I guess. I'm not really familiar with the original patch and it's pretty difficult to understand what this one changes. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gitne at excite.co.jp Tue Jul 16 14:08:46 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 17 Jul 2013 06:08:46 +0900 Subject: =?ISO-2022-JP?B?UmU6IFJGQzogRml4IG1pc3Rha2UgaW4gYmFja3BvcnQgb2YgUzgwMTAxMTg=?= Message-ID: <201307162108.r6GL8kPO006642@mail-web01.excite.co.jp> "Andrew Hughes" wrote: > ----- Original Message ----- > > Hi, > > > > I made a mistake when trying to backport S8010118 (Annotate jdk caller > > sensitive methods with @sun.reflect.CallerSensitive). I had assumed > > DriverManager.getCallerClass() returns the class of the caller (what > > Reflection.getCallerClass() does). But it does something completely > > different. As far as I understand, the problem here was missing or incomplete documentation of methods, maybe misinterpretation or misreading. I cannot judge on the quality of this patch, because it is really difficult to understand what is going on and what it actually fixes. But, it looks like the core problem has been removed, namely misleading documentation and new has been added, so I guess the code is better than before. ;) Good work! > > The attached patch fixes the mistake by introducing a new getCallerClass > > method. This is similar to what's done in 7u [1] with the new > > isDriverAllowed(Driver,Class) method. This patch also ensures that > > the resulting 8010118-caller_sensitive.patch does not remove any > > getCallerClass methods. > > > > Okay to push to HEAD? > > > > Thanks, > > Omair > > > > [1] http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/d0e8dd6dd7a5 > > -- > > PGP Key: 66484681 (http://pgp.mit.edu/) > > Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 > > > > I guess. I'm not really familiar with the original patch and it's > pretty difficult to understand what this one changes. > -- > Andrew :) Regards, Jacob From stefan at complang.tuwien.ac.at Wed Jul 17 01:04:19 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Wed, 17 Jul 2013 10:04:19 +0200 Subject: [icedtea-web][rfc] Localized about messages In-Reply-To: <201307151554.r6FFsxOW011584@mail-web02.excite.co.jp> References: <201307151554.r6FFsxOW011584@mail-web02.excite.co.jp> Message-ID: On Mon, Jul 15, 2013 at 5:54 PM, Jacob Wisor wrote: > "Jacob Wisor" wrote: >> Hello, >> >> since refactoring the about dialog has added new messages, I hereby provide localized DE and PL messages. The German texts look fine to me. From ptisnovs at icedtea.classpath.org Wed Jul 17 01:40:44 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 17 Jul 2013 08:40:44 +0000 Subject: /hg/gfx-test: Four helper methods and three new tests added into... Message-ID: changeset 94f7f4c423e6 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=94f7f4c423e6 author: Pavel Tisnovsky date: Wed Jul 17 10:44:27 2013 +0200 Four helper methods and three new tests added into BitBltRescaleOp test suite. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltRescaleOp.java | 115 +++++++++++++++++++++++- 2 files changed, 120 insertions(+), 1 deletions(-) diffs (159 lines): diff -r f963af2be0b9 -r 94f7f4c423e6 ChangeLog --- a/ChangeLog Tue Jul 16 10:54:42 2013 +0200 +++ b/ChangeLog Wed Jul 17 10:44:27 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-17 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltRescaleOp.java: + Four helper methods and three new tests added into BitBltRescaleOp + test suite. + 2013-07-16 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r f963af2be0b9 -r 94f7f4c423e6 src/org/gfxtest/testsuites/BitBltRescaleOp.java --- a/src/org/gfxtest/testsuites/BitBltRescaleOp.java Tue Jul 16 10:54:42 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltRescaleOp.java Wed Jul 17 10:44:27 2013 +0200 @@ -130,6 +130,23 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** * Test basic BitBlt operation for buffered image containing checker pattern * with type TYPE_3BYTE_BGR * @@ -148,6 +165,60 @@ } /** + * Test basic BitBlt operation for buffered image containing diagonal checker pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing grid pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing diagonal grid pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -302,6 +373,20 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundBlackImageScaleROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, blackImageScaleROP); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -380,7 +465,35 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlackImageROP(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundWhiteImageOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, whiteImageOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlackImageOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, blackImageOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlackImageScaleROP(TestImage image, Graphics2D graphics2d) { return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, blackImageScaleROP); } From ptisnovs at icedtea.classpath.org Wed Jul 17 01:55:48 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 17 Jul 2013 08:55:48 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 7447f9e8eb91 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7447f9e8eb91 author: Pavel Tisnovsky date: Wed Jul 17 10:59:30 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into CompilableClassTest. diffstat: ChangeLog | 7 +++++ src/org/RhinoTests/CompilableClassTest.java | 35 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diffs (67 lines): diff -r bf09f2da2f09 -r 7447f9e8eb91 ChangeLog --- a/ChangeLog Tue Jul 16 10:59:52 2013 +0200 +++ b/ChangeLog Wed Jul 17 10:59:30 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-17 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into CompilableClassTest. + 2013-07-16 Pavel Tisnovsky * src/org/RhinoTests/AbstractScriptEngineClassTest.java: diff -r bf09f2da2f09 -r 7447f9e8eb91 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Tue Jul 16 10:59:52 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Wed Jul 17 10:59:30 2013 +0200 @@ -56,7 +56,9 @@ import java.lang.reflect.TypeVariable; import javax.script.Compilable; +import javax.script.Invocable; import javax.script.ScriptEngineManager; +import javax.script.ScriptEngine; @@ -1013,6 +1015,39 @@ } /** + * Test for method javax.script.Compilable.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.compilableClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.Compilable.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.compilableClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.Compilable.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.compilableClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.Compilable.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.compilableClass.desiredAssertionStatus(), + "Method Compilable.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.Compilable */ @SuppressWarnings("cast") From andrew at icedtea.classpath.org Wed Jul 17 05:55:49 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 17 Jul 2013 12:55:49 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Use $(CC) to compile mk... Message-ID: changeset 4e032c676dc8 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=4e032c676dc8 author: andrew date: Wed Jul 17 13:52:07 2013 +0100 Use $(CC) to compile mkbc instead of $(CC_COMPILE) to avoid C++-only flags diffstat: make/linux/makefiles/zeroshark.make | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 84b9ad961553 -r 4e032c676dc8 make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Fri Jul 12 22:18:15 2013 +0100 +++ b/make/linux/makefiles/zeroshark.make Wed Jul 17 13:52:07 2013 +0100 @@ -44,9 +44,10 @@ @echo Generatine ARM assembler bytecode sequences $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) +# Can't use $(CC_COMPILE) as it contains C++ flags mkbc: $(GAMMADIR)/tools/mkbc.c @echo Compiling mkbc tool - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) + $(CC) -o $@ $< $(COMPILE_DONE) mkoffsets: asm_helper.cpp @echo Compiling offset generator From jvanek at redhat.com Wed Jul 17 09:02:10 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 17 Jul 2013 18:02:10 +0200 Subject: [icedtea-web][rfc] Localized about messages In-Reply-To: <201307151554.r6FFsxOW011584@mail-web02.excite.co.jp> References: <201307151554.r6FFsxOW011584@mail-web02.excite.co.jp> Message-ID: <51E6C002.1040903@redhat.com> On 07/15/2013 05:54 PM, Jacob Wisor wrote: > "Jacob Wisor" wrote: >> Hello, >> >> since refactoring the about dialog has added new messages, I hereby provide localized DE and PL messages. >> >> The message RCantBackup has been added to accomodate an error message for handling backup errors on filesystems that do not allow overwrite on rename. Unfortunatelly, I do not recall the status on that. Jiri, maybe you know more? Apart from that it sould be fine. >> >> Regards, >> Jacob > > Oh not again :( The mailer dropped the attachment. > Thank you very much! Both for translation and review. I have checked also the PL and looks ok. I have applied the patch and pushed. - without the RCantBackup - The "[icedtea-web][rfc] Fix of backup of deployment.properties on some OSs" patch never made it in - You will have to re-dust it ;) Thanx again! It is really rare and appreciated that you are keeping en eye on localisations! J. From andrew at icedtea.classpath.org Wed Jul 17 09:31:16 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 17 Jul 2013 16:31:16 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Remove C++ flags from C... Message-ID: changeset c93fcd47982f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c93fcd47982f author: andrew date: Wed Jul 17 17:30:04 2013 +0100 Remove C++ flags from CC_COMPILE and fix usage in zeroshark.make. diffstat: make/linux/makefiles/rules.make | 2 +- make/linux/makefiles/zeroshark.make | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diffs (38 lines): diff -r 4e032c676dc8 -r c93fcd47982f make/linux/makefiles/rules.make --- a/make/linux/makefiles/rules.make Wed Jul 17 13:52:07 2013 +0100 +++ b/make/linux/makefiles/rules.make Wed Jul 17 17:30:04 2013 +0100 @@ -31,7 +31,7 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++). -CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) +CC_COMPILE = $(CC) $(CXXFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) AS.S = $(AS) $(ASFLAGS) diff -r 4e032c676dc8 -r c93fcd47982f make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Wed Jul 17 13:52:07 2013 +0100 +++ b/make/linux/makefiles/zeroshark.make Wed Jul 17 17:30:04 2013 +0100 @@ -41,18 +41,17 @@ ./mkoffsets > $@ bytecodes_arm.s: bytecodes_arm.def mkbc - @echo Generatine ARM assembler bytecode sequences - $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) + @echo Generating ARM assembler bytecode sequences + $(CXX_COMPILE) -E - < $< | ./mkbc - $@ $(COMPILE_DONE) -# Can't use $(CC_COMPILE) as it contains C++ flags mkbc: $(GAMMADIR)/tools/mkbc.c @echo Compiling mkbc tool - $(CC) -o $@ $< $(COMPILE_DONE) + $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) mkoffsets: asm_helper.cpp @echo Compiling offset generator $(QUIETLY) $(REMOVE_TARGET) - $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) endif From jvanek at icedtea.classpath.org Wed Jul 17 10:00:44 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 17 Jul 2013 17:00:44 +0000 Subject: /hg/icedtea-web: 3 new changesets Message-ID: changeset a90d4ce50b6f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a90d4ce50b6f author: Jiri Vanek date: Wed Jul 17 17:57:04 2013 +0200 added some missing de and pl strings changeset f98dbaf9939d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f98dbaf9939d author: Jiri Vanek date: Wed Jul 17 18:13:27 2013 +0200 about dialogue now available from itw-settings changeset fc1923f295cf in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fc1923f295cf author: Jiri Vanek date: Wed Jul 17 18:59:39 2013 +0200 About dialogue made accessible from plugin diffstat: ChangeLog | 37 ++++++++++ netx/net/sourceforge/jnlp/about/AboutDialog.java | 16 ++- netx/net/sourceforge/jnlp/about/HTMLPanel.java | 8 +- netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java | 28 +++++++- netx/net/sourceforge/jnlp/resources/Messages.properties | 4 +- netx/net/sourceforge/jnlp/resources/Messages_cs.properties | 1 - netx/net/sourceforge/jnlp/resources/Messages_de.properties | 7 + netx/net/sourceforge/jnlp/resources/Messages_pl.properties | 7 + netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java | 14 +++ netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java | 37 +++++++++- netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java | 24 +++++- tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java | 9 +- 12 files changed, 173 insertions(+), 19 deletions(-) diffs (459 lines): diff -r f18dea419aec -r fc1923f295cf ChangeLog --- a/ChangeLog Fri Jul 12 15:47:04 2013 -0400 +++ b/ChangeLog Wed Jul 17 18:59:39 2013 +0200 @@ -1,3 +1,40 @@ +2013-07-13 Jiri Vanek + + About dialogue made accessible from plugin + * netx/net/sourceforge/jnlp/about/AboutDialog.java: (frame) re-declared + to be Dialogue instead of JFrame and allowed to be modal if necessary. + Caption internationalized. + * netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java: + Added listener for upper right caption to show AboutDialog + * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java: + (drawBase) if enough space, adding about "button" + * netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java: + added about button + * tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java: + minor modifications related to this change + +2013-07-17 Jiri Vanek + + about dialogue now available from itw-settings + * netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java: + added button to launch about dialogue + * netx/net/sourceforge/jnlp/resources/Messages.propertie: (CPAboutInfo) + Adapted to be more accurate to select-able JVM + +2013-07-17 Jiri Vanek + Jacob Wisor + + added some missing de and pl strings + * netx/net/sourceforge/jnlp/resources/Messages.properties: + fixed about dialogue comment + * netx/net/sourceforge/jnlp/resources/Messages_cs.properties: + removed keystore comment + * netx/net/sourceforge/jnlp/resources/Messages_de.properties: + * netx/net/sourceforge/jnlp/resources/Messages_pl.properties: + added AboutDialogueTabAbout AboutDialogueTabAuthors + AboutDialogueTabChangelog AboutDialogueTabNews AboutDialogueTabGPLv2 + localizations + 2013-07-11 Andrew Azores * NEWS: added entry regarding new About Dialogue diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/about/AboutDialog.java --- a/netx/net/sourceforge/jnlp/about/AboutDialog.java Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java Wed Jul 17 18:59:39 2013 +0200 @@ -40,6 +40,7 @@ import static net.sourceforge.jnlp.runtime.Translator.R; import java.awt.Dimension; +import java.awt.Frame; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; @@ -48,7 +49,7 @@ import java.net.URL; import javax.swing.JButton; -import javax.swing.JFrame; +import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -64,17 +65,17 @@ private static final String copying_url = "/net/sourceforge/jnlp/resources/COPYING.html"; private static final String news_url = "/net/sourceforge/jnlp/resources/NEWS.html"; - private JFrame frame; + private JDialog frame; private JPanel contentPane; private HTMLPanel aboutPanel, authorsPanel, newsPanel, changelogPanel, copyingPanel; private JButton aboutButton, authorsButton, newsButton, changelogButton, copyingButton; - public AboutDialog() throws IOException { + public AboutDialog(boolean modal) throws IOException { super(new GridBagLayout()); - frame = new JFrame("About IcedTea-Web"); + frame = new JDialog((Frame)null, R("AboutDialogueTabAbout") + " IcedTea-Web", modal); frame.setContentPane(this); - frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); URL res_about = getClass().getResource(about_url); URL res_authors = getClass().getResource(authors_url); @@ -186,7 +187,10 @@ } public static void display() throws IOException { - SwingUtilities.invokeLater(new AboutDialog()); + display(false); + } + public static void display(boolean modal) throws IOException { + SwingUtilities.invokeLater(new AboutDialog(modal)); } } diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/about/HTMLPanel.java --- a/netx/net/sourceforge/jnlp/about/HTMLPanel.java Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/about/HTMLPanel.java Wed Jul 17 18:59:39 2013 +0200 @@ -56,7 +56,13 @@ public HTMLPanel(URL url, String identifier) throws IOException { super(new BorderLayout()); id = identifier; - JEditorPane pane = new JEditorPane(url); + JEditorPane pane = new JEditorPane(); + try{ + pane = new JEditorPane(url); + } catch(Exception ex){ + //no need to have invalid url fatal + ex.printStackTrace(); + } pane.setContentType("text/html"); pane.setEditable(false); pane.addHyperlinkListener(new UrlHyperlinkListener()); diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java Wed Jul 17 18:59:39 2013 +0200 @@ -22,9 +22,14 @@ import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.IOException; import javax.swing.Box; +import javax.swing.JButton; import javax.swing.JLabel; +import net.sourceforge.jnlp.about.AboutDialog; import net.sourceforge.jnlp.runtime.Translator; @@ -43,7 +48,17 @@ JLabel logo = new JLabel(); JLabel aboutLabel = new JLabel("" + Translator.R("CPAboutInfo") + ""); - + JButton aboutButton = new JButton(Translator.R("AboutDialogueTabAbout")); + aboutButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + try { + AboutDialog.display(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + }); c.fill = GridBagConstraints.BOTH; c.gridy = 0; c.gridx = 0; @@ -53,11 +68,20 @@ c.gridx = 1; c.weightx = 1; add(aboutLabel, c); - + c.fill = GridBagConstraints.NONE; + c.weighty = 0; + c.weightx = 0; + c.gridy++; + c.gridx=1; + add(aboutButton, c); /* Keep all the elements at the top of the panel (Extra padding) */ + c.fill = GridBagConstraints.BOTH; Component filler = Box.createRigidArea(new Dimension(1, 1)); c.weighty = 1; c.gridy++; add(filler, c); + + + } } diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Jul 17 18:59:39 2013 +0200 @@ -33,7 +33,7 @@ Value=Value Version=Version -#about dialogue +# about dialogue AboutDialogueTabAbout=About AboutDialogueTabAuthors=Authors AboutDialogueTabChangelog=Changelog @@ -383,7 +383,7 @@ CPTabJVMSettings=JVM Settings # Control Panel - AboutPanel -CPAboutInfo=This is the control panel for setting deployments.properties.
Not all options will take effect until implemented.
The use of multiple JREs is currently unsupported.
+CPAboutInfo=This is the control panel for setting deployments.properties.
Not all options will take effect until implemented.
The use of multiple JREs is currently limited to OpenJDK.
# Control Panel - AdvancedProxySettings APSDialogTitle=Network Settings diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_cs.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Wed Jul 17 18:59:39 2013 +0200 @@ -278,7 +278,6 @@ CVUser=U\u017eivatel CVSystem=Syst\u00e9m -#KeyStores: see KeyStores.java KS=\u00dalo\u017ei\u0161t\u011b kl\u00ed\u010d\u016f KSCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty KSJsseCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty JSSE diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_de.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties Wed Jul 17 18:59:39 2013 +0200 @@ -33,6 +33,13 @@ Value=Wert Version=Version +# about dialogue +AboutDialogueTabAbout=\u00dcber +AboutDialogueTabAuthors=Autoren +AboutDialogueTabChangelog=\u00c4nderungsprotokoll +AboutDialogueTabNews=Neuigkeiten +AboutDialogueTabGPLv2=GPLv2 + # LS - Severity LSMinor=Gering LSFatal=Fatal diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_pl.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Wed Jul 17 18:59:39 2013 +0200 @@ -33,6 +33,13 @@ Value=Warto\u015b\u0107 Version=Wersja +# about dialogue +AboutDialogueTabAbout=O +AboutDialogueTabAuthors=Autorzy +AboutDialogueTabChangelog=Dziennik zmian +AboutDialogueTabNews=Nowo\u015bci +AboutDialogueTabGPLv2=GPLv2 + # LS - Severity LSMinor=Mniejszy LSFatal=Fatalny diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java --- a/netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java Wed Jul 17 18:59:39 2013 +0200 @@ -42,6 +42,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Observable; +import net.sourceforge.jnlp.about.AboutDialog; import net.sourceforge.jnlp.splashscreen.impls.defaultsplashscreen2012.BasePainter; import net.sourceforge.jnlp.splashscreen.parts.BasicComponentSplashScreen; @@ -63,6 +64,19 @@ parent.repaint(); } }); + parent.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getY() < painter.getAboutOfset().y && e.getX() > (painter.getAboutOfset().x)) { + try { + AboutDialog.display(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + } + }); // Add a new listener for resizes parent.addComponentListener(new ComponentAdapter() { // Re-adjust variables based on size diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java --- a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java Wed Jul 17 18:59:39 2013 +0200 @@ -36,13 +36,16 @@ exception statement from your version. */ package net.sourceforge.jnlp.splashscreen.impls.defaultsplashscreen2012; +import java.awt.BasicStroke; import net.sourceforge.jnlp.splashscreen.impls.*; import java.awt.Color; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; +import java.awt.Point; import java.awt.RenderingHints; +import java.awt.Stroke; import java.awt.Toolkit; import java.awt.font.TextAttribute; import java.awt.image.BufferedImage; @@ -54,6 +57,7 @@ import java.util.Observer; import javax.swing.SwingUtilities; +import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.splashscreen.SplashUtils.SplashReason; import net.sourceforge.jnlp.splashscreen.parts.BasicComponentSplashScreen; import net.sourceforge.jnlp.splashscreen.parts.InfoItem; @@ -115,6 +119,14 @@ protected TextWithWaterLevel twl; protected TextWithWaterLevel oldTwl; protected boolean canWave = true; + private Point aboutOfset = new Point(); + + private final static float dash1[] = {10.0f}; + private final static BasicStroke dashed = + new BasicStroke(1.0f, + BasicStroke.CAP_BUTT, + BasicStroke.JOIN_MITER, + 10.0f, dash1, 0.0f); protected void paintNiceTexts(Graphics2D g2d) { //the only animated stuff @@ -510,11 +522,22 @@ g2d.setColor(plainTextColor); FontMetrics fm = g2d.getFontMetrics(); if (version != null) { - String niceVersion=stripCommitFromVersion(version); + String aboutPrefix = Translator.R("AboutDialogueTabAbout") + ": "; + int aboutPrefixWidth = fm.stringWidth(aboutPrefix); + String niceVersion = stripCommitFromVersion(version); int y = master.getSplashWidth() - fm.stringWidth(niceVersion + " "); if (y < 0) { y = 0; } + if (y > aboutPrefixWidth) { + niceVersion = aboutPrefix + niceVersion; + y -= aboutPrefixWidth; + } + aboutOfset = new Point(y, fm.getHeight()); + Stroke backup = g2d.getStroke(); + g2d.setStroke(dashed); + g2d.drawRect(aboutOfset.x-1,1, master.getSplashWidth()-aboutOfset.x-1, aboutOfset.y+1); + g2d.setStroke(backup); g2d.drawString(niceVersion, y, fm.getHeight()); } return fm; @@ -550,4 +573,16 @@ ex.printStackTrace(); } } + + public BasicComponentSplashScreen getMaster() { + return master; + } + + public Point getAboutOfset() { + return aboutOfset; + } + + + + } diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java --- a/netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java Fri Jul 12 15:47:04 2013 -0400 +++ b/netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java Wed Jul 17 18:59:39 2013 +0200 @@ -63,6 +63,7 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import net.sourceforge.jnlp.LaunchException; +import net.sourceforge.jnlp.about.AboutDialog; import net.sourceforge.jnlp.runtime.Translator; public class JEditorPaneBasedExceptionDialog extends JDialog implements HyperlinkListener { @@ -71,6 +72,7 @@ private JButton closeButton; private JButton closeAndCopyButton; private JButton homeButton; + private JButton aboutButton; private JEditorPane htmlErrorAndHelpPanel; private JLabel exceptionLabel; private JLabel iconLabel; @@ -138,6 +140,7 @@ htmlPaneScroller = new JScrollPane(); htmlErrorAndHelpPanel = new JEditorPane(); homeButton = new JButton(); + aboutButton = new JButton(); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); @@ -162,9 +165,9 @@ GroupLayout jPanel2Layout = new GroupLayout(topPanel); topPanel.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel2Layout.createSequentialGroup().addContainerGap().addComponent(closeButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 314, Short.MAX_VALUE).addComponent(closeAndCopyButton).addContainerGap())); + jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel2Layout.createSequentialGroup().addContainerGap().addComponent(closeButton).addContainerGap().addComponent(aboutButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 314, Short.MAX_VALUE).addComponent(closeAndCopyButton).addContainerGap())); jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup().addContainerGap(24, Short.MAX_VALUE).addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(closeButton).addComponent(closeAndCopyButton)).addContainerGap())); + jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup().addContainerGap(24, Short.MAX_VALUE).addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(closeButton).addComponent(aboutButton).addComponent(closeAndCopyButton)).addContainerGap())); exceptionLabel.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N exceptionLabel.setHorizontalAlignment(SwingConstants.CENTER); @@ -186,13 +189,28 @@ } }); + + aboutButton.setText(Translator.R("AboutDialogueTabAbout")); + aboutButton.addActionListener(new java.awt.event.ActionListener() { + + @Override + public void actionPerformed(java.awt.event.ActionEvent evt) { + try{ + AboutDialog.display(true); + }catch(Exception ex){ + ex.printStackTrace(); + JOptionPane.showConfirmDialog(JEditorPaneBasedExceptionDialog.this, ex); + } + } + }); + GroupLayout jPanel1Layout = new GroupLayout(mainPanel); mainPanel.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel1Layout.createSequentialGroup().addContainerGap().addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, 71, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(exceptionLabel, GroupLayout.DEFAULT_SIZE, 503, Short.MAX_VALUE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(homeButton, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE).addContainerGap()).addComponent(bottomPanel, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 723, Short.MAX_VALUE)); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel1Layout.createSequentialGroup().addContainerGap().addGroup(jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, 70, GroupLayout.PREFERRED_SIZE).addGroup(jPanel1Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(exceptionLabel, GroupLayout.PREFERRED_SIZE, 70, GroupLayout.PREFERRED_SIZE).addComponent(homeButton, GroupLayout.PREFERRED_SIZE, 64, GroupLayout.PREFERRED_SIZE))).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(bottomPanel, GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE))); - + GroupLayout layout = new GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( diff -r f18dea419aec -r fc1923f295cf tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java Fri Jul 12 15:47:04 2013 -0400 +++ b/tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java Wed Jul 17 18:59:39 2013 +0200 @@ -74,8 +74,8 @@ ie.setvendor("IcedTea-Web team"); ie.addDescription("Testing null description"); ie.addDescription("tsting twoline des ...break\ncription of kind short", InfoItem.descriptionKindShort); - //panel.setInformationElement(ie); - //panel.setVersion("1.2-re45fdg"); + panel.setInformationElement(ie); + panel.setVersion("1.2-re45fdg"); setLayout(new BorderLayout()); getContentPane().add(panel.getSplashComponent(), BorderLayout.CENTER); @@ -159,7 +159,7 @@ panel.startAnimation(); try { - Thread.sleep(5000); + Thread.sleep(10000); } catch (Exception e) { } //not needed @@ -169,7 +169,10 @@ app.remove(panel.getSplashComponent()); r.setPercentage(panel.getPercentage()); r.adjustForSize(); + r.setLoadingException(new RuntimeException(":)")); panel = r; + panel.setVersion("1.2-re45fdg"); + app.add(panel.getSplashComponent()); app.validateTree(); //app.pack(); From omajid at icedtea.classpath.org Wed Jul 17 11:04:39 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 17 Jul 2013 18:04:39 +0000 Subject: /hg/icedtea6: Fix mistake in backport of S8010118 Message-ID: changeset 5cba6fc13701 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5cba6fc13701 author: Omair Majid date: Wed Jul 17 11:54:43 2013 -0400 Fix mistake in backport of S8010118 2013-07-17 Omair Majid * patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in backport. diffstat: ChangeLog | 5 +++++ patches/openjdk/8010118-caller_sensitive.patch | 26 ++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diffs (79 lines): diff -r 11f837636a0a -r 5cba6fc13701 ChangeLog --- a/ChangeLog Thu Jul 11 23:43:09 2013 +0100 +++ b/ChangeLog Wed Jul 17 11:54:43 2013 -0400 @@ -1,3 +1,8 @@ +2013-07-17 Omair Majid + + * patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in + backport. + 2013-07-11 Andrew John Hughes * NEWS: diff -r 11f837636a0a -r 5cba6fc13701 patches/openjdk/8010118-caller_sensitive.patch --- a/patches/openjdk/8010118-caller_sensitive.patch Thu Jul 11 23:43:09 2013 +0100 +++ b/patches/openjdk/8010118-caller_sensitive.patch Wed Jul 17 11:54:43 2013 -0400 @@ -1484,17 +1484,17 @@ // Walk through the loaded drivers attempting to locate someone // who understands the given URL. -@@ -258,8 +248,7 @@ +@@ -258,8 +248,8 @@ DriverInfo di = (DriverInfo)drivers.elementAt(i); // If the caller does not have permission to load the driver then // skip it. - if ( getCallerClass(callerCL, di.driverClassName ) != -- di.driverClass ) { -+ if ( callerClass != di.driverClass ) { ++ if ( getCallerClass(callerClass, di.driverClassName ) != + di.driverClass ) { println(" skipping: " + di); continue; } -@@ -322,31 +311,29 @@ +@@ -322,31 +311,30 @@ * @param driver the JDBC Driver to drop * @exception SQLException if a database access error occurs */ @@ -1504,6 +1504,7 @@ - // Gets the classloader of the code that called this method, - // may be null. - ClassLoader callerCL = DriverManager.getCallerClassLoader(); ++ Class callerClass = Reflection.getCallerClass(); println("DriverManager.deregisterDriver: " + driver); // Walk through the loaded drivers. @@ -1524,7 +1525,7 @@ // If the caller does not have permission to load the driver then // throw a security exception. - if (getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) { -+ if (Reflection.getCallerClass() != di.driverClass) { ++ if (getCallerClass(callerClass, di.driverClassName ) != di.driverClass) { throw new SecurityException(); } @@ -1551,10 +1552,23 @@ // If the caller does not have permission to load the driver then // skip it. - if ( getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) { -+ if ( callerClass != di.driverClass ) { ++ if ( getCallerClass(callerClass, di.driverClassName) != di.driverClass ) { println(" skipping: " + di); continue; } +@@ -467,6 +467,12 @@ + + //------------------------------------------------------------------------ + ++ private static Class getCallerClass(Class caller, ++ String driverClassName) { ++ ClassLoader callerCL = caller != null ? caller.getClassLoader() : null; ++ return getCallerClass(callerCL, driverClassName); ++ } ++ + // Returns the class object that would be created if the code calling the + // driver manager had loaded the driver class, or null if the class + // is inaccessible. @@ -546,19 +537,20 @@ // Worker method called by the public getConnection() methods. From andrew at icedtea.classpath.org Wed Jul 17 11:14:53 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 17 Jul 2013 18:14:53 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Add note about use of $... Message-ID: changeset 4413a836dcc7 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=4413a836dcc7 author: andrew date: Wed Jul 17 19:14:46 2013 +0100 Add note about use of $(CFLAGS)/$(CXXFLAGS)/$(CPPFLAGS) at present. diffstat: make/linux/makefiles/rules.make | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r c93fcd47982f -r 4413a836dcc7 make/linux/makefiles/rules.make --- a/make/linux/makefiles/rules.make Wed Jul 17 17:30:04 2013 +0100 +++ b/make/linux/makefiles/rules.make Wed Jul 17 19:14:46 2013 +0100 @@ -31,6 +31,9 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++). +# FIXME: $(CXXFLAGS) currently only includes preprocessor flags while +# $(CFLAGS) includes C and C++ flags. Ideally, there should be three +# variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS). CC_COMPILE = $(CC) $(CXXFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) From bugzilla-daemon at icedtea.classpath.org Wed Jul 17 12:46:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 17 Jul 2013 19:46:33 +0000 Subject: [Bug 1498] New: Allow Root to attach to all VMs Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1498 Bug ID: 1498 Summary: Allow Root to attach to all VMs Classification: Unclassified Product: IcedTea Version: 2.3.9 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: ebaron at redhat.com CC: unassigned at icedtea.classpath.org Created attachment 906 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=906&action=edit Hotspot patch to allow connections from a privileged root-user VM Hotspot's dynamic attach mechanism currently does not allow a virtual machine running as root to attach to VMs of other users. In principle, root should be able to do this. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130717/39a29920/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jul 17 12:48:15 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 17 Jul 2013 19:48:15 +0000 Subject: [Bug 1498] Allow Root to attach to all VMs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1498 --- Comment #1 from Elliott Baron --- Created attachment 907 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=907&action=edit JDK patch to allow a VM running as root to attach to VMs of any user -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130717/b43cf8cf/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jul 17 12:49:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 17 Jul 2013 19:49:05 +0000 Subject: [Bug 1498] Allow Root to attach to all VMs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1498 Elliott Baron changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |1460 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130717/2556bdc6/attachment.html From andrew at icedtea.classpath.org Wed Jul 17 13:22:08 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 17 Jul 2013 20:22:08 +0000 Subject: /hg/release/icedtea7-2.3: Remove alternate HotSpot for Zero and ... Message-ID: changeset 4c7988ed06f8 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=4c7988ed06f8 author: Andrew John Hughes date: Wed Jul 17 21:21:52 2013 +0100 Remove alternate HotSpot for Zero and update default to latest 2.3 HEAD. 2013-07-17 Andrew John Hughes * patches/boot/ecj-opts.patch, * patches/boot/hotspot/zero/jdk-dependency.patch, * patches/cacao/arm-arch-defines.patch, * patches/hotspot/zero/6924259-string_offset.patch, * patches/hotspot/zero/7089790-bsd_port.patch, * patches/hotspot/zero/7098194-macosx_port.patch, * patches/hotspot/zero/7116189-setnativethreadname.patch, * patches/hotspot/zero/7175133-string_offset.patch, * patches/hotspot/zero/revert-7017193.patch, * patches/hotspot/zero/revert_arm_debug.patch: Removed unused patches. * patches/boot/hotspot-jdk-dependency.patch: Renamed from patches/boot/hotspot/default/jdk-dependency.patch * patches/revert-7017193.patch: Renamed from patches/hotspot/default/revert-7017193.patch * Makefile.am: (CORBA_CHANGESET): Update to IcedTea 2.3 HEAD. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove Zero-specific patches and use of $(HSBUILD). * acinclude.m4: (IT_WITH_HOTSPOT_BUILD): No longer default to "zero" HotSpot if Zero is requested. * hotspot.map: Update default to IcedTea 2.3 HotSpot HEAD. Remove zero. diffstat: ChangeLog | 38 + Makefile.am | 37 +- acinclude.m4 | 6 +- hotspot.map | 3 +- patches/boot/ecj-opts.patch | 12 - patches/boot/hotspot-jdk-dependency.patch | 23 + patches/boot/hotspot/default/jdk-dependency.patch | 23 - patches/boot/hotspot/zero/jdk-dependency.patch | 25 - patches/cacao/arm-arch-defines.patch | 18 - patches/hotspot/default/revert-7017193.patch | 138 - patches/hotspot/zero/6924259-string_offset.patch | 916 - patches/hotspot/zero/7089790-bsd_port.patch | 28881 --------------- patches/hotspot/zero/7098194-macosx_port.patch | 11389 ----- patches/hotspot/zero/7116189-setnativethreadname.patch | 67 - patches/hotspot/zero/7175133-string_offset.patch | 48 - patches/hotspot/zero/revert-7017193.patch | 136 - patches/hotspot/zero/revert_arm_debug.patch | 55 - patches/revert-7017193.patch | 138 + 18 files changed, 215 insertions(+), 41738 deletions(-) diffs (truncated from 42059 to 500 lines): diff -r 046c72402c91 -r 4c7988ed06f8 ChangeLog --- a/ChangeLog Fri Jun 28 14:16:59 2013 +0100 +++ b/ChangeLog Wed Jul 17 21:21:52 2013 +0100 @@ -1,3 +1,41 @@ +2013-07-17 Andrew John Hughes + + * patches/boot/ecj-opts.patch, + * patches/boot/hotspot/zero/jdk-dependency.patch, + * patches/cacao/arm-arch-defines.patch, + * patches/hotspot/zero/6924259-string_offset.patch, + * patches/hotspot/zero/7089790-bsd_port.patch, + * patches/hotspot/zero/7098194-macosx_port.patch, + * patches/hotspot/zero/7116189-setnativethreadname.patch, + * patches/hotspot/zero/7175133-string_offset.patch, + * patches/hotspot/zero/revert-7017193.patch, + * patches/hotspot/zero/revert_arm_debug.patch: + Removed unused patches. + * patches/boot/hotspot-jdk-dependency.patch: Renamed from + patches/boot/hotspot/default/jdk-dependency.patch + * patches/revert-7017193.patch: Renamed from + patches/hotspot/default/revert-7017193.patch + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea 2.3 HEAD. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Remove Zero-specific patches + and use of $(HSBUILD). + * acinclude.m4: + (IT_WITH_HOTSPOT_BUILD): No longer default to "zero" + HotSpot if Zero is requested. + * hotspot.map: Update default to IcedTea 2.3 HotSpot + HEAD. Remove zero. + 2013-06-28 Andrew John Hughes * configure.ac: Bump to 2.3.11pre. diff -r 046c72402c91 -r 4c7988ed06f8 Makefile.am --- a/Makefile.am Fri Jun 28 14:16:59 2013 +0100 +++ b/Makefile.am Wed Jul 17 21:21:52 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 25 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 8e581b671511 -JAXP_CHANGESET = 1a02956fcfaf -JAXWS_CHANGESET = c0e829bfbf62 -JDK_CHANGESET = bd392c168d5c -LANGTOOLS_CHANGESET = 8cf15d334ad3 -OPENJDK_CHANGESET = fb1ac57ada6c +CORBA_CHANGESET = eda3895cb67e +JAXP_CHANGESET = 181faea8867b +JAXWS_CHANGESET = 5dc89903bfc7 +JDK_CHANGESET = 0a482b2f7c35 +LANGTOOLS_CHANGESET = e2c5f493844a +OPENJDK_CHANGESET = f143f229bd12 -CORBA_SHA256SUM = 510ca43bc0d208f4cbbe716a1652871f63491f37b3e3902610a42d2e1870fd6c -JAXP_SHA256SUM = acfd7789f0745a79306d339bbc55ad9d05c08b49b5058e7a804323cdced258fe -JAXWS_SHA256SUM = 014d6f206b628d3d532c98420b8ebc6434c446497a55037aae6bc3535a858892 -JDK_SHA256SUM = f6c7d86b1b3cebb1f26f3d2735a3b7466b31d9c9e56950e4f24c6c1da436247c -LANGTOOLS_SHA256SUM = e28ff622e407a915c31ba90d8056b3e08d051c9cd6c107c52b0ef4e246adcd23 -OPENJDK_SHA256SUM = 09fd1d517ed890924e580dd50af7d41e2f137668120e24eca4a7d887648f2335 +CORBA_SHA256SUM = 7e1201261a38b588c1e87224c3480602b5eedd5d821d7c6cb41fdcf1271c2201 +JAXP_SHA256SUM = 71309e488b91266008c8573a32933f66502ddc10e31f808cb8f5fc04caa30f84 +JAXWS_SHA256SUM = 6fac4c4f6afd4ea61d2926987f24f0661f34c71e8947dd86340a0081c2988703 +JDK_SHA256SUM = c24a265ca703e32e742496447f95a49648f49a5577b0fb097865bed32a698032 +LANGTOOLS_SHA256SUM = e964e25b137d5c8a145df60b7cfee67538417191f9f6dd3c59dfe388a40c3b6f +OPENJDK_SHA256SUM = 80b1aba00ebd6ea0abc0b857ec7fc86c99a7b476d93c78dd35518034ce85956f CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -265,19 +265,10 @@ # Patch list ICEDTEA_PATCHES = \ - patches/hotspot/$(HSBUILD)/revert-7017193.patch + patches/revert-7017193.patch # Conditional patches -if WITH_ALT_HSBUILD -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \ - patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \ - patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \ - patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \ - patches/hotspot/$(HSBUILD)/revert_arm_debug.patch -endif - if WITH_RHINO ICEDTEA_PATCHES += \ patches/rhino.patch @@ -358,7 +349,7 @@ patches/boot/corba-dependencies.patch \ patches/boot/jaxws-langtools-dependency.patch \ patches/boot/jaxws-jdk-dependency.patch \ - patches/boot/hotspot/${HSBUILD}/jdk-dependency.patch \ + patches/boot/hotspot-jdk-dependency.patch \ patches/boot/ecj-multicatch.patch \ patches/boot/ecj-trywithresources.patch \ patches/boot/ecj-autoboxing.patch \ diff -r 046c72402c91 -r 4c7988ed06f8 acinclude.m4 --- a/acinclude.m4 Fri Jun 28 14:16:59 2013 +0100 +++ b/acinclude.m4 Wed Jul 17 21:21:52 2013 +0100 @@ -924,11 +924,7 @@ AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD], [ AC_REQUIRE([IT_ENABLE_ZERO_BUILD]) - if test "x${use_zero}" = "xyes"; then - DEFAULT_BUILD="zero" - else - DEFAULT_BUILD="default" - fi + DEFAULT_BUILD="default" AC_MSG_CHECKING([which HotSpot build to use]) AC_ARG_WITH([hotspot-build], [AS_HELP_STRING(--with-hotspot-build=BUILD,the HotSpot build to use [[BUILD=default]])], diff -r 046c72402c91 -r 4c7988ed06f8 hotspot.map --- a/hotspot.map Fri Jun 28 14:16:59 2013 +0100 +++ b/hotspot.map Wed Jul 17 21:21:52 2013 +0100 @@ -1,3 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0 -zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 0d81d5904952 a5a609a3600f474a2333b3f3c3dda735d18f8b8d67e8bdeb33f70d14abc0cdfc +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305 diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/ecj-opts.patch --- a/patches/boot/ecj-opts.patch Fri Jun 28 14:16:59 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile ---- openjdk-boot.orig/jdk/make/java/nio/Makefile 2009-12-13 18:43:31.000000000 +0000 -+++ openjdk-boot/jdk/make/java/nio/Makefile 2009-12-13 19:03:31.000000000 +0000 -@@ -31,7 +31,7 @@ - PACKAGE = java.nio - LIBRARY = nio - PRODUCT = java --OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror -+OTHER_JAVACFLAGS += -Xlint:serial -Werror - include $(BUILDDIR)/common/Defs.gmk - - NIO_SRC = $(SHARE_SRC)/classes/java/nio diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/hotspot-jdk-dependency.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/hotspot-jdk-dependency.patch Wed Jul 17 21:21:52 2013 +0100 @@ -0,0 +1,23 @@ +diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make +--- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:15:04.747642641 +0100 ++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:16:32.825095823 +0100 +@@ -91,7 +91,7 @@ + # are in AGENT_FILES, so use the shell to expand them. + # Be extra carefull to not produce too long command lines in the shell! + $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) + $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js +diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk +--- openjdk-boot.orig/make/hotspot-rules.gmk 2012-05-23 20:37:39.000000000 +0100 ++++ openjdk-boot/make/hotspot-rules.gmk 2012-05-23 22:16:52.425419199 +0100 +@@ -85,6 +85,7 @@ + HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) + HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) + HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR) ++HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR) + + # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? + # Or is there something wrong with hotspot/make/Makefile? diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/hotspot/default/jdk-dependency.patch --- a/patches/boot/hotspot/default/jdk-dependency.patch Fri Jun 28 14:16:59 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make ---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:15:04.747642641 +0100 -+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:16:32.825095823 +0100 -@@ -91,7 +91,7 @@ - # are in AGENT_FILES, so use the shell to expand them. - # Be extra carefull to not produce too long command lines in the shell! - $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) - $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer - $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) - $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js -diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk ---- openjdk-boot.orig/make/hotspot-rules.gmk 2012-05-23 20:37:39.000000000 +0100 -+++ openjdk-boot/make/hotspot-rules.gmk 2012-05-23 22:16:52.425419199 +0100 -@@ -85,6 +85,7 @@ - HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) - HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) - HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR) -+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR) - - # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? - # Or is there something wrong with hotspot/make/Makefile? diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/hotspot/zero/jdk-dependency.patch --- a/patches/boot/hotspot/zero/jdk-dependency.patch Fri Jun 28 14:16:59 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make ---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-07-20 18:05:26.733484117 +0100 -+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-07-20 18:10:11.384736044 +0100 -@@ -97,8 +97,8 @@ - $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) - $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) - -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) - - $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer - $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) -diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk ---- openjdk-boot.orig/make/hotspot-rules.gmk 2012-06-29 15:19:51.000000000 +0100 -+++ openjdk-boot/make/hotspot-rules.gmk 2012-07-20 18:10:28.277161702 +0100 -@@ -85,6 +85,7 @@ - HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) - HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) - HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR) -+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR) - - # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? - # Or is there something wrong with hotspot/make/Makefile? diff -r 046c72402c91 -r 4c7988ed06f8 patches/cacao/arm-arch-defines.patch --- a/patches/cacao/arm-arch-defines.patch Fri Jun 28 14:16:59 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ---- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100 -@@ -33,7 +33,13 @@ - - /* NEC LE-IT: gcc has no way to easily check the arm architecture - * but defines only one of __ARM_ARCH_x__ to be true */ --#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_7__) -+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ -+ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ -+ || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ -+ || defined(__ARM_ARCH_6M__) \ -+ || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ -+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) -+ - AO_INLINE void - AO_nop_full() - { diff -r 046c72402c91 -r 4c7988ed06f8 patches/hotspot/default/revert-7017193.patch --- a/patches/hotspot/default/revert-7017193.patch Fri Jun 28 14:16:59 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -2763,39 +2763,47 @@ - // writing thread stacks don't use growable mappings (i.e. those - // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this - // only applies to the main thread. -- --static --bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) { -- -- char buf[128]; -- int fd, sz; -- -- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) { -+static bool -+get_stack_bounds(uintptr_t *bottom, uintptr_t *top) -+{ -+ FILE *f = fopen("/proc/self/maps", "r"); -+ if (f == NULL) - return false; -- } -- -- const char kw[] = "[stack]"; -- const int kwlen = sizeof(kw)-1; -- -- // Address part of /proc/self/maps couldn't be more than 128 bytes -- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) { -- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) { -- // Extract addresses -- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { -- uintptr_t sp = (uintptr_t) __builtin_frame_address(0); -- if (sp >= *bottom && sp <= *top) { -- ::close(fd); -- return true; -- } -+ -+ while (!feof(f)) { -+ size_t dummy; -+ char *str = NULL; -+ ssize_t len = getline(&str, &dummy, f); -+ if (len == -1) { -+ fclose(f); -+ if (str != NULL) -+ free(str); -+ return false; -+ } -+ -+ if (len > 0 && str[len-1] == '\n') { -+ str[len-1] = 0; -+ len--; -+ } -+ -+ static const char *stack_str = "[stack]"; -+ if (len > (ssize_t)strlen(stack_str) -+ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { -+ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { -+ uintptr_t sp = (uintptr_t)__builtin_frame_address(0); -+ if (sp >= *bottom && sp <= *top) { -+ free(str); -+ fclose(f); -+ return true; - } -- } -- } -- -- ::close(fd); -+ } -+ } -+ free(str); -+ } -+ fclose(f); - return false; - } - -- - // If the (growable) stack mapping already extends beyond the point - // where we're going to put our guard pages, truncate the mapping at - // that point by munmap()ping it. This ensures that when we later -diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp ---- openjdk/hotspot/src/share/vm/runtime/os.cpp -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp -@@ -1331,41 +1331,3 @@ - } - return result; - } -- --// Read file line by line, if line is longer than bsize, --// skip rest of line. --int os::get_line_chars(int fd, char* buf, const size_t bsize){ -- size_t sz, i = 0; -- -- // read until EOF, EOL or buf is full -- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { -- ++i; -- } -- -- if (buf[i] == '\n') { -- // EOL reached so ignore EOL character and return -- -- buf[i] = 0; -- return (int) i; -- } -- -- buf[i+1] = 0; -- -- if (sz != 1) { -- // EOF reached. if we read chars before EOF return them and -- // return EOF on next call otherwise return EOF -- -- return (i == 0) ? -1 : (int) i; -- } -- -- // line is longer than size of buf, skip to EOL -- char ch; -- while (read(fd, &ch, 1) == 1 && ch != '\n') { -- // Do nothing -- } -- -- // return initial part of line that fits in buf. -- // If we reached EOF, it will be returned on next call. -- -- return (int) i; --} -diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp ---- openjdk/hotspot/src/share/vm/runtime/os.hpp -+++ openjdk/hotspot/src/share/vm/runtime/os.hpp -@@ -672,10 +672,6 @@ - // Hook for os specific jvm options that we don't want to abort on seeing - static bool obsolete_option(const JavaVMOption *option); - -- // Read file line by line. If line is longer than bsize, -- // rest of line is skipped. Returns number of bytes read or -1 on EOF -- static int get_line_chars(int fd, char *buf, const size_t bsize); -- - // Extensions - #include "runtime/os_ext.hpp" - diff -r 046c72402c91 -r 4c7988ed06f8 patches/hotspot/zero/6924259-string_offset.patch --- a/patches/hotspot/zero/6924259-string_offset.patch Fri Jun 28 14:16:59 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,916 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp ---- openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2012-10-17 08:52:30.000000000 +0100 -+++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2013-01-16 00:42:59.059088003 +0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, 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 -@@ -238,9 +238,12 @@ - - Register result = dst->as_register(); - { -- // Get a pointer to the first character of string0 in tmp0 and get string0.count in str0 -- // Get a pointer to the first character of string1 in tmp1 and get string1.count in str1 -- // Also, get string0.count-string1.count in o7 and get the condition code set -+ // Get a pointer to the first character of string0 in tmp0 -+ // and get string0.length() in str0 -+ // Get a pointer to the first character of string1 in tmp1 -+ // and get string1.length() in str1 -+ // Also, get string0.length()-string1.length() in -+ // o7 and get the condition code set - // Note: some instructions have been hoisted for better instruction scheduling - - Register tmp0 = L0; -@@ -248,27 +251,40 @@ - Register tmp2 = L2; - - int value_offset = java_lang_String:: value_offset_in_bytes(); // char array -- int offset_offset = java_lang_String::offset_offset_in_bytes(); // first character position -- int count_offset = java_lang_String:: count_offset_in_bytes(); -- -- __ load_heap_oop(str0, value_offset, tmp0); -- __ ld(str0, offset_offset, tmp2); -- __ add(tmp0, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp0); -- __ ld(str0, count_offset, str0); -- __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2); -+ if (java_lang_String::has_offset_field()) { -+ int offset_offset = java_lang_String::offset_offset_in_bytes(); // first character position -+ int count_offset = java_lang_String:: count_offset_in_bytes(); -+ __ load_heap_oop(str0, value_offset, tmp0); -+ __ ld(str0, offset_offset, tmp2); -+ __ add(tmp0, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp0); -+ __ ld(str0, count_offset, str0); -+ __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2); -+ } else { -+ __ load_heap_oop(str0, value_offset, tmp1); -+ __ add(tmp1, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp0); -+ __ ld(tmp1, arrayOopDesc::length_offset_in_bytes(), str0); -+ } - - // str1 may be null - add_debug_info_for_null_check_here(info); - -- __ load_heap_oop(str1, value_offset, tmp1); -- __ add(tmp0, tmp2, tmp0); -- -- __ ld(str1, offset_offset, tmp2); -- __ add(tmp1, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1); -- __ ld(str1, count_offset, str1); -- __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2); -+ if (java_lang_String::has_offset_field()) { -+ int offset_offset = java_lang_String::offset_offset_in_bytes(); // first character position -+ int count_offset = java_lang_String:: count_offset_in_bytes(); -+ __ load_heap_oop(str1, value_offset, tmp1); -+ __ add(tmp0, tmp2, tmp0); -+ -+ __ ld(str1, offset_offset, tmp2); -+ __ add(tmp1, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1); -+ __ ld(str1, count_offset, str1); -+ __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2); -+ __ add(tmp1, tmp2, tmp1); -+ } else { -+ __ load_heap_oop(str1, value_offset, tmp2); -+ __ add(tmp2, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1); -+ __ ld(tmp2, arrayOopDesc::length_offset_in_bytes(), str1); -+ } - __ subcc(str0, str1, O7); -- __ add(tmp1, tmp2, tmp1); - } - - { -@@ -302,7 +318,7 @@ - // Shift base0 and base1 to the end of the arrays, negate limit - __ add(base0, limit, base0); - __ add(base1, limit, base1); -- __ neg(limit); // limit = -min{string0.count, strin1.count} -+ __ neg(limit); // limit = -min{string0.length(), string1.length()} - - __ lduh(base0, limit, chr0); - __ bind(Lloop); -diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-01-16 00:41:43.257866830 +0000 -+++ openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-01-16 00:42:59.059088003 +0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. From gnu.andrew at redhat.com Wed Jul 17 13:24:57 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 17 Jul 2013 16:24:57 -0400 (EDT) Subject: Updating IcedTea 2.3.x with the ARM32 port In-Reply-To: <659327113.2017727.1374076596690.JavaMail.root@redhat.com> Message-ID: <1748824834.2220737.1374092697106.JavaMail.root@redhat.com> The IcedTea 2.3.x branch now uses the same version of HotSpot (hs23 from the IcedTea 2.3.x forest) for all builds: http://icedtea.classpath.org/hg/release/icedtea7-2.3/rev/4c7988ed06f8 This is following the import of the ARM32 port to the 2.3 forest. Please test and report any issues as soon as possible. We plan to do a 2.3.11 release based on this by the end of the month. There are no planned security updates for the 2.1.x and 2.2.x branches, so they will become obsolete with the October 2013 security update. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From jvanek at icedtea.classpath.org Wed Jul 17 23:54:04 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 18 Jul 2013 06:54:04 +0000 Subject: /hg/icedtea-web: IcedTea-Web is now following XDG .config and .c... Message-ID: changeset 7c75bf721d7c in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7c75bf721d7c author: Jiri Vanek date: Thu Jul 18 08:53:46 2013 +0200 IcedTea-Web is now following XDG .config and .cache specification(RH947647) diffstat: ChangeLog | 38 +- Makefile.am | 23 +- NEWS | 1 + launcher/launchers.in | 11 +- netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 7 +- netx/net/sourceforge/jnlp/config/Defaults.java | 47 +- netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 150 +- netx/net/sourceforge/jnlp/controlpanel/CachePane.java | 3 +- netx/net/sourceforge/jnlp/controlpanel/CommandLine.java | 1 + netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 1 + netx/net/sourceforge/jnlp/runtime/Boot.java | 2 + netx/net/sourceforge/jnlp/util/FileUtils.java | 72 + plugin/icedteanp/java/sun/applet/PluginMain.java | 2 +- tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java | 2 +- tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java | 3 +- tests/reproducers/simple/simpletest1/testcases/XDGspecificationTests.java | 1103 ++++++++++ tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java | 10 +- tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java | 30 +- 18 files changed, 1440 insertions(+), 66 deletions(-) diffs (truncated from 1853 to 500 lines): diff -r fc1923f295cf -r 7c75bf721d7c ChangeLog --- a/ChangeLog Wed Jul 17 18:59:39 2013 +0200 +++ b/ChangeLog Thu Jul 18 08:53:46 2013 +0200 @@ -1,4 +1,40 @@ -2013-07-13 Jiri Vanek +2013-07-18 Jiri Vanek + + IcedTea-Web is now following XDG .config and .cache specification(RH947647) + * tests/reproducers/simple/simpletest1/testcases/XDGspecificationTests.java + new file, test if XDG specification and trasnfer to it are followed correctly, + * NEWS: mentioned new feature + * Makefile.am: (PUBLIC_KEYSTORE) repalced by (PUBLIC_KEYSTORE_STUB) which + is now holding only internal part of path.(exported-test-certs) + (netx-dist-tests-import-cert-to-public) (netx-dist-tests-remove-cert-from-public) + are now resolving XDG variable and setting real path of PUBLIC_KEYSTORE + by resolved value and (PUBLIC_KEYSTORE) + * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: changed to be public + and recently_used strign extracted to (CACHE_INDEX_FILE_NAME) constant + * netx/net/sourceforge/jnlp/config/Defaults.java: is now resovling and + propagating XDG_CONFIG/CACHE_HOME specification. (USER_HOME) repalced by + (USER_CACHE_HOME) and (USER_CONFIG_HOME). + (move14AndOlderFilesTo15Structure) new method responsible for moving + of old data to new locations. (move14AndOlderFilesTo15StructureCatched) + the same but with catch block + * netx/net/sourceforge/jnlp/controlpanel/CachePane.java: + * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java: + * tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java: + are now using (CACHE_INDEX_FILE_NAME) + * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java: (main) + * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: (main) + * netx/net/sourceforge/jnlp/runtime/Boot.java: (main) + * plugin/icedteanp/java/sun/applet/PluginMain.java: (main) + are now calling DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched + asap. + * netx/net/sourceforge/jnlp/util/FileUtils.java: various file manipulation + methods moved inside here from test-extensions - (saveFile) (getContentOfStream) + (loadFileAsString) - to avoid duplications + * tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: for puposes of + new test added constructor with string instead of URL + * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: see FileUtils.java + +2013-07-17 Jiri Vanek About dialogue made accessible from plugin * netx/net/sourceforge/jnlp/about/AboutDialog.java: (frame) re-declared diff -r fc1923f295cf -r 7c75bf721d7c Makefile.am --- a/Makefile.am Wed Jul 17 18:59:39 2013 +0200 +++ b/Makefile.am Thu Jul 18 08:53:46 2013 +0200 @@ -37,7 +37,7 @@ export EXPORTED_TEST_CERT_PREFIX=icedteatests export EXPORTED_TEST_CERT_SUFFIX=crt export TEST_CERT_ALIAS=icedteaweb -export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs +export PUBLIC_KEYSTORE_STUB=icedtea-web/security/trusted.certs export PUBLIC_KEYSTORE_PASS=changeit export SOFTKILLER=softkiller @@ -727,8 +727,13 @@ #with depending to not stamped target we always have to rerun reproducers targets stamps/exported-test-certs.stamp: stamps/change-dots-to-paths.stamp -types=($(SIGNED_REPRODUCERS)) ; \ + PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \ + if test "x$$PUBLIC_KEYSTORE" = x; then \ + PUBLIC_KEYSTORE=${HOME}/.config ; \ + fi ;\ + PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ for which in "$${types[@]}" ; do \ - $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) ; \ + $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \ done ; types=($(SIGNED_REPRODUCERS)) ; \ for which in "$${types[@]}" ; do \ @@ -739,16 +744,26 @@ stamps/netx-dist-tests-import-cert-to-public: stamps/exported-test-certs.stamp types=($(SIGNED_REPRODUCERS)) ; \ + PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \ + if test "x$$PUBLIC_KEYSTORE" = x; then \ + PUBLIC_KEYSTORE=${HOME}/.config ; \ + fi ;\ + PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ for which in "$${types[@]}" ; do \ - yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\ + yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\ done ; mkdir -p stamps && \ touch $@ netx-dist-tests-remove-cert-from-public: -types=($(SIGNED_REPRODUCERS)) ; \ + PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \ + if test "x$$PUBLIC_KEYSTORE" = x; then \ + PUBLIC_KEYSTORE=${HOME}/.config ; \ + fi ;\ + PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ for which in "$${types[@]}" ; do \ - $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) ; \ + $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \ done ; -rm -rf stamps/netx-dist-tests-import-cert-to-public diff -r fc1923f295cf -r 7c75bf721d7c NEWS --- a/NEWS Wed Jul 17 18:59:39 2013 +0200 +++ b/NEWS Thu Jul 18 08:53:46 2013 +0200 @@ -11,6 +11,7 @@ New in release 1.5 (2013-XX-XX): * IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input * JDK older then 1.5 no longer supported +* IcedTea-Web is now following XDG .config and .cache specification(RH947647) * NetX - PR1465 - java.io.FileNotFoundException while trying to download a JAR file - Netx can now parse malformed jnlp files using tagsoup diff -r fc1923f295cf -r 7c75bf721d7c launcher/launchers.in --- a/launcher/launchers.in Wed Jul 17 18:59:39 2013 +0200 +++ b/launcher/launchers.in Thu Jul 18 08:53:46 2013 +0200 @@ -9,9 +9,18 @@ PROGRAM_NAME=@PROGRAM_NAME@ CP=@JRE@/lib/rt.jar +CONFIG_HOME=$XDG_CONFIG_HOME +if [ "x$CONFIG_HOME" = "x" ] ; then + CONFIG_HOME=~/.config +fi; PROPERTY_NAME=deployment.jre.dir CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *" -CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" $CONFIG_HOME/icedtea-web/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +#now check in legacy one +if [ "x$CUSTOM_JRE" = "x" ] ; then + CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +fi; +#now check in global one if [ "x$CUSTOM_JRE" = "x" ] ; then CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` fi; diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Wed Jul 17 18:59:39 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Thu Jul 18 08:53:46 2013 +0200 @@ -62,7 +62,7 @@ * @author Andrew Su (asu at redhat.com, andrew.su at utoronto.ca) * */ -enum CacheLRUWrapper { +public enum CacheLRUWrapper { INSTANCE; private int lockCount = 0; @@ -80,9 +80,10 @@ * accessed) followed by folder of item. value = path to file. */ private PropertiesFile cacheOrder = new PropertiesFile( - new File(cacheDir + File.separator + "recently_used")); + new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME)); + public static final String CACHE_INDEX_FILE_NAME = "recently_used"; - private CacheLRUWrapper(){ + private CacheLRUWrapper() { File f = cacheOrder.getStoreFile(); if (!f.exists()) { try { diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/config/Defaults.java --- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Jul 17 18:59:39 2013 +0200 +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Thu Jul 18 08:53:46 2013 +0200 @@ -51,28 +51,43 @@ * This class stores the default configuration */ public class Defaults { + + final static String SYSTEM_HOME = System.getProperty("java.home"); + final static String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security"; + final static String USER_CONFIG_HOME; + final static String USER_CACHE_HOME; + final static String USER_SECURITY; + final static String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator + + System.getProperty("user.name") + File.separator + "netx" + File.separator + + "locks"; + final static File userFile; + + static { + String configHome = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_CONFIG_DIR; + String cacheHome = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_CACHE_DIR; + String XDG_CONFIG_HOME = System.getenv("XDG_CONFIG_HOME"); + String XDG_CACHE_HOME = System.getenv("XDG_CACHE_HOME"); + if (XDG_CONFIG_HOME != null) { + configHome = XDG_CONFIG_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_SUBDIR_DIR; + } + if (XDG_CACHE_HOME != null) { + cacheHome = XDG_CACHE_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_SUBDIR_DIR; + } + USER_CONFIG_HOME = configHome; + USER_CACHE_HOME = cacheHome; + USER_SECURITY = USER_CONFIG_HOME + File.separator + "security"; + userFile = new File(USER_CONFIG_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_PROPERTIES); + } /** * Get the default settings for deployment */ public static Map> getDefaults() { - File userFile = new File(System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_DIR - + File.separator + DeploymentConfiguration.DEPLOYMENT_PROPERTIES); - SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkRead(userFile.toString()); } - final String SYSTEM_HOME = System.getProperty("java.home"); - final String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security"; - - final String USER_HOME = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_DIR; - final String USER_SECURITY = USER_HOME + File.separator + "security"; - - final String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator - + System.getProperty("user.name") + File.separator + "netx" + File.separator - + "locks"; /* * This is more or less a straight copy from the deployment @@ -90,12 +105,12 @@ { DeploymentConfiguration.KEY_USER_CACHE_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "cache" + USER_CACHE_HOME + File.separator + "cache" }, { DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "pcache" + USER_CACHE_HOME + File.separator + "pcache" }, { DeploymentConfiguration.KEY_SYSTEM_CACHE_DIR, @@ -105,12 +120,12 @@ { DeploymentConfiguration.KEY_USER_LOG_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "log" + USER_CONFIG_HOME + File.separator + "log" }, { DeploymentConfiguration.KEY_USER_TMP_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "tmp" + USER_CACHE_HOME + File.separator + "tmp" }, { DeploymentConfiguration.KEY_USER_LOCKS_DIR, diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java --- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Wed Jul 17 18:59:39 2013 +0200 +++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Jul 18 08:53:46 2013 +0200 @@ -36,6 +36,7 @@ import java.util.Set; import javax.naming.ConfigurationException; +import net.sourceforge.jnlp.cache.CacheLRUWrapper; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.FileUtils; @@ -48,8 +49,10 @@ */ public final class DeploymentConfiguration { - public static final String DEPLOYMENT_DIR = ".icedtea"; - public static final String DEPLOYMENT_CONFIG = "deployment.config"; + public static final String DEPLOYMENT_SUBDIR_DIR = "icedtea-web"; + public static final String DEPLOYMENT_CACHE_DIR = ".cache" + File.separator + DEPLOYMENT_SUBDIR_DIR; + public static final String DEPLOYMENT_CONFIG_DIR = ".config" + File.separator + DEPLOYMENT_SUBDIR_DIR; + public static final String DEPLOYMENT_CONFIG_FILE = "deployment.config"; public static final String DEPLOYMENT_PROPERTIES = "deployment.properties"; public static final String APPLET_TRUST_SETTINGS = ".appletTrustSettings"; @@ -181,8 +184,7 @@ private File userPropertiesFile = null; /*default user file*/ - public static final File USER_DEPLOYMENT_PROPERTIES_FILE = new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_DIR - + File.separator + DEPLOYMENT_PROPERTIES); + public static final File USER_DEPLOYMENT_PROPERTIES_FILE = new File(Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES); /** the current deployment properties */ private Map> currentConfiguration; @@ -206,8 +208,7 @@ } public static File getAppletTrustUserSettingsPath() { - return new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_DIR - + File.separator + APPLET_TRUST_SETTINGS); + return new File(Defaults.USER_CONFIG_HOME + File.separator + APPLET_TRUST_SETTINGS); } public static File getAppletTrustGlobalSettingsPath() { @@ -251,7 +252,7 @@ if (systemConfigFile != null) { if (loadSystemConfiguration(systemConfigFile)) { if (JNLPRuntime.isDebug()) { - System.out.println("System level " + DEPLOYMENT_CONFIG + " is mandatory: " + systemPropertiesMandatory); + System.out.println("System level " + DEPLOYMENT_CONFIG_FILE + " is mandatory: " + systemPropertiesMandatory); } /* Second, read the System level deployment.properties file */ systemProperties = loadProperties(ConfigType.System, systemPropertiesFile, @@ -414,7 +415,7 @@ */ private File findSystemConfigFile() { File etcFile = new File(File.separator + "etc" + File.separator + ".java" + File.separator - + "deployment" + File.separator + DEPLOYMENT_CONFIG); + + "deployment" + File.separator + DEPLOYMENT_CONFIG_FILE); if (etcFile.isFile()) { return etcFile; } @@ -435,10 +436,10 @@ File jreFile; if (jrePath != null) { jreFile = new File(jrePath + File.separator + "lib" - + File.separator + DEPLOYMENT_CONFIG); + + File.separator + DEPLOYMENT_CONFIG_FILE); } else { jreFile = new File(System.getProperty("java.home") + File.separator + "lib" - + File.separator + DEPLOYMENT_CONFIG); + + File.separator + DEPLOYMENT_CONFIG_FILE); } if (jreFile.isFile()) { return jreFile; @@ -681,4 +682,133 @@ + (value.isLocked() ? " [LOCKED]" : "")); } } + + public static void move14AndOlderFilesTo15StructureCatched() { + try { + move14AndOlderFilesTo15Structure(); + } catch (Throwable t) { + System.err.println("Critical error during converting old files to new. Continuing"); + t.printStackTrace(); + } + + } + + private static void move14AndOlderFilesTo15Structure() { + int errors = 0; + String PRE_15_DEPLOYMENT_DIR = ".icedtea"; + String LEGACY_USER_HOME = System.getProperty("user.home") + File.separator + PRE_15_DEPLOYMENT_DIR; + File legacyUserDir = new File(LEGACY_USER_HOME); + if (legacyUserDir.exists()) { + System.out.println("Legacy configuration and cache found. Those will be now transported to new locations"); + System.out.println(Defaults.USER_CONFIG_HOME + " and " + Defaults.USER_CACHE_HOME); + System.out.println("You should not see this message next time you run icedtea-web!"); + System.out.println("Your custom dirs will not be touched and will work"); + System.out.println("-----------------------------------------------"); + + System.out.println("Preparing new directories:"); + System.out.println(" " + Defaults.USER_CONFIG_HOME); + File f1 = new File(Defaults.USER_CONFIG_HOME); + errors += resultToStd(f1.mkdirs()); + System.out.println(" " + Defaults.USER_CACHE_HOME); + File f2 = new File(Defaults.USER_CACHE_HOME); + errors += resultToStd(f2.mkdirs()); + + String legacySecurity = LEGACY_USER_HOME + File.separator + "security"; + String currentSecurity = Defaults.USER_SECURITY; + errors += moveLegacyToCurrent(legacySecurity, currentSecurity); + + String legacyCache = LEGACY_USER_HOME + File.separator + "cache"; + String currentCache = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_CACHE_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyCache, currentCache); + System.out.println("Adapting " + CacheLRUWrapper.CACHE_INDEX_FILE_NAME + " to new destination"); + //replace all legacyCache by currentCache in new recently_used + try { + File f = new File(currentCache, CacheLRUWrapper.CACHE_INDEX_FILE_NAME); + String s = FileUtils.loadFileAsString(f); + s = s.replace(legacyCache, currentCache); + FileUtils.saveFile(s, f); + } catch (IOException ex) { + ex.printStackTrace(); + errors++; + } + + String legacyPcahceDir = LEGACY_USER_HOME + File.separator + "pcache"; + String currentPcacheDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyPcahceDir, currentPcacheDir); + + String legacyLogDir = LEGACY_USER_HOME + File.separator + "log"; + String currentLogDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_LOG_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyLogDir, currentLogDir); + + String legacyProperties = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES; + String currentProperties = Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES; + errors += moveLegacyToCurrent(legacyProperties, currentProperties); + + String legacyPropertiesOld = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES + ".old"; + String currentPropertiesOld = Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES + ".old"; + errors += moveLegacyToCurrent(legacyPropertiesOld, currentPropertiesOld); + + + String legacyAppletTrust = LEGACY_USER_HOME + File.separator + APPLET_TRUST_SETTINGS; + String currentAppletTrust = getAppletTrustUserSettingsPath().getAbsolutePath(); + errors += moveLegacyToCurrent(legacyAppletTrust, currentAppletTrust); + + String legacyTmp = LEGACY_USER_HOME + File.separator + "tmp"; + String currentTmp = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_TMP_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyTmp, currentTmp); + + System.out.println("Removing now empty " + LEGACY_USER_HOME); + errors += resultToStd(legacyUserDir.delete()); + + if (errors != 0) { + System.out.println("There occureed " + errors + " errors"); + System.out.println("Please double check content of old data in " + LEGACY_USER_HOME + " with "); + System.out.println("new " + Defaults.USER_CONFIG_HOME + " and " + Defaults.USER_CACHE_HOME); + System.out.println("To disable this check again, please remove " + LEGACY_USER_HOME); + } + + } else { + if (JNLPRuntime.isDebug()) { + System.out.println("System is already following XDG .cache and .config specifications"); + try { + System.out.println("config: " + Defaults.USER_CONFIG_HOME + " file exists: " + new File(Defaults.USER_CONFIG_HOME).exists()); + } catch (Exception ex) { + ex.printStackTrace(); + } + try { + System.out.println("cache: " + Defaults.USER_CACHE_HOME + " file exists:" + new File(Defaults.USER_CACHE_HOME)); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + } + + } + + private static int moveLegacyToCurrent(String legacy, String current) { + System.out.println("Moving " + legacy + " to " + current); + File cf = new File(current); + File old = new File(legacy); + if (cf.exists()) { + System.out.println("Warning! Destination " + current + " exists!"); + } + if (old.exists()) { + boolean moved = old.renameTo(cf); + return resultToStd(moved); + } else { + System.out.println("Source " + legacy + " do not exists, nothing to do"); + return 0; + } + + } + + private static int resultToStd(boolean securityMove) { + if (securityMove) { + System.out.println("OK"); + return 0; + } else { + System.out.println("ERROR"); + return 1; + } + } } diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/controlpanel/CachePane.java --- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Wed Jul 17 18:59:39 2013 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Thu Jul 18 08:53:46 2013 +0200 @@ -49,6 +49,7 @@ import javax.swing.table.TableRowSorter; import net.sourceforge.jnlp.cache.CacheDirectory; +import net.sourceforge.jnlp.cache.CacheLRUWrapper; import net.sourceforge.jnlp.cache.DirectoryNode; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; @@ -202,7 +203,7 @@ } private void updateRecentlyUsed(File f) { - File recentlyUsedFile = new File(location + File.separator + "recently_used"); + File recentlyUsedFile = new File(location + File.separator + CacheLRUWrapper.CACHE_INDEX_FILE_NAME); PropertiesFile pf = new PropertiesFile(recentlyUsedFile); pf.load(); Enumeration en = pf.keys(); diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/controlpanel/CommandLine.java --- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Wed Jul 17 18:59:39 2013 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Thu Jul 18 08:53:46 2013 +0200 @@ -453,6 +453,7 @@ * @param args the command line arguments to this program */ public static void main(String[] args) throws Exception { + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); if (args.length == 0) { ControlPanel.main(new String[] {}); } else { diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Wed Jul 17 18:59:39 2013 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Thu Jul 18 08:53:46 2013 +0200 @@ -399,6 +399,7 @@ } public static void main(String[] args) throws Exception { + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); final DeploymentConfiguration config = new DeploymentConfiguration(); try { config.load(); From jvanek at redhat.com Thu Jul 18 00:01:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 18 Jul 2013 09:01:00 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <51E43B0A.7090001@redhat.com> References: <51E00CFF.3070301@redhat.com> <51E01C1F.4050707@redhat.com> <51E01FE5.2080900@redhat.com> <51E1382A.5010303@redhat.com> <51E43B0A.7090001@redhat.com> Message-ID: <51E792AC.8040601@redhat.com> On 07/15/2013 08:10 PM, Andrew Azores wrote: > On 07/13/2013 07:21 AM, Jiri Vanek wrote: >> On 07/12/2013 05:25 PM, Jiri Vanek wrote: >>> On 07/12/2013 05:09 PM, Andrew Azores wrote: >>>> On 07/12/2013 10:04 AM, Jiri Vanek wrote: >>>>> Attempt two :) >>>>> >>>>> Well this test nearly cost me my sanity (not that there is to much left but...) but here it is >>>>> again. >>>>> >>>>> As Omair have signed himself off this review (after saying that by concept it is ok) this patch is >>>>> looking for volunteer. >>>>> >>>>> J. >>>> >>>> All looks good to me other than a couple style nitpicks, but nothing important. Just things like >>>> missing spaces around + when concatenating strings, hardly worth changing :) I think this looks >>>> pretty good as it is. >>>> >>>> I tried to apply the patches in my VM with latest ITW - the tests patch succeeded (as expected >>>> since >>>> it's just file additions), but the other patch just about entirely failed :( I used hg patch -f >>>> --no-commit for this. I tried to use the "patch" command but it complained about a malformed line, >>>> so maybe I was just not using it correctly. Not sure what that's about, hopefully it's just a >>>> problem on my end though and won't result in some merge conflict! >>>> >>>> Andrew A >>> >>> aargh, yah, I have not updated underlying repo. >>> >>> I will post new patch on top of head and with proper reformatting. >>> >>> Tahnx for check! >>> >>> J. >>> >> >> here we go! >> (note changelog and neews added to patch) >> >> Thanx, J. >> > This one looks good to me! Thanx for check! pushed (as you probably noted also with plugin/itw-seetings "about" tweeks and de/pl about localisation. ps: two issues avoid your eye (and I just luckily stumbled across them today) : + server.LOGS_REPRINT = true - this is not allowed to be pushed. It is good for debugging only. But you have no-how to know this. +import org.mozilla.javascript.edu.emory.mathcs.backport.java.util.Arrays; - this import have somehow sneaked inside instead of java.util.Arrays. It was actually breaking the build! So .. never trust the one who is sending the patch, no matter how convincing he is :) Thanx again! J. From ptisnovs at icedtea.classpath.org Thu Jul 18 01:21:43 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 18 Jul 2013 08:21:43 +0000 Subject: /hg/gfx-test: Added two helper methods used by bitblt-based tests. Message-ID: changeset e1575e9881b7 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e1575e9881b7 author: Pavel Tisnovsky date: Thu Jul 18 10:25:25 2013 +0200 Added two helper methods used by bitblt-based tests. Six new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 7 + src/org/gfxtest/framework/CommonBitmapOperations.java | 52 ++++++++++ src/org/gfxtest/testsuites/BitBltBasicTests.java | 91 +++++++++++++++++++ 3 files changed, 150 insertions(+), 0 deletions(-) diffs (184 lines): diff -r 94f7f4c423e6 -r e1575e9881b7 ChangeLog --- a/ChangeLog Wed Jul 17 10:44:27 2013 +0200 +++ b/ChangeLog Thu Jul 18 10:25:25 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-18 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + Added two helper methods used by bitblt-based tests. + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Six new tests added into BitBltBasicTests test suite. + 2013-07-17 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltRescaleOp.java: diff -r 94f7f4c423e6 -r e1575e9881b7 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Wed Jul 17 10:44:27 2013 +0200 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Thu Jul 18 10:25:25 2013 +0200 @@ -673,6 +673,32 @@ /** * Create new buffered image containing grid pattern and then perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param bgcolor + * background color + */ + public static TestResult doBitBltTestWithGridImage(TestImage image, Graphics2D graphics2d, int imageType, Color bgcolor) + { + // create new buffered bitmap with given type + // bitmap should be empty - solid color pixels + BufferedImage bufferedImage = ImageFactory.createGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, bgcolor) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing grid pattern and then perform basic BitBlt test. * * @param image * image to which another image is to be drawn @@ -810,6 +836,32 @@ /** * Create new buffered image containing diagonal grid pattern and then perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param bgcolor + * background color + */ + public static TestResult doBitBltTestWithDiagonalGridImage(TestImage image, Graphics2D graphics2d, int imageType, Color bgcolor) + { + // create new buffered bitmap with given type + // bitmap should be empty - solid color pixels + BufferedImage bufferedImage = ImageFactory.createDiagonalGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, bgcolor) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing diagonal grid pattern and then perform basic BitBlt test. * * @param image * image to which another image is to be drawn diff -r 94f7f4c423e6 -r e1575e9881b7 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jul 17 10:44:27 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Jul 18 10:25:25 2013 +0200 @@ -4853,6 +4853,97 @@ } /** + * Test basic BitBlt operation for vertical magenta gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Jul 18 01:45:56 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 18 Jul 2013 08:45:56 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset c79c8334729c in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c79c8334729c author: Pavel Tisnovsky date: Thu Jul 18 10:49:36 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into InvocableClassTest. diffstat: ChangeLog | 7 +++++ src/org/RhinoTests/InvocableClassTest.java | 40 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diffs (87 lines): diff -r 7447f9e8eb91 -r c79c8334729c ChangeLog --- a/ChangeLog Wed Jul 17 10:59:30 2013 +0200 +++ b/ChangeLog Thu Jul 18 10:49:36 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-18 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into InvocableClassTest. + 2013-07-17 Pavel Tisnovsky * src/org/RhinoTests/CompilableClassTest.java: diff -r 7447f9e8eb91 -r c79c8334729c src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Wed Jul 17 10:59:30 2013 +0200 +++ b/src/org/RhinoTests/InvocableClassTest.java Thu Jul 18 10:49:36 2013 +0200 @@ -52,9 +52,13 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.Invocable; +import javax.script.Invocable; import javax.script.ScriptEngineManager; +import javax.script.ScriptEngine; @@ -818,12 +822,15 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -978,6 +985,39 @@ } /** + * Test for method javax.script.Invocable.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.invocableClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.Invocable.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.invocableClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.Invocable.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.invocableClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.Invocable.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.invocableClass.desiredAssertionStatus(), + "Method Invocable.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.Invocable */ @SuppressWarnings("cast") From gitne at excite.co.jp Thu Jul 18 06:20:45 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 18 Jul 2013 22:20:45 +0900 Subject: =?ISO-2022-JP?B?UmU6IC9oZy9pY2VkdGVhLXdlYjogMyBuZXcgY2hhbmdlc2V0cw==?= Message-ID: <201307181320.r6IDKjFS009926@mail-web03.excite.co.jp> wrote: [...] > diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_cs.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Fri Jul 12 15:47:04 2013 -0400 > +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Wed Jul 17 18:59:39 2013 +0200 > @@ -278,7 +278,6 @@ > CVUser=Uu017eivatel > CVSystem=Systu00e9m > > -#KeyStores: see KeyStores.java > KS=u00dalou017eiu0161tu011b klu00edu010du016f > KSCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty > KSJsseCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty JSSE Err, you have missed to add # about dialogue AboutDialogueTabAbout AboutDialogueTabAuthors AboutDialogueTabChangelog AboutDialogueTabNews AboutDialogueTabGPLv2 to Messages_cs.properties. Regards, Jacob From jvanek at redhat.com Thu Jul 18 06:56:57 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 18 Jul 2013 15:56:57 +0200 Subject: /hg/icedtea-web: 3 new changesets In-Reply-To: <201307181320.r6IDKjFS009926@mail-web03.excite.co.jp> References: <201307181320.r6IDKjFS009926@mail-web03.excite.co.jp> Message-ID: <51E7F429.8040400@redhat.com> On 07/18/2013 03:20 PM, Jacob Wisor wrote: > wrote: > [...] >> diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_cs.properties >> --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Fri Jul 12 15:47:04 2013 -0400 >> +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Wed Jul 17 18:59:39 2013 +0200 >> @@ -278,7 +278,6 @@ >> CVUser=Uu017eivatel >> CVSystem=Systu00e9m >> >> -#KeyStores: see KeyStores.java >> KS=u00dalou017eiu0161tu011b klu00edu010du016f >> KSCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty >> KSJsseCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty JSSE > > Err, you have missed to add > It was not by mistake. I'm rather when there is at least one more native speaker who can check. So I will propose later or will wait for Alexander. Thanx for check! J. > > # about dialogue > AboutDialogueTabAbout > AboutDialogueTabAuthors > AboutDialogueTabChangelog > AboutDialogueTabNews > AboutDialogueTabGPLv2 > > to Messages_cs.properties. > > Regards, > Jacob From bugzilla-daemon at icedtea.classpath.org Thu Jul 18 08:07:59 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 18 Jul 2013 15:07:59 +0000 Subject: [Bug 1499] New: SIGSEV crash using jstock libdbus-1.so.3+0x287c0 outside VM Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1499 Bug ID: 1499 Summary: SIGSEV crash using jstock libdbus-1.so.3+0x287c0 outside VM Classification: Unclassified Product: IcedTea Version: 6-1.12.5 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: dave at bdisystems.co.uk CC: unassigned at icedtea.classpath.org Created attachment 909 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=909&action=edit error report When trying to run jstock.sh from http://jstock.sourceforge.net/ # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f74c8fae7c0, pid=7038, tid=140139401783040 # # JRE version: 6.0_27-b27 # Java VM: OpenJDK 64-Bit Server VM (20.0-b12 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.12.5 # Distribution: Debian GNU/Linux 7.0 (wheezy), package 6b27-1.12.5-1 # Problematic frame: # C [libdbus-1.so.3+0x287c0] dbus_watch_handle+0x1b60 # # An error report file with more information is saved as: # /home/dave/Downloads/jstock/hs_err_pid7038.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # ./Downloads/jstock/jstock.sh: line 47: 7038 Aborted $_JAVA_EXEC $_VMOPTIONS -jar jstock.jar -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130718/31d861a0/attachment.html From andrew at icedtea.classpath.org Thu Jul 18 12:04:02 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 18 Jul 2013 19:04:02 +0000 Subject: /hg/icedtea6: Update to the version of hs23 which includes the A... Message-ID: changeset 8da02dd9a76d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8da02dd9a76d author: Andrew John Hughes date: Thu Jul 18 20:03:43 2013 +0100 Update to the version of hs23 which includes the ARM32 port. 2013-07-18 Andrew John Hughes * patches/hotspot/hs23/arm-hsdis.patch: Removed. * Makefile.am: (ICEDTEA_PATCHES): Only apply original arm-hsdis patch. * hotspot.map: Update to latest HotSpot from 2.3.x forest, which contains the ARM32 port. diffstat: ChangeLog | 11 +++++ Makefile.am | 4 +- hotspot.map | 2 +- patches/hotspot/hs23/arm-hsdis.patch | 72 ------------------------------------ 4 files changed, 14 insertions(+), 75 deletions(-) diffs (122 lines): diff -r 5cba6fc13701 -r 8da02dd9a76d ChangeLog --- a/ChangeLog Wed Jul 17 11:54:43 2013 -0400 +++ b/ChangeLog Thu Jul 18 20:03:43 2013 +0100 @@ -1,3 +1,14 @@ +2013-07-18 Andrew John Hughes + + * patches/hotspot/hs23/arm-hsdis.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Only apply original + arm-hsdis patch. + * hotspot.map: Update to latest HotSpot + from 2.3.x forest, which contains the ARM32 + port. + 2013-07-17 Omair Majid * patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in diff -r 5cba6fc13701 -r 8da02dd9a76d Makefile.am --- a/Makefile.am Wed Jul 17 11:54:43 2013 -0400 +++ b/Makefile.am Thu Jul 18 20:03:43 2013 +0100 @@ -603,7 +603,6 @@ patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ - patches/hotspot/$(HSBUILD)/arm-hsdis.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ @@ -751,7 +750,8 @@ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ patches/hotspot/original/aarch64.patch \ - patches/hotspot/original/7022999-fastlocking_compiler1_only.patch + patches/hotspot/original/7022999-fastlocking_compiler1_only.patch \ + patches/hotspot/original/arm-hsdis.patch endif if WITH_RHINO diff -r 5cba6fc13701 -r 8da02dd9a76d hotspot.map --- a/hotspot.map Wed Jul 17 11:54:43 2013 -0400 +++ b/hotspot.map Thu Jul 18 20:03:43 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0 +hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305 diff -r 5cba6fc13701 -r 8da02dd9a76d patches/hotspot/hs23/arm-hsdis.patch --- a/patches/hotspot/hs23/arm-hsdis.patch Wed Jul 17 11:54:43 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c ---- openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-11 23:08:47.000000000 +0000 -+++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-14 18:06:25.372022803 +0000 -@@ -35,6 +35,8 @@ - #include - #include - -+#include -+ - #ifndef bool - #define bool int - #define true 1 -@@ -356,7 +358,7 @@ - if (plen > mach_size) plen = mach_size; - strncpy(mach_option, p, plen); - mach_option[plen] = '\0'; -- } else if (plen > 6 && strncmp(p, "hsdis-", 6) == 0) { -+ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) { - // do not pass these to the next level - } else { - /* just copy it; {i386,sparc}-dis.c might like to see it */ -@@ -418,6 +420,9 @@ - #ifdef LIBARCH_sparcv9 - res = "sparc:v9b"; - #endif -+#ifdef LIBARCH_arm -+ res = "arm"; -+#endif - if (res == NULL) - res = "architecture not set in Makefile!"; - return res; -diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile ---- openjdk.orig/hotspot/src/share/tools/hsdis/Makefile 2013-02-11 23:08:47.000000000 +0000 -+++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2013-02-14 18:05:21.514998150 +0000 -@@ -68,14 +68,18 @@ - CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) - else - CPU = $(shell uname -m) -+ifneq ($(findstring arm,$(CPU)),) -+ARCH=arm -+else - ARCH1=$(CPU:x86_64=amd64) - ARCH=$(ARCH1:i686=i386) - CFLAGS/i386 += -m32 - CFLAGS/sparc += -m32 - CFLAGS/sparcv9 += -m64 - CFLAGS/amd64 += -m64 -+endif - CFLAGS += $(CFLAGS/$(ARCH)) --CFLAGS += -fPIC -+CFLAGS += -fPIC -g - OS = linux - LIB_EXT = .so - CC = gcc -@@ -118,7 +122,7 @@ - BINUTILSDIR = $(shell cd $(BINUTILS);pwd) - endif - --CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd -+CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd - CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" - - TARGET_DIR = build/$(OS)-$(JDKARCH) -@@ -145,7 +149,7 @@ - demo: $(TARGET) $(DEMO_TARGET) - - $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile -- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi -+ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi - - $(TARGET_DIR)/Makefile: - (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) From bugzilla-daemon at icedtea.classpath.org Thu Jul 18 12:31:09 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 18 Jul 2013 19:31:09 +0000 Subject: [Bug 1482] Log4j fails when JNLP is remote, works when local In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1482 --- Comment #2 from Andrew Azores --- I'm unable to reproduce this NoSuchMethodError using PropertyConfigurator.configure(). My test case is a JAR with the log4j.jar packed inside it as well, and both my local and remote JNLP launches work and produce the same output. Could you give more details on how to reproduce this error? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130718/ac85ac7b/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jul 18 15:29:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 18 Jul 2013 22:29:25 +0000 Subject: [Bug 1395] Bug javaws.itweb / icedtea with JNLP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1395 --- Comment #3 from Sachin Garg --- (In reply to comment #2) Iced Tea Version: icedtea-web 1.4 Distribution: Arch Linux Linux 3.9.9-1-ARCH x86_64 GNU/Linux Hopefully this will help track down the issue. Thanks. > (In reply to comment #1) > > Similar issue with the PDFScissors JNLP (downloaded from > > http://www.pdfscissors.com/) > > > > $ javaws pdfscissors-offline.jnlp > > Exception in thread "main" java.lang.NullPointerException > > at javax.swing.SwingUtilities.appContextGet(SwingUtilities.java:1857) > > at > > javax.swing.SwingUtilities.getSharedOwnerFrame(SwingUtilities.java:1827) > > at javax.swing.JWindow.(JWindow.java:185) > > at javax.swing.JWindow.(JWindow.java:137) > > at > > net.sourceforge.jnlp.runtime.JNLPSecurityManager.(JNLPSecurityManager. > > java:121) > > at > > net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:232) > > at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:181) > > at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:51) > > at java.security.AccessController.doPrivileged(Native Method) > > at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:172) > > This looks like Bug ID 1492/1495 again. What version of IcedTea-Web do you > have installed and which distribution are you running? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130718/c1609ce8/attachment.html From michael.traut at gmail.com Thu Jul 18 23:48:13 2013 From: michael.traut at gmail.com (Michael Traut) Date: Fri, 19 Jul 2013 08:48:13 +0200 Subject: Alternate smartcardio provider Message-ID: As suggested by "helpcrypto", this is a cross post from muscle mailing list... If someone is interested... Our initial release for a PC/SC binding and an alternate javax.smartcardio provider is now included in https://github.com/intarsys/smartcard-io/. For the smartcardio implementation itself we have the following state: * Intended differences ** dedicated PCSC context for terminals, terminal and card (true concurrency) ** waitForChange(timeout) semantics improved(?), state change is reset even in case of timeout ** reader insertion is handled, too ** no finalizer for card! * Open design questions ** "exclusive" card access is NOT restricted to a Java thread. We found no technical reason for this constraint. imho this makes handling of shared and pooled resources ugly. Next to "Only one PSCS context" this would be my top level reason *not* to use smartcardio. Any opinions? ** "connect" always returns the identical {@link Card} object. This is why? This implementation currently opens a new shared connection. If we revert to the spec, i'd at least expect some kind of reference counting. Opinions? * Todos ** no channel support yet ** implement "GET RESPONSE" ** no permission checks so far ** review exceptions to be standard compliant (IllegalStateException) We'd be happy if someone around wants to use and verify the lib in their own project (as we do not rely on smartcardio...) Regards, Michael Traut -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130719/50af9fae/attachment.html From ptisnovs at icedtea.classpath.org Fri Jul 19 02:03:12 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 19 Jul 2013 09:03:12 +0000 Subject: /hg/gfx-test: Created new test suite containing common methods u... Message-ID: changeset 2832ec70cb82 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2832ec70cb82 author: Pavel Tisnovsky date: Fri Jul 19 11:06:54 2013 +0200 Created new test suite containing common methods used by more specialized tests. Refactoring. Minor fixing - typos etc. diffstat: ChangeLog | 10 + src/org/gfxtest/testsuites/BitBltAffineTransformOp.java | 10 +- src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 209 ++++++++++++++++ src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java | 166 ++++++------ 4 files changed, 307 insertions(+), 88 deletions(-) diffs (truncated from 1028 to 500 lines): diff -r e1575e9881b7 -r 2832ec70cb82 ChangeLog --- a/ChangeLog Thu Jul 18 10:25:25 2013 +0200 +++ b/ChangeLog Fri Jul 19 11:06:54 2013 +0200 @@ -1,3 +1,13 @@ +2013-07-19 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Created new test suite containing common methods used by more + specialized tests. + * src/org/gfxtest/testsuites/BitBltAffineTransformOp.java: + Refactoring. + * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: + Minor fixing - typos etc. + 2013-07-18 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r e1575e9881b7 -r 2832ec70cb82 src/org/gfxtest/testsuites/BitBltAffineTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Thu Jul 18 10:25:25 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Fri Jul 19 11:06:54 2013 +0200 @@ -91,7 +91,7 @@ * selected raster operation * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + protected TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) { return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); @@ -109,7 +109,7 @@ * selected raster operation * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + protected TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) { return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); @@ -127,7 +127,7 @@ * selected raster operation * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + protected TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) { return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); @@ -145,7 +145,7 @@ * selected raster operation * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + protected TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) { return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); @@ -163,7 +163,7 @@ * selected raster operation * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + protected TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) { return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); diff -r e1575e9881b7 -r 2832ec70cb82 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Fri Jul 19 11:06:54 2013 +0200 @@ -0,0 +1,209 @@ +/* + Java gfx-test framework + + Copyright (C) 2012, 2013 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.testsuites; + +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.awt.image.BufferedImageOp; + + + +import org.gfxtest.framework.CommonBitmapOperations; +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.TestImage; +import org.gfxtest.framework.TestResult; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.VARIOUS) + at Zoom(1) +public class BitBltBufferedImageOp extends GfxTest +{ + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing checker pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing diagonal checker pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing grid pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing diagonal grid pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing horizontal stripes pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltHorizontalStripesBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalStripesImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltBufferedImageOp().runTestSuite(args); + } + +} diff -r e1575e9881b7 -r 2832ec70cb82 src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Thu Jul 18 10:25:25 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Fri Jul 19 11:06:54 2013 +0200 @@ -85,7 +85,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_RGB * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -105,7 +105,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -125,7 +125,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_PRE * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -145,7 +145,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -165,7 +165,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -185,7 +185,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -205,7 +205,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -225,7 +225,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -245,7 +245,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -265,7 +265,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -285,7 +285,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -305,7 +305,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -325,7 +325,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -362,7 +362,7 @@ * Background color is set to Color.black. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -377,7 +377,7 @@ * Background color is set to Color.black. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -392,7 +392,7 @@ * Background color is set to Color.black. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -407,7 +407,7 @@ * Background color is set to Color.black. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -422,7 +422,7 @@ * Background color is set to Color.black. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -437,7 +437,7 @@ * Background color is set to Color.red. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -452,7 +452,7 @@ * Background color is set to Color.red. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -467,7 +467,7 @@ * Background color is set to Color.red. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -482,7 +482,7 @@ * Background color is set to Color.red. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -497,7 +497,7 @@ * Background color is set to Color.red. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -512,7 +512,7 @@ * Background color is set to Color.green. * * @param image - * image to used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -527,7 +527,7 @@ * Background color is set to Color.green. * From ptisnovs at icedtea.classpath.org Fri Jul 19 02:51:53 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 19 Jul 2013 09:51:53 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset ff7b6005f5fb in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=ff7b6005f5fb author: Pavel Tisnovsky date: Fri Jul 19 11:55:36 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into InvocableClassTest. diffstat: ChangeLog | 6 +++ src/org/RhinoTests/InvocableClassTest.java | 54 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diffs (77 lines): diff -r c79c8334729c -r ff7b6005f5fb ChangeLog --- a/ChangeLog Thu Jul 18 10:49:36 2013 +0200 +++ b/ChangeLog Fri Jul 19 11:55:36 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-19 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into InvocableClassTest. + 2013-07-18 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r c79c8334729c -r ff7b6005f5fb src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Thu Jul 18 10:49:36 2013 +0200 +++ b/src/org/RhinoTests/InvocableClassTest.java Fri Jul 19 11:55:36 2013 +0200 @@ -985,6 +985,60 @@ } /** + * Test for method javax.script.Invocable.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.invocableClass.getGenericSuperclass(); + assertNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.Invocable.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // get the right array of field signatures + String[] genericInterfaceNames = null; + switch (getJavaVersion()) { + case 6: + genericInterfaceNames = genericInterfaceNames_jdk6; + break; + case 7: + genericInterfaceNames = genericInterfaceNames_jdk7; + break; + case 8: + genericInterfaceNames = genericInterfaceNames_jdk8; + break; + } + + // get all generic interfaces + Type[] genericInterfaces = this.invocableClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length); + + // and transform the array into a list of field names + List interfacesAsString = new ArrayList(); + for (Type genericInterface : genericInterfaces) { + interfacesAsString.add(genericInterface.toString()); + } + + // check if all required interfaces really exists + for (String interfaceThatShouldExists : genericInterfaceNames) { + assertTrue(interfacesAsString.contains(interfaceThatShouldExists), + "interface " + interfaceThatShouldExists + " not found"); + } + } + + /** * Test for method javax.script.Invocable.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From bugzilla-daemon at icedtea.classpath.org Fri Jul 19 05:23:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 19 Jul 2013 12:23:30 +0000 Subject: [Bug 1395] Bug javaws.itweb / icedtea with JNLP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1395 --- Comment #4 from Andrew Azores --- (In reply to comment #3) > (In reply to comment #2) > > Iced Tea Version: icedtea-web 1.4 > Distribution: Arch Linux > Linux 3.9.9-1-ARCH x86_64 GNU/Linux > > Hopefully this will help track down the issue. > > Thanks. Please check for an update to the IcedTea-Web package, an update was released recently which should address this issue. See here: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1495 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130719/93abb238/attachment.html From aazores at redhat.com Fri Jul 19 12:55:31 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 19 Jul 2013 15:55:31 -0400 Subject: [rfc][icedtea-web] RH982558 - proxy PAC support does not work Message-ID: <51E999B3.3010703@redhat.com> Changelog: * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java (getProxiesWithoutCaching): added read property permission for java.vm.name Proxy PAC wasn't working in Fedora 19 because Rhino initialization was being stopped due to missing read permission on java.vm.name property. Since Rhino couldn't start, the PAC file wasn't parsed, and the proxy setting fell back to direct connect. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: paceval.patch Type: text/x-patch Size: 1007 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130719/406e8bb4/paceval.patch From omajid at redhat.com Fri Jul 19 13:05:01 2013 From: omajid at redhat.com (Omair Majid) Date: Fri, 19 Jul 2013 16:05:01 -0400 Subject: [rfc][icedtea-web] RH982558 - proxy PAC support does not work In-Reply-To: <51E999B3.3010703@redhat.com> References: <51E999B3.3010703@redhat.com> Message-ID: <51E99BED.1070705@redhat.com> On 07/19/2013 03:55 PM, Andrew Azores wrote: > Changelog: > * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java > (getProxiesWithoutCaching): added read property permission for java.vm.name > > Proxy PAC wasn't working in Fedora 19 because Rhino initialization was > being stopped due to missing read permission on java.vm.name property. > Since Rhino couldn't start, the PAC file wasn't parsed, and the proxy > setting fell back to direct connect. Thanks for looking into this. Read permissions for accessing this property is actually listed in $JAVA_HOME/jre/lib/security/policy.java, but it's just that we have always ignored that file. Looks like old(er) versions of rhino didn't actually use the property. > Permissions p = new Permissions(); Please add a comment here (probably just before we allocate the permissions object) that explains that we do not parse java.policy intentionally since we really do not want this remote code to do much of anything, other than evaluate a value. > p.add(new RuntimePermission("accessClassInPackage.org.mozilla.javascript")); > p.add(new SocketPermission("*", "resolve")); > + p.add(new PropertyPermission("java.vm.name", "read")); > ProtectionDomain pd = new ProtectionDomain(null, p); > AccessControlContext context = new AccessControlContext(new ProtectionDomain[] { pd }); Feel free to push with the addition of a comment. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at redhat.com Sat Jul 20 06:54:16 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 20 Jul 2013 15:54:16 +0200 Subject: [rfc][icedtea-web] RH982558 - proxy PAC support does not work In-Reply-To: <51E999B3.3010703@redhat.com> References: <51E999B3.3010703@redhat.com> Message-ID: <51EA9688.2030608@redhat.com> On 07/19/2013 09:55 PM, Andrew Azores wrote: > Changelog: > * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java (getProxiesWithoutCaching): added read property permission for java.vm.name > > Proxy PAC wasn't working in Fedora 19 because Rhino initialization was being stopped due to missing read permission on java.vm.name property. Since Rhino couldn't start, the PAC file wasn't parsed, and the proxy setting fell back to direct connect. > > Andrew A This looks surprisingly simply.... I was in temptation to share somehow the Permissions from SecurityDesc. Unless you think it is good idea to share whole, or some pars of permissions then I'm ok for head. I guess this is necessary also for 1.4? J. From ptisnovs at icedtea.classpath.org Mon Jul 22 01:00:31 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 22 Jul 2013 08:00:31 +0000 Subject: /hg/gfx-test: Test BitBltConvolveOp now extend BitBltBufferedIma... Message-ID: changeset 865e71729bdf in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=865e71729bdf author: Pavel Tisnovsky date: Mon Jul 22 10:04:10 2013 +0200 Test BitBltConvolveOp now extend BitBltBufferedImageOp, all related methods are now in the super class (refactoring only). BitBltAffineQuadrantRotateTransformOp, BitBltAffineRotateTransformOp, BitBltAffineScaleTransformOp, BitBltAffineShearTransformOp, BitBltAffineTransformOp, BitBltAffineTranslateTransformOp: That classes now extend BitBltAffineTransformOp, not GfxTest directly. diffstat: ChangeLog | 13 + src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 3 +- src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java | 3 +- src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java | 3 +- src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java | 3 +- src/org/gfxtest/testsuites/BitBltAffineTransformOp.java | 192 +--------- src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java | 3 +- src/org/gfxtest/testsuites/BitBltConvolveOp.java | 113 +----- 8 files changed, 21 insertions(+), 312 deletions(-) diffs (479 lines): diff -r 2832ec70cb82 -r 865e71729bdf ChangeLog --- a/ChangeLog Fri Jul 19 11:06:54 2013 +0200 +++ b/ChangeLog Mon Jul 22 10:04:10 2013 +0200 @@ -1,3 +1,16 @@ +2013-07-22 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java: + That classes now extend BitBltAffineTransformOp, not GfxTest directly. + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + That test now extend BitBltBufferedImageOp, all related methods are + now in the super class (refactoring only). + 2013-07-19 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -40,7 +40,6 @@ package org.gfxtest.testsuites; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -61,7 +60,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.ROTATION) @Zoom(1) -public class BitBltAffineQuadrantRotateTransformOp extends GfxTest +public class BitBltAffineQuadrantRotateTransformOp extends BitBltAffineTransformOp { /** * Entry point to the test suite. diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -40,7 +40,6 @@ package org.gfxtest.testsuites; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -61,7 +60,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.ROTATION) @Zoom(1) -public class BitBltAffineRotateTransformOp extends GfxTest +public class BitBltAffineRotateTransformOp extends BitBltAffineTransformOp { /** * Entry point to the test suite. diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -40,7 +40,6 @@ package org.gfxtest.testsuites; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -61,7 +60,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.SCALE) @Zoom(1) -public class BitBltAffineScaleTransformOp extends GfxTest +public class BitBltAffineScaleTransformOp extends BitBltAffineTransformOp { /** * Entry point to the test suite. diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -40,7 +40,6 @@ package org.gfxtest.testsuites; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -61,7 +60,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.SKEW) @Zoom(1) -public class BitBltAffineShearTransformOp extends GfxTest +public class BitBltAffineShearTransformOp extends BitBltAffineTransformOp { /** * Entry point to the test suite. diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -40,18 +40,6 @@ package org.gfxtest.testsuites; -import java.awt.Graphics2D; -import java.awt.geom.AffineTransform; -import java.awt.image.AffineTransformOp; -import java.awt.image.BufferedImage; -import java.awt.image.BufferedImageOp; - - - -import org.gfxtest.framework.CommonBitmapOperations; -import org.gfxtest.framework.GfxTest; -import org.gfxtest.framework.TestImage; -import org.gfxtest.framework.TestResult; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -72,186 +60,8 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.VARIOUS) @Zoom(1) -public class BitBltAffineTransformOp extends GfxTest +public class BitBltAffineTransformOp extends BitBltBufferedImageOp { - private static final AffineTransform IdentifyTransformation = new AffineTransform(); - - private static final AffineTransformOp IdentifyTranspormationOp1 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_NEAREST_NEIGHBOR); - private static final AffineTransformOp IdentifyTranspormationOp2 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BILINEAR); - private static final AffineTransformOp IdentifyTranspormationOp3 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BICUBIC); - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - protected TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing checker pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - protected TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing diagonal checker pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - protected TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing grid pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - protected TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing diagonal grid pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - protected TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); - } /** * Entry point to the test suite. diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -40,7 +40,6 @@ package org.gfxtest.testsuites; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -61,7 +60,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.TRANSLATE) @Zoom(1) -public class BitBltAffineTranslateTransformOp extends GfxTest +public class BitBltAffineTranslateTransformOp extends BitBltAffineTransformOp { /** * Entry point to the test suite. diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Fri Jul 19 11:06:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Mon Jul 22 10:04:10 2013 +0200 @@ -41,15 +41,11 @@ package org.gfxtest.testsuites; import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.awt.image.BufferedImageOp; import java.awt.image.ConvolveOp; import java.awt.image.Kernel; -import org.gfxtest.framework.CommonBitmapOperations; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.TestImage; import org.gfxtest.framework.TestResult; import org.gfxtest.framework.annotations.BitBltOperation; @@ -72,7 +68,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.NONE) @Zoom(1) -public class BitBltConvolveOp extends GfxTest +public class BitBltConvolveOp extends BitBltBufferedImageOp { private static final Kernel NoOpKernel1x1 = new Kernel(1, 1, new float[] {1}); @@ -121,6 +117,7 @@ -1f, -2f, -1f }); + private static final ConvolveOp noopKernel1x1ROP = new ConvolveOp(NoOpKernel1x1); private static final ConvolveOp noopKernel3x3ROP = new ConvolveOp(NoOpKernel3x3); private static final ConvolveOp noopKernel5x5ROP = new ConvolveOp(NoOpKernel5x5); @@ -133,112 +130,6 @@ private static final ConvolveOp sobelOperatorGyROP = new ConvolveOp(SobelOperatorGy); /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing checker pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing diagonal checker pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing grid pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing diagonal grid pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Mon Jul 22 01:18:16 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 22 Jul 2013 08:18:16 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 993887993a34 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=993887993a34 author: Pavel Tisnovsky date: Mon Jul 22 10:19:45 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into SimpleScriptContextClassTest. diffstat: ChangeLog | 9 +++++ src/org/RhinoTests/CompiledScriptClassTest.java | 2 + src/org/RhinoTests/SimpleScriptContextClassTest.java | 33 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) diffs (71 lines): diff -r ff7b6005f5fb -r 993887993a34 ChangeLog --- a/ChangeLog Fri Jul 19 11:55:36 2013 +0200 +++ b/ChangeLog Mon Jul 22 10:19:45 2013 +0200 @@ -1,3 +1,12 @@ +2013-07-22 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Added missing imports. + * src/org/RhinoTests/SimpleScriptContextClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into SimpleScriptContextClassTest. + 2013-07-19 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r ff7b6005f5fb -r 993887993a34 src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Fri Jul 19 11:55:36 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Mon Jul 22 10:19:45 2013 +0200 @@ -52,6 +52,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.Compilable; import javax.script.CompiledScript; diff -r ff7b6005f5fb -r 993887993a34 src/org/RhinoTests/SimpleScriptContextClassTest.java --- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Fri Jul 19 11:55:36 2013 +0200 +++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Mon Jul 22 10:19:45 2013 +0200 @@ -1295,6 +1295,39 @@ } /** + * Test for method javax.script.SimpleScriptContext.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.simpleScriptContextClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.SimpleScriptContext.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.simpleScriptContextClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.SimpleScriptContext.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.simpleScriptContextClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.SimpleScriptContext.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.simpleScriptContextClass.desiredAssertionStatus(), + "Method SimpleScriptContext.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.SimpleScriptContext */ @SuppressWarnings("cast") From aazores at redhat.com Mon Jul 22 06:25:48 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 22 Jul 2013 09:25:48 -0400 Subject: [rfc][icedtea-web] RH982558 - proxy PAC support does not work In-Reply-To: <51EA9688.2030608@redhat.com> References: <51E999B3.3010703@redhat.com> <51EA9688.2030608@redhat.com> Message-ID: <51ED32DC.3090904@redhat.com> On 07/20/2013 09:54 AM, Jiri Vanek wrote: > On 07/19/2013 09:55 PM, Andrew Azores wrote: >> Changelog: >> * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java >> (getProxiesWithoutCaching): added read property permission for >> java.vm.name >> >> Proxy PAC wasn't working in Fedora 19 because Rhino initialization >> was being stopped due to missing read permission on java.vm.name >> property. Since Rhino couldn't start, the PAC file wasn't parsed, and >> the proxy setting fell back to direct connect. >> >> Andrew A > > This looks surprisingly simply.... > I was in temptation to share somehow the Permissions from > SecurityDesc. Unless you think it is good idea to share whole, or some > pars of permissions then I'm ok for head. > I guess this is necessary also for 1.4? > > J. This is the only permission that's needed to get Rhino and PAC settings working again, as far as I can tell. We could grant other permissions as well but I don't see that there's any need to grant permissions that this chunk of code doesn't actually need in order to run. I haven't tested many combination of OS and ITW versions - just Fedora 18/19 and ITW 1.4/head. The bug appears in Fedora 19 with either 1.4 or head, but doesn't appear at all in Fedora 18. Andrew A From jvanek at redhat.com Mon Jul 22 07:00:21 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 22 Jul 2013 16:00:21 +0200 Subject: [rfc][icedtea-web] RH982558 - proxy PAC support does not work In-Reply-To: <51ED32DC.3090904@redhat.com> References: <51E999B3.3010703@redhat.com> <51EA9688.2030608@redhat.com> <51ED32DC.3090904@redhat.com> Message-ID: <51ED3AF5.4080401@redhat.com> On 07/22/2013 03:25 PM, Andrew Azores wrote: > On 07/20/2013 09:54 AM, Jiri Vanek wrote: >> On 07/19/2013 09:55 PM, Andrew Azores wrote: >>> Changelog: >>> * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java (getProxiesWithoutCaching): added >>> read property permission for java.vm.name >>> >>> Proxy PAC wasn't working in Fedora 19 because Rhino initialization was being stopped due to >>> missing read permission on java.vm.name property. Since Rhino couldn't start, the PAC file wasn't >>> parsed, and the proxy setting fell back to direct connect. >>> >>> Andrew A >> >> This looks surprisingly simply.... >> I was in temptation to share somehow the Permissions from SecurityDesc. Unless you think it is >> good idea to share whole, or some pars of permissions then I'm ok for head. >> I guess this is necessary also for 1.4? >> >> J. > > This is the only permission that's needed to get Rhino and PAC settings working again, as far as I > can tell. We could grant other permissions as well but I don't see that there's any need to grant > permissions that this chunk of code doesn't actually need in order to run. > > I haven't tested many combination of OS and ITW versions - just Fedora 18/19 and ITW 1.4/head. The > bug appears in Fedora 19 with either 1.4 or head, but doesn't appear at all in Fedora 18. > > Andrew A yup, then go on! J. From aazores at icedtea.classpath.org Mon Jul 22 07:13:47 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Mon, 22 Jul 2013 14:13:47 +0000 Subject: /hg/icedtea-web: Added java.vm.name read permission to fix Rhino... Message-ID: changeset 6904f82aa501 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6904f82aa501 author: Andrew Azores date: Mon Jul 22 10:13:30 2013 -0400 Added java.vm.name read permission to fix Rhino evaluation of proxy PAC (RH982558) diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diffs (39 lines): diff -r 7c75bf721d7c -r 6904f82aa501 ChangeLog --- a/ChangeLog Thu Jul 18 08:53:46 2013 +0200 +++ b/ChangeLog Mon Jul 22 10:13:30 2013 -0400 @@ -1,3 +1,8 @@ +2013-07-22 Andrew Azores + * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: + (getProxiesWithoutCaching) added java.vm.name read permission to fix + Rhino parsing and PAC proxy configuration + 2013-07-18 Jiri Vanek IcedTea-Web is now following XDG .config and .cache specification(RH947647) diff -r 7c75bf721d7c -r 6904f82aa501 netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java --- a/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Thu Jul 18 08:53:46 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Mon Jul 22 10:13:30 2013 -0400 @@ -48,6 +48,7 @@ import java.security.Permissions; import java.security.PrivilegedAction; import java.security.ProtectionDomain; +import java.util.PropertyPermission; import net.sourceforge.jnlp.util.TimedHashMap; @@ -124,9 +125,15 @@ EvaluatePacAction evaluatePacAction = new EvaluatePacAction(pacContents, pacUrl.toString(), pacHelperFunctionContents, url); + + // Purposefully giving only these permissions rather than using java.policy. The "evaluatePacAction" + // isn't supposed to do very much and so doesn't require all the default permissions given by + // java.policy Permissions p = new Permissions(); p.add(new RuntimePermission("accessClassInPackage.org.mozilla.javascript")); p.add(new SocketPermission("*", "resolve")); + p.add(new PropertyPermission("java.vm.name", "read")); + ProtectionDomain pd = new ProtectionDomain(null, p); AccessControlContext context = new AccessControlContext(new ProtectionDomain[] { pd }); From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 08:32:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 15:32:21 +0000 Subject: [Bug 1395] Bug javaws.itweb / icedtea with JNLP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1395 --- Comment #5 from Andrew Azores --- Regarding the original error report - I can confirm that this reproducer, as provided, does result in a failure. However, in my case at least, the failure occurs because the JNLP specifies "localhost:8080", whereas httpd is using port 80. Changing the JNLP and the javaws command to specify "localhost:80", or just "localhost" results in the applet launching properly. It seems this may be the same issue you are having, Luan, seeing as there are HTTP 400 errors in your output. Interesting that this works with Oracle's implementation however. Perhaps that means that if they are given a specific port number and fail to connect, they fall back to trying without a port number? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/de85a8e2/attachment.html From alex.kasko.lists at gmail.com Mon Jul 22 08:50:59 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Mon, 22 Jul 2013 18:50:59 +0300 Subject: [rfc][icedtea6] patches for windows builds In-Reply-To: <51ED3B62.7040309@gmail.com> References: <51ED3B62.7040309@gmail.com> Message-ID: <51ED54E3.3060504@gmail.com> Hi, I've built icedtea6 head (hg:11f837636a0a) for windows-i586 and windows-amd64 and want to publish patches for possible upstreaming (maybe some of them) into icedtea6. Previous mailing list thread about windows builds - http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-June/023706.html Patches were done from temporary git repository (https://bitbucket.org/alexkasko/openjdk-icedtea6) with openjdk sources from icedtea6 build using 'git format-patch' command. Patched sources (git:9d44b25) were built and tested with "make test" on windows-i586 (windows 2000), windows-amd64 (windows 2003 x64), linux-i586 and linux-amd64 (both debian lenny). All builds were done as separate openjdk builds without icedtea infrastructure. Binaries download link - https://bitbucket.org/alexkasko/openjdk-icedtea6/downloads Patches list: * 0001-use-included-zip.patch * 0002-jpeg-sources-included.patch (too big for attachment, file link - https://bitbucket.org/alexkasko/openjdk-icedtea6/downloads/0002-jpeg-sources-included.patch) * 0003-splashscreen-with-included-jpeg-png-and-gif.patch * 0004-hostspot-SIZE_MAX-and-varmacro-patch.patch * 0005-jdk-nio-typo-patch.patch * 0006-jdk-SIZE_MAX-patch.patch * 0007-awt-wheel95-patch.patch * 0008-awt-_WIN32_WINNT-patch.patch * 0009-pack-header-change-to-fix-linux_x64-builds.patch Patches description: 0001-use-included-zip.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/52ab88acf2336e1d5f6ff42f67041e8070ae5999) Changelog: * jdk/make/com/sun/java/pack/Makefile: add included zlib sources to buil flags * jdk/make/common/Program.gmk: remove system zlib dependencies (-lz) from LDFLAGS * jdk/make/java/jli/Makefile: add ZLIB_VERSION and ZIP_SRC variables, add included zlib sources to compilation list, remove system zlib dependencies (-lz) from LDLIBS * jdk/make/java/zip/FILES_c.gmk: add included zlib sources to compilation list * jdk/make/java/zip/Makefile: add ZLIB_VERSION variable and append included zlib headers to CPPFLAGS * jdk/make/sun/splashscreen/Makefile: remove system zlib dependencies (-lz) from OTHER_LDLIBS, add include zlib sources Changes brought back from openjdk6 sources. Maybe these changes should be done on "configure" level, not in patch. 0002-jpeg-sources-included.patch (too big for attachment, file link - https://bitbucket.org/alexkasko/openjdk-icedtea6/downloads/0002-jpeg-sources-included.patch, https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/dfafae220eb2f754a665758ab484659b8d388802) Changelog: * jdk/make/sun/jpeg/FILES_c.gmk: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/README: file copied from openjdk7 * jdk/src//share/native/sun/awt/image/jpeg/imageioJPEG.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jccolor.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jchuff.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jchuff.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcinit.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jconfig.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcparam.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jcsample.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jctrans.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdct.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdinput.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdsample.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jerror.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jerror.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jidctint.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jidctred.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jinclude.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jpegint.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jquant1.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jquant2.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jutils.c: file copied from openjdk7 * jdk/src/share/native/sun/awt/image/jpeg/jversion.h: file copied from openjdk7 All JPEG sources are copied from openjdk7 without changes. jdk7 is used here instead of jdk6 to include these changes - http://hg.openjdk.java.net/jdk7/2d/jdk/rev/bcf663c292ef (http://bugs.sun.com/view_bug.do?bug_id=6989774). Maybe these changes should be done on "configure" level, not in patch. 0003-splashscreen-with-included-jpeg-png-and-gif (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/c923ca878ec87a8a25ae8c4318adaf9ea5506b43) Changelog: * jdk/make/sun/splashscreen/FILES_c.gmk: add zlib, jpeg, png and gif included sources to compilation list * jdk/make/sun/splashscreen/Makefile: remove "-lpng", "-ljpeg" and "-lgif" from OTHER_LDLIBS, add gif and png incuded sources to vpath * jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c: use included gif header instead of system one * jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c: use included jpeg header instead of system one * jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c: use included png header instead of system one Changes were brought back from openjdk6 sources. Maybe these changes should be done on "configure" level, not in patch. 0004-hostspot-SIZE_MAX-and-varmacro-patch.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/3602db05977bd874fe1180c81d2bb7ff07795918) Changelog: * hotspot/src/share/vm/oops/arrayOop.hpp: SIZE_MAX macro definition, copied from http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/file/84101d9f6c3a/src/share/native/common/sizecalc.h . _WIN32 checks are necessary because MSVS2003 doesn't have stdint.h * hotspot/src/share/vm/trace/traceMacros.hpp: turn empty variadic macro into simple one, MSVS2003 doesn't support varmacros and this one is used only with two arguments anyway These changes are specific to hotspot 23 that is intended to be built with VS2010 in jdk7. Hotspot 20 from icedtea 1.12.6 doesn't have such problems. 0005-jdk-nio-typo-patch.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/b02ef9cb80e2595115159a92b4a500daf0efdaaf) Changelog: * jdk/src/windows/native/sun/nio/ch/Net.c: fix parameter name typo I think typo appeared on backport of this change http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/diff/8dd8266a2f4b/src/windows/native/sun/nio/ch/Net.c 0006-jdk-SIZE_MAX-patch.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/80b5bf850eab55727502f17024b1d1aeee60ca05) Changelog: * jdk/src/share/native/common/sizecalc.h add _WIN32 checks because MSVS2003 doesn't have stdint.h 0007-awt-wheel95-patch.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/30ffef2215e4d6615aa487dbe7c5b9e48f766ee6) Changelog: * jdk/src/windows/native/sun/windows/awt_Component.cpp: add empty variables related to mouse wheel support in windows 95, they are not used, but are required for compilation * jdk/src/windows/native/sun/windows/awt_Component.h: add functions related to mouse wheel support in windows 95, they are not used, but are required for compilation The problem appears because icedtea6 codebase contains partial changes from this commit http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/75755e92430c . I doubt that whole commit may be backported to MSVS2003 so decided to restore some empty functions. 0008-awt-_WIN32_WINNT-patch.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/da1de1aca635b834a44e74f379bdc03082ce252f) Changelog: * jdk/src/windows/native/sun/windows/awt_MMStub.h: add 4 constants, 1 typedef and 2 function declarations from winuser.h * jdk/src/windows/native/sun/windows/awt_Toolkit.cpp: use MONITOR_INFO type from awt_MMStub.h instead of native MONITORINFO * jdk/src/windows/native/sun/windows/awt_Window.cpp: use MHND type from awt_MMStub.h instead of native HMONITOR As in previous patch, the problem appears because icedtea6 codebase contains partial changes from this commit http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/75755e92430c . I doubt that whole commit may be backported to MSVS2003. When including winuser.h (through windows.h) imported definitions depend on value of _WIN32_WINNT macro which represents OS version. Before change this macro wasn't defined so some definitions aren't imported from winuser.h. OS version cannot be defined properly here, because most of AWT code in icedtea6 still uses AWT's own definitions from awt_MMStub.h and though data types are similar they don't coincide. So I reverted some parts of the change to use definitions from awt_MMStub.h. But some of new changes use API that requires additional definitions from winuser.h. For those API I copied declarations to awt_MMStub.h (all functions are supported on win2000+, implementation is in user32.dll). 0009-pack-header-change-to-fix-linux_x64-builds.patch (https://bitbucket.org/alexkasko/openjdk-icedtea6/commits/9d44b25626450948461429f37bcd1b269bbbee3b) Changelog: * jdk/src/share/native/com/sun/java/util/jar/pack/defines.h: use zlib 32 ints on x64 to allow compiling on linux x64 Change was brought back from openjdk6 sources. -- Regards, Alex Kasko -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-use-included-zip.patch Type: text/x-diff Size: 5511 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0001-use-included-zip.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0003-splashscreen-with-included-jpeg-png-and-gif.patch Type: text/x-diff Size: 4761 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0003-splashscreen-with-included-jpeg-png-and-gif.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0004-hostspot-SIZE_MAX-and-varmacro-patch.patch Type: text/x-diff Size: 1529 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0004-hostspot-SIZE_MAX-and-varmacro-patch.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0005-jdk-nio-typo-patch.patch Type: text/x-diff Size: 910 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0005-jdk-nio-typo-patch.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0006-jdk-SIZE_MAX-patch.patch Type: text/x-diff Size: 852 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0006-jdk-SIZE_MAX-patch.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0007-awt-wheel95-patch.patch Type: text/x-diff Size: 2268 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0007-awt-wheel95-patch.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0008-awt-_WIN32_WINNT-patch.patch Type: text/x-diff Size: 4461 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0008-awt-_WIN32_WINNT-patch.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0009-pack-header-change-to-fix-linux_x64-builds.patch Type: text/x-diff Size: 941 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c4aa5743/0009-pack-header-change-to-fix-linux_x64-builds.patch From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:42:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:42:48 +0000 Subject: [Bug 1501] New: [IcedTea6] Backport IcedTea 2.x library removal script Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1501 Bug ID: 1501 Summary: [IcedTea6] Backport IcedTea 2.x library removal script Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Backporting this script will simplify the libraries patch file by deleting the source files directly rather than via patch. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/d9f4b25e/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:43:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:43:24 +0000 Subject: [Bug 1501] [IcedTea6] Backport IcedTea 2.x library removal script In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1501 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1272 Target Milestone|--- |6-1.13.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/3ff044da/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:43:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:43:24 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1501 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/a1d25150/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:44:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:44:11 +0000 Subject: [Bug 1502] New: [IcedTea6] Allow use of system LCMS 2 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1502 Bug ID: 1502 Summary: [IcedTea6] Allow use of system LCMS 2 Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org With LCMS 2 support backported, IcedTea for OpenJDK 6 can make use of LCMS 2.5 or later from the system instead of the in-tree copy. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/910470d7/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:44:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:44:36 +0000 Subject: [Bug 1502] [IcedTea6] Allow use of system LCMS 2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1502 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1272 Depends on| |718 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/66cdf1ab/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:44:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:44:36 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1502 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/5faf6d3e/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:46:35 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:46:35 +0000 Subject: [Bug 1503] New: [TRACKER] IcedTea6 1.14 Release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503 Bug ID: 1503 Summary: [TRACKER] IcedTea6 1.14 Release Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/2b5706e3/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:47:10 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:47:10 +0000 Subject: [Bug 1503] [TRACKER] IcedTea6 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Depends on| |26, 901, 914 Target Milestone|--- |6-1.14.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/3d9e0a97/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:47:10 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:47:10 +0000 Subject: [Bug 901] [IcedTea6] [METABUG] Give top priority to the PKCS11 NSS provider, due to performance advantages In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=901 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |1503 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/abe095ce/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:48:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:48:04 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 --- Comment #1 from Andrew John Hughes --- Move 26, 901 and 914 to 1.14.0 release. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/428f94cc/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:48:38 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:48:38 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|26, 901, 914 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/a48ebf47/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:48:38 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:48:38 +0000 Subject: [Bug 901] [IcedTea6] [METABUG] Give top priority to the PKCS11 NSS provider, due to performance advantages In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=901 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|1272 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/58933900/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:51:54 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:51:54 +0000 Subject: [Bug 901] [IcedTea6] [METABUG] Give top priority to the PKCS11 NSS provider, due to performance advantages In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=901 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|6-1.13.0 |6-1.14.0 --- Comment #3 from Andrew John Hughes --- Bumped to 1.14.0 :( -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/fdfc2680/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:54:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:54:13 +0000 Subject: [Bug 980] JVM crashed druing development in NetBeans on Fedora Core 16 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=980 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com --- Comment #1 from Andrew John Hughes --- Please give details on how to reproduce this. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/c093c899/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 15:55:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 22:55:02 +0000 Subject: [Bug 987] Crash during Jenkins installation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=987 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #2 from Andrew John Hughes --- The 1.8.x series is no longer supported. Please reopen if you can reproduce this on a current version (1.11.x, 1.12.x) with details of how to do so. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/df34c009/attachment.html From andrew at icedtea.classpath.org Mon Jul 22 16:00:10 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 22 Jul 2013 23:00:10 +0000 Subject: /hg/icedtea6: PR718: Backport LCMS2 support from IcedTea7 Message-ID: changeset f9036c0f3155 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9036c0f3155 author: Andrew John Hughes date: Mon Jul 22 23:59:29 2013 +0100 PR718: Backport LCMS2 support from IcedTea7 2013-07-22 Andrew John Hughes PR718: Backport LCMS2 support from IcedTea7 * Makefile.am: (LCMS_PATCHES): Populate based on which version of LCMS is being built. (ICEDTEA_PATCHES): Add LCMS_PATCHES. Remove lcms.patch and patches/jtreg-ReadWriteProfileTest.patch, the latter being 6733501 in disguise. * NEWS: Mention PR718. * acinclude.m4: (IT_ENABLE_LCMS2): New macro to enable or disable the use of LCMS 2 (enabled by default). * configure.ac: Invoke IT_ENABLE_LCMS2. * patches/libraries.patch: Adjust due to JPEG changes in 7002766. * patches/openjdk/6733501-icedtea_lcms_test.patch: Identical to ReadWriteProfileTest.patch with addition of upstream changeset information. * patches/openjdk/7002766-parfait-jpeg.patch: JPEG segment of 7002766 applied on all builds. * patches/openjdk/lcms2/6523398-writing_tags.patch, * patches/openjdk/lcms2/6988213-windows_build_failure.patch, * patches/openjdk/lcms2/7002766-parfait.patch, * patches/openjdk/lcms2/7042594-tck_failure.patch, * patches/openjdk/lcms2/7053526-lcms_2.4.patch, * patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch, * patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch, * patches/openjdk/lcms2/8007929-improve_curvesalloc.patch, * patches/openjdk/lcms2/8009654-cmsnamed_stability.patch, * patches/openjdk/lcms2/system_lcms2.patch: Add backports from OpenJDK 7 to provide LCMS 2 support. * patches/jtreg-ReadWriteProfileTest.patch: This is 6733501 above. diffstat: ChangeLog | 35 + Makefile.am | 22 +- NEWS | 1 + acinclude.m4 | 17 + configure.ac | 2 + patches/jtreg-ReadWriteProfileTest.patch | 124 - patches/libraries.patch | 63 +- patches/openjdk/6733501-icedtea_lcms_test.patch | 133 + patches/openjdk/7002766-parfait-jpeg.patch | 42 + patches/openjdk/lcms2/6523398-writing_tags.patch | 51207 ++++++++++ patches/openjdk/lcms2/6988213-windows_build_failure.patch | 25 + patches/openjdk/lcms2/7002766-parfait.patch | 20 + patches/openjdk/lcms2/7042594-tck_failure.patch | 375 + patches/openjdk/lcms2/7053526-lcms_2.4.patch | 10111 + patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch | 30 + patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch | 23 + patches/openjdk/lcms2/8007929-improve_curvesalloc.patch | 28 + patches/openjdk/lcms2/8009654-cmsnamed_stability.patch | 38 + patches/openjdk/lcms2/system_lcms2.patch | 93 + 19 files changed, 62233 insertions(+), 156 deletions(-) diffs (truncated from 62672 to 500 lines): diff -r 8da02dd9a76d -r f9036c0f3155 ChangeLog --- a/ChangeLog Thu Jul 18 20:03:43 2013 +0100 +++ b/ChangeLog Mon Jul 22 23:59:29 2013 +0100 @@ -1,3 +1,38 @@ +2013-07-22 Andrew John Hughes + + PR718: Backport LCMS2 support from IcedTea7 + * Makefile.am: + (LCMS_PATCHES): Populate based on which version + of LCMS is being built. + (ICEDTEA_PATCHES): Add LCMS_PATCHES. Remove + lcms.patch and patches/jtreg-ReadWriteProfileTest.patch, + the latter being 6733501 in disguise. + * NEWS: Mention PR718. + * acinclude.m4: + (IT_ENABLE_LCMS2): New macro to enable or disable + the use of LCMS 2 (enabled by default). + * configure.ac: Invoke IT_ENABLE_LCMS2. + * patches/libraries.patch: Adjust due to JPEG changes + in 7002766. + * patches/openjdk/6733501-icedtea_lcms_test.patch: + Identical to ReadWriteProfileTest.patch with addition + of upstream changeset information. + * patches/openjdk/7002766-parfait-jpeg.patch: + JPEG segment of 7002766 applied on all builds. + * patches/openjdk/lcms2/6523398-writing_tags.patch, + * patches/openjdk/lcms2/6988213-windows_build_failure.patch, + * patches/openjdk/lcms2/7002766-parfait.patch, + * patches/openjdk/lcms2/7042594-tck_failure.patch, + * patches/openjdk/lcms2/7053526-lcms_2.4.patch, + * patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch, + * patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch, + * patches/openjdk/lcms2/8007929-improve_curvesalloc.patch, + * patches/openjdk/lcms2/8009654-cmsnamed_stability.patch, + * patches/openjdk/lcms2/system_lcms2.patch: + Add backports from OpenJDK 7 to provide LCMS 2 support. + * patches/jtreg-ReadWriteProfileTest.patch: + This is 6733501 above. + 2013-07-18 Andrew John Hughes * patches/hotspot/hs23/arm-hsdis.patch: diff -r 8da02dd9a76d -r f9036c0f3155 Makefile.am --- a/Makefile.am Thu Jul 18 20:03:43 2013 +0100 +++ b/Makefile.am Mon Jul 22 23:59:29 2013 +0100 @@ -446,9 +446,29 @@ SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch +if ENABLE_LCMS2 +LCMS_PATCHES = \ + patches/openjdk/lcms2/6523398-writing_tags.patch \ + patches/openjdk/lcms2/6988213-windows_build_failure.patch \ + patches/openjdk/lcms2/system_lcms2.patch \ + patches/openjdk/lcms2/7053526-lcms_2.4.patch \ + patches/openjdk/lcms2/8007929-improve_curvesalloc.patch \ + patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch \ + patches/openjdk/lcms2/8009654-cmsnamed_stability.patch \ + patches/openjdk/lcms2/7002766-parfait.patch \ + patches/openjdk/lcms2/7042594-tck_failure.patch \ + patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch +else +LCMS_PATCHES = \ + patches/lcms.patch +endif + ICEDTEA_PATCHES = \ $(DROP_PATCHES) \ $(SECURITY_PATCHES) \ + patches/openjdk/6733501-icedtea_lcms_test.patch \ + $(LCMS_PATCHES) \ + patches/openjdk/7002766-parfait-jpeg.patch \ patches/openjdk/4993545-nativeinlightfixer.patch \ patches/openjdk/6637796-set_bounds.patch \ patches/openjdk/6607660-treelock.patch \ @@ -478,7 +498,6 @@ patches/gcc-suffix.patch \ patches/libraries.patch \ $(SPECIAL_SECURITY_PATCH_2) \ - patches/lcms.patch \ patches/uname.patch \ patches/freetypeversion.patch \ patches/nomotif-6706121.patch \ @@ -573,7 +592,6 @@ patches/jtreg-FileMap.patch \ patches/jtreg-ChannelsWrite.patch \ patches/jtreg-bug7036148-test.patch \ - patches/jtreg-ReadWriteProfileTest.patch \ patches/openjdk/6818312-com.sun.awt.SecurityWarning.getSize.patch \ patches/jtreg-MappedByteBuffer-Basic.patch \ patches/openjdk/7008106-WindowOpacity.patch \ diff -r 8da02dd9a76d -r f9036c0f3155 NEWS --- a/NEWS Thu Jul 18 20:03:43 2013 +0100 +++ b/NEWS Mon Jul 22 23:59:29 2013 +0100 @@ -16,6 +16,7 @@ * New features - PR1317: Provide an option to build with a more up-to-date HotSpot - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional + - PR718: Backport LCMS2 support from IcedTea7 * Backports - S8009641: OpenJDK 6 build broken via 8007675 fix - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build diff -r 8da02dd9a76d -r f9036c0f3155 acinclude.m4 --- a/acinclude.m4 Thu Jul 18 20:03:43 2013 +0100 +++ b/acinclude.m4 Mon Jul 22 23:59:29 2013 +0100 @@ -2054,3 +2054,20 @@ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN_ONCE([IT_ENABLE_LCMS2], +[ + AC_MSG_CHECKING([whether to enable the use of LCMS2]) + AC_ARG_ENABLE([lcms2], + [AS_HELP_STRING(--enable-lcms2,use LCMS 2 backport from OpenJDK 7 [[default=yes]])], + [ + ENABLE_LCMS2="${enableval}" + ], + [ + ENABLE_LCMS2=yes + ]) + + AC_MSG_RESULT(${ENABLE_LCMS2}) + AM_CONDITIONAL(ENABLE_LCMS2, test x"${ENABLE_LCMS2}" = "xyes") + AC_SUBST(ENABLE_LCMS2) +]) diff -r 8da02dd9a76d -r f9036c0f3155 configure.ac --- a/configure.ac Thu Jul 18 20:03:43 2013 +0100 +++ b/configure.ac Mon Jul 22 23:59:29 2013 +0100 @@ -289,6 +289,8 @@ IT_WITH_PAX AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm]) +IT_ENABLE_LCMS2 + dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] ,[AC_MSG_ERROR("CUPS headers were not found - diff -r 8da02dd9a76d -r f9036c0f3155 patches/jtreg-ReadWriteProfileTest.patch --- a/patches/jtreg-ReadWriteProfileTest.patch Thu Jul 18 20:03:43 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -diff -r 9318628e8eee -r 467e4f25965c test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java Fri Mar 20 20:05:22 2009 +0300 -@@ -0,0 +1,120 @@ -+/* -+ * Copyright 2007-2008 Sun Microsystems, Inc. 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. -+ * -+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/** -+ * @test -+ * @bug 6476665 6523403 6733501 -+ * @summary Verifies reading and writing profiles and tags of the standard color -+ * spaces -+ * @run main ReadWriteProfileTest -+ */ -+import java.awt.color.ColorSpace; -+import java.awt.color.ICC_Profile; -+import java.util.*; -+import java.nio.*; -+import java.util.Hashtable; -+ -+public class ReadWriteProfileTest implements Runnable { -+ /* Location of the tag sig counter in 4-byte words */ -+ final static int TAG_COUNT_OFFSET = 32; -+ -+ /* Location of the tag sig table in 4-byte words */ -+ final static int TAG_ELEM_OFFSET = 33; -+ -+ static byte[][] profiles; -+ static int [][] tagSigs; -+ static Hashtable [] tags; -+ -+ static int [] cspaces = {ColorSpace.CS_sRGB, ColorSpace.CS_PYCC, -+ ColorSpace.CS_LINEAR_RGB, ColorSpace.CS_CIEXYZ, -+ ColorSpace.CS_GRAY}; -+ -+ static String [] csNames = {"sRGB", "PYCC", "LINEAR_RGB", "CIEXYZ", "GRAY"}; -+ -+ static void getProfileTags(byte [] data, Hashtable tags) { -+ ByteBuffer byteBuf = ByteBuffer.wrap(data); -+ IntBuffer intBuf = byteBuf.asIntBuffer(); -+ int tagCount = intBuf.get(TAG_COUNT_OFFSET); -+ intBuf.position(TAG_ELEM_OFFSET); -+ for (int i = 0; i < tagCount; i++) { -+ int tagSig = intBuf.get(); -+ int tagDataOff = intBuf.get(); -+ int tagSize = intBuf.get(); -+ -+ byte [] tagData = new byte[tagSize]; -+ byteBuf.position(tagDataOff); -+ byteBuf.get(tagData); -+ tags.put(tagSig, tagData); -+ } -+ } -+ -+ static { -+ profiles = new byte[cspaces.length][]; -+ tags = new Hashtable[cspaces.length]; -+ -+ for (int i = 0; i < cspaces.length; i++) { -+ ICC_Profile pf = ICC_Profile.getInstance(cspaces[i]); -+ profiles[i] = pf.getData(); -+ tags[i] = new Hashtable(); -+ getProfileTags(profiles[i], tags[i]); -+ } -+ } -+ -+ public void run() { -+ for (int i = 0; i < cspaces.length; i++) { -+ ICC_Profile pf = ICC_Profile.getInstance(cspaces[i]); -+ byte [] data = pf.getData(); -+ pf = ICC_Profile.getInstance(data); -+ if (!Arrays.equals(data, profiles[i])) { -+ System.err.println("Incorrect result of getData() " + "with " + -+ csNames[i] + " profile"); -+ throw new RuntimeException("Incorrect result of getData()"); -+ } -+ -+ for (int tagSig : tags[i].keySet()) { -+ byte [] tagData = pf.getData(tagSig); -+ byte [] empty = new byte[tagData.length]; -+ pf.setData(tagSig, empty); -+ pf.setData(tagSig, tagData); -+ -+ byte [] tagData1 = pf.getData(tagSig); -+ -+ if (!Arrays.equals(tagData1, tags[i].get(tagSig))) -+ { -+ System.err.println("Incorrect result of getData(int) with" + -+ " tag " + -+ Integer.toHexString(tagSig) + -+ " of " + csNames[i] + " profile"); -+ -+ throw new RuntimeException("Incorrect result of " + -+ "getData(int)"); -+ } -+ } -+ } -+ } -+ -+ public static void main(String [] args) { -+ ReadWriteProfileTest test = new ReadWriteProfileTest(); -+ test.run(); -+ } -+} diff -r 8da02dd9a76d -r f9036c0f3155 patches/libraries.patch --- a/patches/libraries.patch Thu Jul 18 20:03:43 2013 +0100 +++ b/patches/libraries.patch Mon Jul 22 23:59:29 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-04-23 19:45:24.512100652 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-07-22 19:51:20.762208023 +0100 @@ -64,23 +64,21 @@ ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME) @@ -55,7 +55,7 @@ endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk --- openjdk.orig/jdk/make/common/Program.gmk 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/common/Program.gmk 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/common/Program.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -85,7 +85,7 @@ endif endif @@ -75,7 +75,7 @@ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile --- openjdk.orig/jdk/make/java/jli/Makefile 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/java/jli/Makefile 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/java/jli/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -44,8 +44,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -127,7 +127,7 @@ diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk --- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -30,15 +30,4 @@ Inflater.c \ ZipFile.c \ @@ -146,7 +146,7 @@ zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile --- openjdk.orig/jdk/make/java/zip/Makefile 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/java/zip/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -30,8 +30,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -176,7 +176,7 @@ +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -25,51 +25,7 @@ FILES_c = \ @@ -232,7 +232,7 @@ FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -68,6 +68,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -244,7 +244,7 @@ # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk --- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2012-10-26 19:25:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -30,81 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -330,7 +330,7 @@ diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2012-10-26 19:25:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -59,12 +59,12 @@ # C Flags # @@ -362,8 +362,8 @@ ifeq ($(PLATFORM), linux) ifeq ($(ARCH_DATA_MODEL), 64) diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-04-23 18:50:35.139719857 +0100 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-04-23 19:46:32.885201759 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:49:54.900852754 +0100 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:51:20.774208212 +0100 @@ -89,11 +89,7 @@ // bytes and byte arrays @@ -378,7 +378,7 @@ typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-07-22 19:51:20.774208212 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -390,7 +390,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c --- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-07-22 19:51:20.774208212 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -402,7 +402,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-07-22 19:51:20.774208212 +0100 @@ -32,7 +32,7 @@ #include "jlong.h" #include "jni.h" @@ -414,7 +414,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-07-22 19:51:20.774208212 +0100 @@ -35,7 +35,7 @@ #include "jni.h" #include "jvm.h" @@ -425,8 +425,8 @@ #define ThrowDataFormatException(env, msg) \ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-04-23 19:45:24.532100974 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:49:56.968885397 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:51:20.778208275 +0100 @@ -44,7 +44,8 @@ #include "io_util.h" #include "io_util_md.h" @@ -438,8 +438,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-04-23 18:50:43.759856150 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-04-23 19:46:11.140851683 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:49:56.160872642 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:51:20.778208275 +0100 @@ -52,7 +52,9 @@ /* headers from the JPEG library */ @@ -20601,9 +20601,9 @@ -EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo)); -EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2012-10-26 19:26:12.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2013-07-22 19:49:58.240905475 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,375 +0,0 @@ +@@ -1,378 +0,0 @@ -/* - * reserved comment block - * DO NOT REMOVE OR ALTER! @@ -20767,11 +20767,11 @@ - -/* INT32 must hold at least signed 32-bit values. */ - --#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ --#ifndef _LP64 +-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ +-#if defined(_LP64) || defined(_WIN32) /* _WIN32 is on all windows platfroms (x86 and x64) */ +-typedef int INT32; +-#else -typedef long INT32; --#else --typedef int INT32; -#endif -#endif - @@ -20827,11 +20827,14 @@ - * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol. - */ - +- +-#ifndef FAR -#ifdef NEED_FAR_POINTERS -#define FAR far -#else -#define FAR -#endif +-#endif - - -/* @@ -20981,7 +20984,7 @@ -#endif /* JPEG_INTERNAL_OPTIONS */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c --- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-04-23 19:45:24.556101361 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-07-22 19:51:20.798208591 +0100 @@ -45,7 +45,9 @@ #undef boolean #undef FAR @@ -25529,7 +25532,7 @@ -Please send bug reports, offers of help, etc. to jpeg-info at uunet.uu.net. diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2012-10-26 19:26:13.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2013-04-23 19:45:24.560101425 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2013-07-22 19:51:20.798208591 +0100 @@ -26,7 +26,7 @@ #include "splashscreen_impl.h" #include "splashscreen_gfx.h" @@ -25540,8 +25543,8 @@ #define GIF_TRANSPARENT 0x01 #define GIF_USER_INPUT 0x02 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-04-23 18:50:35.015717895 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-04-23 19:45:24.560101425 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-07-22 19:49:54.864852186 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-07-22 19:51:20.802208655 +0100 @@ -25,9 +25,8 @@ #include "splashscreen_impl.h" @@ -25573,7 +25576,7 @@ src = (stream_src_ptr) cinfo->src; diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2012-10-26 19:26:13.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-04-23 19:45:24.560101425 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-07-22 19:51:20.802208655 +0100 @@ -25,7 +25,7 @@ #include "splashscreen_impl.h" diff -r 8da02dd9a76d -r f9036c0f3155 patches/openjdk/6733501-icedtea_lcms_test.patch From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 16:01:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 23:01:24 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Bug 1272 depends on bug 718, which changed state. Bug 718 Summary: Backport LCMS2 support from IcedTea7 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=718 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/feee687b/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jul 22 16:01:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 22 Jul 2013 23:01:25 +0000 Subject: [Bug 1502] [IcedTea6] Allow use of system LCMS 2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1502 Bug 1502 depends on bug 718, which changed state. Bug 718 Summary: Backport LCMS2 support from IcedTea7 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=718 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130722/6592ea55/attachment.html From andrew at icedtea.classpath.org Mon Jul 22 16:18:36 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 22 Jul 2013 23:18:36 +0000 Subject: /hg/icedtea6: Don't overwrite the hs23 ARM port with the one in-... Message-ID: changeset df51aa5a4270 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=df51aa5a4270 author: Andrew John Hughes date: Tue Jul 23 00:18:28 2013 +0100 Don't overwrite the hs23 ARM port with the one in-tree. 2013-07-22 Andrew John Hughes * Makefile.am: (ports): Only copy over arm_port directory contents if using the upstream HotSpot 20. (clean-ports): Likewise for cleanup. diffstat: ChangeLog | 7 +++++++ Makefile.am | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diffs (43 lines): diff -r f9036c0f3155 -r df51aa5a4270 ChangeLog --- a/ChangeLog Mon Jul 22 23:59:29 2013 +0100 +++ b/ChangeLog Tue Jul 23 00:18:28 2013 +0100 @@ -1,3 +1,10 @@ +2013-07-22 Andrew John Hughes + + * Makefile.am: + (ports): Only copy over arm_port directory + contents if using the upstream HotSpot 20. + (clean-ports): Likewise for cleanup. + 2013-07-22 Andrew John Hughes PR718: Backport LCMS2 support from IcedTea7 diff -r f9036c0f3155 -r df51aa5a4270 Makefile.am --- a/Makefile.am Mon Jul 22 23:59:29 2013 +0100 +++ b/Makefile.am Tue Jul 23 00:18:28 2013 +0100 @@ -1384,21 +1384,25 @@ # Copy ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp +if !WITH_ALT_HSBUILD for target in $(abs_top_srcdir)/arm_port/hotspot/tools \ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \ cp -rv $(SRC_DIR_LINK) $$target $$link; \ chmod -R ug+rwX $$link; \ done +endif mkdir -p stamps touch stamps/ports.stamp clean-ports: +if !WITH_ALT_HSBUILD for target in $(abs_top_srcdir)/arm_port/hotspot/tools \ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \ rm -rf $$link; \ done +endif rm -f stamps/ports.stamp stamps/generated.stamp: stamps/ports.stamp From ptisnovs at icedtea.classpath.org Tue Jul 23 02:17:26 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 23 Jul 2013 09:17:26 +0000 Subject: /hg/gfx-test: Three new affine identity transformations added, a... Message-ID: changeset 90586e9152a1 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=90586e9152a1 author: Pavel Tisnovsky date: Tue Jul 23 11:21:04 2013 +0200 Three new affine identity transformations added, also three new tests addded into BitBltAffineIdentityTransformOp test suite. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 59 ++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diffs (100 lines): diff -r 865e71729bdf -r 90586e9152a1 ChangeLog --- a/ChangeLog Mon Jul 22 10:04:10 2013 +0200 +++ b/ChangeLog Tue Jul 23 11:21:04 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-23 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Three new affine identity transformations added, also three new tests + addded into BitBltAffineIdentityTransformOp test suite. + 2013-07-22 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: diff -r 865e71729bdf -r 90586e9152a1 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Mon Jul 22 10:04:10 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Tue Jul 23 11:21:04 2013 +0200 @@ -41,6 +41,7 @@ package org.gfxtest.testsuites; import java.awt.Graphics2D; +import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; @@ -76,10 +77,26 @@ private static final AffineTransformOp IdentifyTranspormationOp2; private static final AffineTransformOp IdentifyTranspormationOp3; + private static final AffineTransformOp IdentifyTranspormationOp4; + private static final AffineTransformOp IdentifyTranspormationOp5; + private static final AffineTransformOp IdentifyTranspormationOp6; + + private static final RenderingHints RenderingHintsNearestNeighbor; + private static final RenderingHints RenderingHintsBilinear; + private static final RenderingHints RenderingHintsBicubic; + static { + RenderingHintsNearestNeighbor = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR); + RenderingHintsBilinear = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + RenderingHintsBicubic = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + IdentifyTranspormationOp1 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_NEAREST_NEIGHBOR); IdentifyTranspormationOp2 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BILINEAR); IdentifyTranspormationOp3 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BICUBIC); + + IdentifyTranspormationOp4 = new AffineTransformOp(IdentifyTransformation, RenderingHintsNearestNeighbor); + IdentifyTranspormationOp5 = new AffineTransformOp(IdentifyTransformation, RenderingHintsBilinear); + IdentifyTranspormationOp6 = new AffineTransformOp(IdentifyTransformation, RenderingHintsBicubic); } /** @@ -125,6 +142,48 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp6); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Tue Jul 23 02:20:18 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 23 Jul 2013 09:20:18 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 68a78d6a2c57 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=68a78d6a2c57 author: Pavel Tisnovsky date: Tue Jul 23 11:23:58 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into SimpleBindingsClassTest. diffstat: ChangeLog | 7 +++++ src/org/RhinoTests/SimpleBindingsClassTest.java | 33 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diffs (57 lines): diff -r 993887993a34 -r 68a78d6a2c57 ChangeLog --- a/ChangeLog Mon Jul 22 10:19:45 2013 +0200 +++ b/ChangeLog Tue Jul 23 11:23:58 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-23 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into SimpleBindingsClassTest. + 2013-07-22 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: diff -r 993887993a34 -r 68a78d6a2c57 src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Mon Jul 22 10:19:45 2013 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Tue Jul 23 11:23:58 2013 +0200 @@ -1255,6 +1255,39 @@ } /** + * Test for method javax.script.SimpleBindings.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.simpleBindingsClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.SimpleBindings.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.simpleBindingsClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.SimpleBindings.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.simpleBindingsClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.SimpleBindings.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.simpleBindingsClass.desiredAssertionStatus(), + "Method SimpleBindings.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.SimpleBindings */ @SuppressWarnings("cast") From ptisnovs at icedtea.classpath.org Wed Jul 24 01:59:43 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 24 Jul 2013 08:59:43 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite. Message-ID: changeset 17d5c82fa9aa in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=17d5c82fa9aa author: Pavel Tisnovsky date: Wed Jul 24 11:03:17 2013 +0200 Ten new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 152 +++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diffs (174 lines): diff -r 90586e9152a1 -r 17d5c82fa9aa ChangeLog --- a/ChangeLog Tue Jul 23 11:21:04 2013 +0200 +++ b/ChangeLog Wed Jul 24 11:03:17 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-24 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests test suite. + 2013-07-23 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r 90586e9152a1 -r 17d5c82fa9aa src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Jul 23 11:21:04 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jul 24 11:03:17 2013 +0200 @@ -4944,6 +4944,158 @@ } /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for vertical magenta gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalMagentaGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Wed Jul 24 02:18:21 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 24 Jul 2013 09:18:21 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 205ca386a62e in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=205ca386a62e author: Pavel Tisnovsky date: Wed Jul 24 11:22:02 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into ScriptExceptionClassTest. diffstat: ChangeLog | 7 +++++ src/org/RhinoTests/ScriptExceptionClassTest.java | 33 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diffs (57 lines): diff -r 68a78d6a2c57 -r 205ca386a62e ChangeLog --- a/ChangeLog Tue Jul 23 11:23:58 2013 +0200 +++ b/ChangeLog Wed Jul 24 11:22:02 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-24 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptExceptionClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into ScriptExceptionClassTest. + 2013-07-23 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r 68a78d6a2c57 -r 205ca386a62e src/org/RhinoTests/ScriptExceptionClassTest.java --- a/src/org/RhinoTests/ScriptExceptionClassTest.java Tue Jul 23 11:23:58 2013 +0200 +++ b/src/org/RhinoTests/ScriptExceptionClassTest.java Wed Jul 24 11:22:02 2013 +0200 @@ -1233,6 +1233,39 @@ } /** + * Test for method javax.script.ScriptException.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.scriptExceptionClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.ScriptException.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.scriptExceptionClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.ScriptException.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.scriptExceptionClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.ScriptException.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.scriptExceptionClass.desiredAssertionStatus(), + "Method ScriptException.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptException */ @SuppressWarnings("cast") From andrew at icedtea.classpath.org Wed Jul 24 03:58:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 10:58:00 +0000 Subject: /hg/icedtea6-hg: 3 new changesets Message-ID: changeset 5cba6fc13701 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5cba6fc13701 author: Omair Majid date: Wed Jul 17 11:54:43 2013 -0400 Fix mistake in backport of S8010118 2013-07-17 Omair Majid * patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in backport. changeset 8da02dd9a76d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8da02dd9a76d author: Andrew John Hughes date: Thu Jul 18 20:03:43 2013 +0100 Update to the version of hs23 which includes the ARM32 port. 2013-07-18 Andrew John Hughes * patches/hotspot/hs23/arm-hsdis.patch: Removed. * Makefile.am: (ICEDTEA_PATCHES): Only apply original arm-hsdis patch. * hotspot.map: Update to latest HotSpot from 2.3.x forest, which contains the ARM32 port. changeset 455071a8e0ec in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=455071a8e0ec author: Andrew John Hughes date: Mon Jul 22 17:04:11 2013 +0100 Merge diffstat: ChangeLog | 111 + Makefile.am | 53 +- hotspot.map | 2 +- patches/copy_memory.patch | 36 - patches/ecj/override.patch | 51 + patches/hotspot/hs23/arm-hsdis.patch | 72 - patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 - patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/8010118-caller_sensitive.patch | 26 +- patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 ------- patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673.patch | 400 +- patches/security/20130416/8005432.patch | 48 +- 53 files changed, 411 insertions(+), 1070524 deletions(-) diffs (truncated from 1072130 to 500 lines): diff -r 11f837636a0a -r 455071a8e0ec ChangeLog --- a/ChangeLog Thu Jul 11 23:43:09 2013 +0100 +++ b/ChangeLog Mon Jul 22 17:04:11 2013 +0100 @@ -1,3 +1,26 @@ +2013-07-18 Andrew John Hughes + + * patches/hotspot/hs23/arm-hsdis.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Only apply original + arm-hsdis patch. + * hotspot.map: Update to latest HotSpot + from 2.3.x forest, which contains the ARM32 + port. + +2013-07-17 Omair Majid + + * patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in + backport. + +2013-07-11 Andrew John Hughes + + * patches/openjdk/7036559-concurrenthashmap_improvements.patch: + Remove upstreamed patch. + * Makefile.am: + (ICEDTEA_PATCHES): Drop upstreamed patches. + 2013-07-11 Andrew John Hughes * NEWS: @@ -295,6 +318,15 @@ * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. +2013-05-31 Andrew John Hughes + + * patches/copy_memory.patch, + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: + Drop upstreamed patches. + * Makefile.am: + (DROP_PATCHES): Remove JAXP patch. + (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. + 2013-05-28 Xerxes R??nby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile @@ -360,6 +392,18 @@ * patches/jtreg-TextLayoutBoundsChecks.patch: Fixed wrong JTreg test name in @run annotation. +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: @@ -377,6 +421,12 @@ * Makefile.am: Renamed three patches to be more consistent with other JTreg-related patches. +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + 2013-05-15 Pavel Tisnovsky * Makefile.am: @@ -753,6 +803,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -1354,6 +1460,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r 11f837636a0a -r 455071a8e0ec Makefile.am --- a/Makefile.am Thu Jul 11 23:43:09 2013 +0100 +++ b/Makefile.am Mon Jul 22 17:04:11 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -278,48 +278,11 @@ ICEDTEA_FSG_PATCHES = -DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch +DROP_PATCHES = SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ - patches/security/20130304/8007675.patch \ - patches/openjdk/8009641-8007675_build_fix.patch \ - patches/openjdk/7036559-concurrenthashmap_improvements.patch \ patches/security/20130416/8009063.patch \ - patches/openjdk/8004302-soap_test_failure.patch \ patches/security/20130416/6657673.patch \ patches/security/20130416/6657673-fixup.patch \ patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ @@ -371,9 +334,6 @@ patches/security/20130618/8001318-6_fixup.patch \ patches/security/20130618/8001330-improve_checking_order.patch \ patches/security/20130618/8003703-update_rmi_connection_dialog.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ - patches/openjdk/8007393.patch \ - patches/openjdk/8007611.patch \ patches/security/20130618/8004584-augment_applet_contextualization.patch \ patches/security/20130618/8005007-better_glyph_processing.patch \ patches/security/20130618/8006328-sound_class_robustness.patch \ @@ -435,7 +395,6 @@ if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ - patches/security/20130201/8001307.patch \ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ patches/security/20130416/8009699.patch \ @@ -603,7 +562,6 @@ patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ - patches/hotspot/$(HSBUILD)/arm-hsdis.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ @@ -631,9 +589,7 @@ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ - patches/openjdk/8004341-jck_dialog_failure.patch \ patches/pr1319-support_giflib_5.patch \ - patches/copy_memory.patch \ patches/openjdk/6718364-inference_failure.patch \ patches/openjdk/6682380-foreach_crash.patch \ patches/openjdk/7046929-fix_t6397104_test_failure.patch \ @@ -746,12 +702,11 @@ patches/pr696-zero-fast_aldc-hs20.patch \ patches/arm-debug.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ - patches/hotspot/original/fix_get_stack_bounds_leak.patch \ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ patches/hotspot/original/aarch64.patch \ - patches/hotspot/original/7022999-fastlocking_compiler1_only.patch + patches/hotspot/original/7022999-fastlocking_compiler1_only.patch \ + patches/hotspot/original/arm-hsdis.patch endif if WITH_RHINO diff -r 11f837636a0a -r 455071a8e0ec hotspot.map --- a/hotspot.map Thu Jul 11 23:43:09 2013 +0100 +++ b/hotspot.map Mon Jul 22 17:04:11 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0 +hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305 diff -r 11f837636a0a -r 455071a8e0ec patches/copy_memory.patch --- a/patches/copy_memory.patch Thu Jul 11 23:43:09 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -diff --git a/src/share/classes/sun/misc/Unsafe.java b/src/share/classes/sun/misc/Unsafe.java ---- openjdk/jdk/src/share/classes/sun/misc/Unsafe.java -+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java -@@ -504,9 +504,31 @@ - /** - * Sets all bytes in a given block of memory to a copy of another - * block. -+ * -+ *

This method determines each block's base address by means of two parameters, -+ * and so it provides (in effect) a double-register addressing mode, -+ * as discussed in {@link #getInt(Object,long)}. When the object reference is null, -+ * the offset supplies an absolute base address. -+ * -+ *

The transfers are in coherent (atomic) units of a size determined -+ * by the address and length parameters. If the effective addresses and -+ * length are all even modulo 8, the transfer takes place in 'long' units. -+ * If the effective addresses and length are (resp.) even modulo 4 or 2, -+ * the transfer takes place in units of 'int' or 'short'. - */ -- public native void copyMemory(long srcAddress, long destAddress, -+ public native void copyMemory(Object srcBase, long srcOffset, -+ Object destBase, long destOffset, - long bytes); -+ /** -+ * Sets all bytes in a given block of memory to a copy of another -+ * block. This provides a single-register addressing mode, -+ * as discussed in {@link #getInt(Object,long)}. -+ * -+ * Equivalent to copyMemory(null, srcAddress, null, destAddress, bytes). -+ */ -+ public void copyMemory(long srcAddress, long destAddress, long bytes) { -+ copyMemory(null, srcAddress, null, destAddress, bytes); -+ } - - /** - * Disposes of a block of native memory, as obtained from {@link diff -r 11f837636a0a -r 455071a8e0ec patches/ecj/override.patch --- a/patches/ecj/override.patch Thu Jul 11 23:43:09 2013 +0100 +++ b/patches/ecj/override.patch Mon Jul 22 17:04:11 2013 +0100 @@ -311,3 +311,54 @@ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); +diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java openjdk/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java +--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:24.027496931 +0000 ++++ openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:56.968026902 +0000 +@@ -1040,7 +1040,6 @@ + + targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(className); +@@ -1114,7 +1113,6 @@ + + javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction() { + +- @Override + public Void run() { + for (int i = 0; i < sig.length; i++) { + if (tracing) { +@@ -1203,7 +1201,6 @@ + final String className = opClassName; + targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(className); +@@ -1239,7 +1236,6 @@ + AccessControlContext stack = AccessController.getContext(); + Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction() { + +- @Override + public Object run() { + try { + ReflectUtil.checkPackageAccess(method.getDeclaringClass()); +@@ -1676,7 +1672,6 @@ + + Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(respType); +@@ -2854,7 +2849,6 @@ + + Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(className); diff -r 11f837636a0a -r 455071a8e0ec patches/hotspot/hs23/arm-hsdis.patch --- a/patches/hotspot/hs23/arm-hsdis.patch Thu Jul 11 23:43:09 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c ---- openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-11 23:08:47.000000000 +0000 -+++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-14 18:06:25.372022803 +0000 -@@ -35,6 +35,8 @@ - #include - #include - -+#include -+ - #ifndef bool - #define bool int - #define true 1 -@@ -356,7 +358,7 @@ - if (plen > mach_size) plen = mach_size; - strncpy(mach_option, p, plen); - mach_option[plen] = '\0'; -- } else if (plen > 6 && strncmp(p, "hsdis-", 6) == 0) { -+ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) { - // do not pass these to the next level - } else { - /* just copy it; {i386,sparc}-dis.c might like to see it */ -@@ -418,6 +420,9 @@ - #ifdef LIBARCH_sparcv9 - res = "sparc:v9b"; - #endif -+#ifdef LIBARCH_arm -+ res = "arm"; -+#endif - if (res == NULL) - res = "architecture not set in Makefile!"; - return res; -diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile ---- openjdk.orig/hotspot/src/share/tools/hsdis/Makefile 2013-02-11 23:08:47.000000000 +0000 -+++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2013-02-14 18:05:21.514998150 +0000 -@@ -68,14 +68,18 @@ - CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) - else - CPU = $(shell uname -m) -+ifneq ($(findstring arm,$(CPU)),) -+ARCH=arm -+else - ARCH1=$(CPU:x86_64=amd64) - ARCH=$(ARCH1:i686=i386) - CFLAGS/i386 += -m32 - CFLAGS/sparc += -m32 - CFLAGS/sparcv9 += -m64 - CFLAGS/amd64 += -m64 -+endif - CFLAGS += $(CFLAGS/$(ARCH)) --CFLAGS += -fPIC -+CFLAGS += -fPIC -g - OS = linux - LIB_EXT = .so - CC = gcc -@@ -118,7 +122,7 @@ - BINUTILSDIR = $(shell cd $(BINUTILS);pwd) - endif - --CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd -+CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd - CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" - - TARGET_DIR = build/$(OS)-$(JDKARCH) -@@ -145,7 +149,7 @@ - demo: $(TARGET) $(DEMO_TARGET) - - $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile -- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi -+ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi - - $(TARGET_DIR)/Makefile: - (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) diff -r 11f837636a0a -r 455071a8e0ec patches/hotspot/original/7197906-handle_32_bit_shifts.patch --- a/patches/hotspot/original/7197906-handle_32_bit_shifts.patch Thu Jul 11 23:43:09 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ ---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2012-09-13 21:22:37.897456500 +0200 -+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2012-09-13 21:22:34.345253300 +0200 -@@ -285,7 +285,7 @@ - }; - - static size_t power_to_cards_back(uint i) { -- return (size_t)(1 << (LogBase * i)); -+ return (size_t)1 << (LogBase * i); - } - static size_t power_to_words_back(uint i) { - return power_to_cards_back(i) * N_words; ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-09-13 21:22:37.901456800 +0200 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-09-13 21:22:34.354253900 +0200 -@@ -110,7 +110,7 @@ - #ifndef PRODUCT - bool CMBitMapRO::covers(ReservedSpace rs) const { - // assert(_bm.map() == _virtual_space.low(), "map inconsistency"); -- assert(((size_t)_bm.size() * (size_t)(1 << _shifter)) == _bmWordSize, -+ assert(((size_t)_bm.size() * ((size_t)1 << _shifter)) == _bmWordSize, - "size inconsistency"); - return _bmStartWord == (HeapWord*)(rs.base()) && - _bmWordSize == rs.size()>>LogHeapWordSize; ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-09-13 21:22:37.898456600 +0200 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-09-13 21:22:34.346253400 +0200 -@@ -273,7 +273,7 @@ - if (_max_fine_entries == 0) { - assert(_mod_max_fine_entries_mask == 0, "Both or none."); - size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries); -- _max_fine_entries = (size_t)(1 << max_entries_log); -+ _max_fine_entries = (size_t)1 << max_entries_log; - _mod_max_fine_entries_mask = _max_fine_entries - 1; - - assert(_fine_eviction_sample_size == 0 diff -r 11f837636a0a -r 455071a8e0ec patches/hotspot/original/fix_get_stack_bounds_leak.patch --- a/patches/hotspot/original/fix_get_stack_bounds_leak.patch Thu Jul 11 23:43:09 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -2650,6 +2650,8 @@ - ssize_t len = getline(&str, &dummy, f); - if (len == -1) { - fclose(f); -+ if (str != NULL) -+ free(str); - return false; - } - From ptisnovs at redhat.com Wed Jul 24 06:47:47 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 24 Jul 2013 09:47:47 -0400 (EDT) Subject: Reviewer needed: removing of patch 8013196-TimeZone_getDefault_throws_exception which broke tests Message-ID: <81188565.5627694.1374673667859.JavaMail.root@redhat.com> Hi all, the following patch: patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch were pushed into IcedTea6 HEAD as part of IcedTea7->IcedTea6 backport. Unfortunately this tests have broken JDK6 compatibility and should be removed. Diff created against IcedTea6 HEAD is stored in an attachment. ChangeLog entry: 2013-07-24 Pavel Tisnovsky * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: Removed, this patch have broken JDK6 compatibility. Can anybody please look at this change? Thank you in advance, Pavel -------------- next part -------------- A non-text attachment was scrubbed... Name: remove_8013196.diff Type: text/x-patch Size: 3266 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130724/d03e5896/remove_8013196.diff From andrew at icedtea.classpath.org Wed Jul 24 13:32:30 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:32:30 +0000 Subject: /hg/release/icedtea7-forest-2.4: 4 new changesets Message-ID: changeset da376fd5e4d6 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=da376fd5e4d6 author: katleman date: Thu Jun 27 13:58:19 2013 -0700 Added tag jdk7u40-b31 for changeset 58a2a470aa3b changeset 3fdfe7f1b063 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3fdfe7f1b063 author: katleman date: Wed Jul 03 16:36:24 2013 -0700 Added tag jdk7u40-b32 for changeset da376fd5e4d6 changeset a1ae13479e87 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a1ae13479e87 author: katleman date: Wed Jul 10 13:48:44 2013 -0700 Added tag jdk7u40-b33 for changeset 3fdfe7f1b063 changeset b5f2715442df in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b5f2715442df author: andrew date: Wed Jul 24 21:31:39 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 13 +++++++++++++ .jcheck/conf | 2 -- make/Defs-internal.gmk | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diffs (102 lines): diff -r 58a2a470aa3b -r b5f2715442df .hgtags --- a/.hgtags Fri Jun 21 19:00:10 2013 -0700 +++ b/.hgtags Wed Jul 24 21:31:39 2013 +0100 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -191,6 +197,7 @@ 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -258,6 +265,7 @@ c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint 745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 @@ -312,6 +320,7 @@ d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19 f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20 +30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0 41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21 3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22 8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23 @@ -322,3 +331,7 @@ ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28 dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29 1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30 +ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1 +58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31 +da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32 +3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 diff -r 58a2a470aa3b -r b5f2715442df .jcheck/conf --- a/.jcheck/conf Fri Jun 21 19:00:10 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 58a2a470aa3b -r b5f2715442df make/Defs-internal.gmk --- a/make/Defs-internal.gmk Fri Jun 21 19:00:10 2013 -0700 +++ b/make/Defs-internal.gmk Wed Jul 24 21:31:39 2013 +0100 @@ -322,7 +322,8 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ + STATIC_CXX=$(STATIC_CXX) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) From andrew at icedtea.classpath.org Wed Jul 24 13:32:39 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:32:39 +0000 Subject: /hg/release/icedtea7-forest-2.4/corba: 6 new changesets Message-ID: changeset c5f85903c49a in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c5f85903c49a author: katleman date: Thu Jun 27 13:58:24 2013 -0700 Added tag jdk7u40-b31 for changeset 3d2b811b8a79 changeset 7994dfd9e5df in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7994dfd9e5df author: katleman date: Wed Jul 03 16:36:25 2013 -0700 Added tag jdk7u40-b32 for changeset c5f85903c49a changeset f0d1f82028e7 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f0d1f82028e7 author: mfang date: Fri Jul 05 09:56:13 2013 -0700 8019541: 7u40 l10n resource file translation update Reviewed-by: robilad, naoto, yhuang changeset 1b7fbfdc31b8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1b7fbfdc31b8 author: mfang date: Fri Jul 05 10:00:24 2013 -0700 Merge changeset ddd543ddf330 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ddd543ddf330 author: katleman date: Wed Jul 10 13:48:45 2013 -0700 Added tag jdk7u40-b33 for changeset 1b7fbfdc31b8 changeset 74ca39d558e8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=74ca39d558e8 author: andrew date: Wed Jul 24 21:31:42 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 13 ++++++++++ .jcheck/conf | 2 - make/Makefile | 2 +- make/common/shared/Platform.gmk | 9 ++++++ src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties | 8 +++--- src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties | 2 +- src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp | 4 +- src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp | 4 +- src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp | 5 ++- 9 files changed, 35 insertions(+), 14 deletions(-) diffs (235 lines): diff -r 3d2b811b8a79 -r 74ca39d558e8 .hgtags --- a/.hgtags Fri Jun 21 19:00:26 2013 -0700 +++ b/.hgtags Wed Jul 24 21:31:42 2013 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -191,6 +197,7 @@ 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -258,6 +265,7 @@ 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 @@ -314,6 +322,7 @@ bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19 54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20 +47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0 fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21 e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22 d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23 @@ -324,3 +333,7 @@ c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28 1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29 651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30 +23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1 +3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31 +c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32 +1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33 diff -r 3d2b811b8a79 -r 74ca39d558e8 .jcheck/conf --- a/.jcheck/conf Fri Jun 21 19:00:26 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 3d2b811b8a79 -r 74ca39d558e8 make/Makefile --- a/make/Makefile Fri Jun 21 19:00:26 2013 -0700 +++ b/make/Makefile Wed Jul 24 21:31:42 2013 +0100 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r 3d2b811b8a79 -r 74ca39d558e8 make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Fri Jun 21 19:00:26 2013 -0700 +++ b/make/common/shared/Platform.gmk Wed Jul 24 21:31:42 2013 +0100 @@ -153,6 +153,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version mach := $(shell uname -m) + ifneq (,$(wildcard /usr/bin/dpkg-architecture)) + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + endif archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@ -169,6 +172,9 @@ arm*) \ echo arm \ ;; \ + sh*) \ + echo sh \ + ;; \ *) \ echo $(mach) \ ;; \ @@ -196,6 +202,9 @@ else ARCH_DATA_MODEL=64 endif + ifeq ($(ARCH), sh) + ARCH_DATA_MODEL=32 + endif endif endif diff -r 3d2b811b8a79 -r 74ca39d558e8 src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Fri Jun 21 19:00:26 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Wed Jul 24 21:31:42 2013 +0100 @@ -60,12 +60,12 @@ servertool.getserverid1=applicationName\u306E\u30B5\u30FC\u30D0\u30FCID\u3092\u8FD4\u3057\u307E\u3059 servertool.getserverid2=\tapplicationName {0}\u306E\u30B5\u30FC\u30D0\u30FCID\u306F{1}\u3067\u3059 -servertool.list=\n\t\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n +servertool.list=\n\tlist\n servertool.list1=\u767B\u9332\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 servertool.list2=\n\t\u30B5\u30FC\u30D0\u30FCID\t\u30B5\u30FC\u30D0\u30FC\u306E\u30AF\u30E9\u30B9\u540D\t\t\u30B5\u30FC\u30D0\u30FC\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\n\t---------\t----------------\t\t----------------------\n -servertool.listactive=\n\t\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 +servertool.listactive=\n\tlistactive servertool.listactive1=\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 -servertool.listappnames=\tapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n +servertool.listappnames=\tlistappnames\n servertool.listappnames1=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308BapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 servertool.listappnames2=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B5\u30FC\u30D0\u30FCapplicationNames: @@ -76,7 +76,7 @@ servertool.startserver1=\u767B\u9332\u3055\u308C\u305F\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u307E\u3059 servertool.startserver2=\t\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002 -servertool.quit=\n\t\u7D42\u4E86\u3057\u307E\u3059\n +servertool.quit=\n\tquit\n servertool.quit1=\u3053\u306E\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059 servertool.help=\thelp\n\t\u307E\u305F\u306F\n\thelp \n diff -r 3d2b811b8a79 -r 74ca39d558e8 src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties Fri Jun 21 19:00:26 2013 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties Wed Jul 24 21:31:42 2013 +0100 @@ -26,7 +26,7 @@ orbd.usage=\uC0AC\uC6A9\uBC95: {0} \n\n\uC5EC\uAE30\uC11C \uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -port ORBD\uAC00 \uC2DC\uC791\uB418\uC5B4\uC57C \uD558\uB294 \uD65C\uC131 \uD3EC\uD2B8\uB85C, \uAE30\uBCF8\uAC12\uC740 1049\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -defaultdb ORBD \uD30C\uC77C\uC758 \uB514\uB809\uD1A0\uB9AC\uB85C, \uAE30\uBCF8\uAC12\uC740 "./orb.db"\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -serverid ORBD\uC758 \uC11C\uBC84 ID\uB85C, \uAE30\uBCF8\uAC12\uC740 1 \uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n servertool.usage=\uC0AC\uC6A9\uBC95: {0} \n\n\uC5EC\uAE30\uC11C \uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n -servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624.\n +servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624. \n servertool.shorthelp=\n\n\t\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBA85\uB839: \n\t------------------- \n servertool.baddef=\uC798\uBABB\uB41C \uC11C\uBC84 \uC815\uC758: {0} servertool.nosuchserver=\t\uD574\uB2F9 \uC11C\uBC84\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. diff -r 3d2b811b8a79 -r 74ca39d558e8 src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Fri Jun 21 19:00:26 2013 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Wed Jul 24 21:31:42 2013 +0100 @@ -114,7 +114,7 @@ ParseException.badState=%0 (\u884C%1): %2\u306F\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u3067\u304D\u307E\u305B\u3093\u3002\u8907\u6570\u306E\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u89AA\u304C\u3042\u308A\u307E\u3059\u3002\n%3\n%4 ParseException.branchLabel=%0 (\u884C%1): case %2\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 ParseException.branchName=%0 (\u884C%1): %2\u3068\u3044\u3046\u540D\u524D\u306E\u5206\u5C90\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 -ParseException.duplicateInit=%0 (\u884C%1): \u521D\u671F\u5316\u5B50\u306B\u306F\u524D\u306E\u521D\u671F\u5316\u5B50\u3068\u540C\u3058\u7F72\u540D\u304C\u3042\u308A\u307E\u3059\u3002\n%2\n%3 +ParseException.duplicateInit=%0 (\u884C%1): \u521D\u671F\u5316\u5B50\u306B\u306F\u524D\u306E\u521D\u671F\u5316\u5B50\u3068\u540C\u3058\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u3042\u308A\u307E\u3059\u3002\n%2\n%3 ParseException.duplicateState=%0 (\u884C%1): \u30C7\u30FC\u30BF\u30FB\u30E1\u30F3\u30D0\u30FC%2\u306E\u540D\u524D\u304C\u524D\u306E\u30C7\u30FC\u30BF\u30FB\u30E1\u30F3\u30D0\u30FC\u3068\u540C\u3058\u3067\u3059\u3002\n%3\n%4 ParseException.elseNoIf=%0 (\u884C%1): \u4E00\u81F4\u3059\u308B#if\u304C\u306A\u3044#else\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%2\n%3 ParseException.endNoIf=%0 (\u884C%1): \u4E00\u81F4\u3059\u308B#if\u304C\u306A\u3044#endif\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%2\n%3 @@ -146,7 +146,7 @@ ParseException.stringTooLong=%0 (\u884C%1): "%2"\u306F%3\u6587\u5B57\u4EE5\u5185\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n%4\n%5 ParseException.syntax1=%0 (\u884C%1): `%2'\u304C\u5FC5\u8981\u3067\u3059\u304C\u3001`%3'\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%4\n%5 ParseException.syntax2=%0 (\u884C%1): %2\u306E1\u3064\u304C\u5FC5\u8981\u3067\u3059\u304C\u3001`%3'\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%4\n%5 -ParseException.unclosed=%0: \u30B3\u30E1\u30F3\u30C8\u3067\u4E88\u671F\u3057\u306A\u3044EOF\u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u3002 +ParseException.unclosed=%0: \u30B3\u30E1\u30F3\u30C8\u3067\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u3002 ParseException.undeclaredType=%0 (\u884C%1): %2\u306F\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044\u578B\u3067\u3059\u3002\n%3\n%4 ParseException.warning=%0 (\u884C%1): %2\n%3\n%4 ParseException.constExprType=%0 (\u884C%1): \u5B9A\u6570\u5F0F\u306E\u578B\u306F%2\u3067\u3059\u304C\u3001%3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n%4\n%5 diff -r 3d2b811b8a79 -r 74ca39d558e8 src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Fri Jun 21 19:00:26 2013 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Wed Jul 24 21:31:42 2013 +0100 @@ -64,7 +64,7 @@ # # Translator: Start Translating -Compile.parsing=\u6B63\u5728\u5BF9 %0 \u8FDB\u884C\u8BED\u6CD5\u5206\u6790 +Compile.parsing=\u6B63\u5728\u89E3\u6790 %0 Compile.parseDone=\u5B8C\u6210 - %0 Compile.generating=\u6B63\u5728\u751F\u6210 %0 Compile.genDone=\u5B8C\u6210 - %0 @@ -165,7 +165,7 @@ Token.endOfFile=EOF Token.unknown=? Util.cantCreatePkg=\u65E0\u6CD5\u521B\u5EFA\u7A0B\u5E8F\u5305%0\u3002 -Version.product=IDL \u8BED\u6CD5\u5206\u6790\u5668\u6846\u67B6, \u7248\u672C "%0" +Version.product=IDL \u89E3\u6790\u5668\u6846\u67B6, \u7248\u672C "%0" Version.number=3.2 default=\u9519\u8BEF! \u8BF7\u6C42\u4E86\u4E0D\u5B58\u5728\u7684\u6D88\u606F\u3002\u6D88\u606F\u6587\u4EF6\u672A\u5305\u542B\u5173\u952E\u5B57: %0\u3002 diff -r 3d2b811b8a79 -r 74ca39d558e8 src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Fri Jun 21 19:00:26 2013 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Wed Jul 24 21:31:42 2013 +0100 @@ -53,7 +53,7 @@ # toJavaProlog1=%0\u306B\u3088\u3063\u3066\u751F\u6210\u3055\u308C\u307E\u3057\u305F toJavaProlog2=%0\u304B\u3089 -PreEmit.indeterminateTypeInfo=%0\u306E\u30BF\u30A4\u30D7\u60C5\u5831\u3092\u5224\u65AD\u3067\u304D\u307E\u305B\u3093\u3002 +PreEmit.indeterminateTypeInfo=%0\u306E\u30BF\u30A4\u30D7\u60C5\u5831\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093\u3002 InterfaceGen.noImpl=%0\u306E\u30ED\u30FC\u30AB\u30EB\u5B9F\u88C5\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 Version.product=IDL-to-Java\u30B3\u30F3\u30D1\u30A4\u30E9(\u30DD\u30FC\u30BF\u30D6\u30EB)\u3001\u30D0\u30FC\u30B8\u30E7\u30F3"%0" Version.number=3.2 @@ -65,4 +65,5 @@ # -d, -emitAll, -f, -i, -keep, -m, -sep, -pkgPrefix, -td, -v, -verbose, -version, -implbase # Do not translate the string "java com.sun.tools.corba.se.idl.toJavaPortable.Compile" # -usage=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u4F7F\u7528\u65B9\u6CD5:\n\n java com.sun.tools.corba.se.idl.toJavaPortable.Compile [options] \n\n\u306FIDL\u5B9A\u7FA9\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u3067\u3001\n[options]\u306F\u6B21\u306B\u30EA\u30B9\u30C8\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n\u7701\u7565\u53EF\u80FD\u3067\u3001\u4EFB\u610F\u306E\u9806\u5E8F\u3067\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u306F\u5FC5\u9808\u3067\u3001\n\u6700\u5F8C\u306B\u8868\u793A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n \n\u30AA\u30D7\u30B7\u30E7\u30F3:\n-d IDL\u30D5\u30A1\u30A4\u30EB\u306E\u6B21\u306E\u884C\u3068\n \u540C\u3058\u3067\u3059: #define \n-emitAll #included\u30D5\u30A1\u30A4\u30EB\u3067\u898B\u3064\u304B\u3063\u305F\u30BF\u30A4\u30D7\u3092\u542B\u3080\u3001\u3059\u3079\u3066\u306E\u30BF\u30A4\u30D7\u3092\u767A\u884C\u3057\u307E\u3059\u3002\n-f \u767A\u884C\u3059\u308B\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u5B9A\u7FA9\u3057\u307E\u3059\u3002\u306Fclient\u3001\n server\u3001all\u3001serverTIE\u3001allTIE\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002serverTIE\u3068allTIE\u306F\n \u59D4\u4EFB\u30E2\u30C7\u30EB\u30FB\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u767A\u884C\u3057\u307E\u3059\u3002\u3053\u306E\u30D5\u30E9\u30B0\u3092\n \u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u3001-fclient\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\n-i \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\n \u30B9\u30AD\u30E3\u30F3\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u5225\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n-keep \u751F\u6210\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3059\u3067\u306B\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u3001\u4E0A\u66F8\u304D\n \u3057\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\n-noWarn \u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059\u3002\n-oldImplBase \u53E4\u3044(1.4\u4EE5\u524D) JDK ORB\u3068\u4E92\u63DB\u6027\u306E\u3042\u308B\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n-pkgPrefix \u30D5\u30A1\u30A4\u30EB\u30FB\u30B9\u30B3\u30FC\u30D7\u3067\u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n \u306B\u5BFE\u3057\u3066\u751F\u6210\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306EJava\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u3092\n \u3067\u59CB\u3081\u307E\u3059\u3002\n-pkgTranslate \u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n \u751F\u6210\u3055\u308C\u305FJava\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u3067\u306B\u7F6E\u63DB\u3055\u308C\u307E\u3059\u3002pkgPrefix\u306E\n \u5909\u66F4\u304C\u5148\u306B\u884C\u308F\u308C\u308B\u3053\u3068\u306B\u6CE8\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n \u6B63\u5F0F\u540D\u3068\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u307E\u305F\u3001\u3092\n org\u3001org.omg\u307E\u305F\u306Forg.omg\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n-skeletonName \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066\u30B9\u30B1\u30EB\u30C8\u30F3\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\n \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F%POA (-fserver\u307E\u305F\u306F-fall) \n oldImplBase\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F_%ImplBase\n (-oldImplBase\u304A\u3088\u3073(-fserver\u307E\u305F\u306F-fall))\u3002\n-td \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u304B\u308F\u308A\u306B\u3092\n \u4F7F\u7528\u3057\u307E\u3059\u3002\n-tieName \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066tie\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA tie\u306E\u5834\u5408\u306F%POATie (-fserverTie\u307E\u305F\u306F-fallTie) \n oldImplBase tie\u306E\u5834\u5408\u306F%_Tie\n (-oldImplBase\u304A\u3088\u3073(-fserverTie\u307E\u305F\u306F-fallTie))\u3002\n-v, -verbose \u8A73\u7D30\u30E2\u30FC\u30C9\u3002\n-version \u30D0\u30FC\u30B8\u30E7\u30F3\u756A\u53F7\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n +usage=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u4F7F\u7528\u65B9\u6CD5:\n\n java com.sun.tools.corba.se.idl.toJavaPortable.Compile [options] \n\n\u306FIDL\u5B9A\u7FA9\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u3067\u3001\n[options]\u306F\u6B21\u306B\u30EA\u30B9\u30C8\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n\u7701\u7565\u53EF\u80FD\u3067\u3001\u4EFB\u610F\u306E\u9806\u5E8F\u3067\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u306F\u5FC5\u9808\u3067\u3001\n\u6700\u5F8C\u306B\u8868\u793A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n \n\u30AA\u30D7\u30B7\u30E7\u30F3:\n-d IDL\u30D5\u30A1\u30A4\u30EB\u306E\u6B21\u306E\u884C\u3068\n \u540C\u3058\u3067\u3059: #define \n-emitAll #included\u30D5\u30A1\u30A4\u30EB\u3067\u898B\u3064\u304B\u3063\u305F\u30BF\u30A4\u30D7\u3092\u542B\u3080\u3001\u3059\u3079\u3066\u306E\u30BF\u30A4\u30D7\u3092\u767A\u884C\u3057\u307E\u3059\u3002\n-f \u767A\u884C\u3059\u308B\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u5B9A\u7FA9\u3057\u307E\u3059\u3002\u306Fclient\u3001\n server\u3001all\u3001serverTIE\u3001allTIE\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002serverTIE\u3068allTIE\u306F\n \u59D4\u4EFB\u30E2\u30C7\u30EB\u30FB\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u767A\u884C\u3057\u307E\u3059\u3002\u3053\u306E\u30D5\u30E9\u30B0\u3092\n \u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u3001-fclient\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\n-i \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\n \u30B9\u30AD\u30E3\u30F3\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u5225\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n-keep \u751F\u6210\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3059\u3067\u306B\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u3001\u4E0A\u66F8\u304D\n \u3057\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\n-noWarn \u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059\u3002\n-oldImplBase \u53E4\u3044(1.4\u4EE5\u524D) JDK ORB\u3068\u4E92\u63DB\u6027\u306E\u3042\u308B\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n-pkgPrefix \u30D5\u30A1\u30A4\u30EB\u30FB\u30B9\u30B3\u30FC\u30D7\u3067\u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n \u306B\u5BFE\u3057\u3066\u751F\u6210\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306EJava\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u3092\n \u3067\u59CB\u3081\u307E\u3059\u3002\n-pkgTranslate \u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n \u751F\u6210\u3055\u308C\u305FJava\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u3067\u306B\u7F6E\u63DB\u3055\u308C\u307E\u3059\u3002pkgPrefix\u306E\n \u5909\u66F4\u304C\u5148\u306B\u884C\u308F\u308C\u308B\u3053\u3068\u306B\u6CE8\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n \u6B63\u5F0F\u540D\u3068\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u307E\u305F\u3001\u3092\n \ +org\u3001org.omg\u307E\u305F\u306Forg.omg\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n-skeletonName \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066\u30B9\u30B1\u30EB\u30C8\u30F3\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\n \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F%POA (-fserver\u307E\u305F\u306F-fall) \n oldImplBase\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F_%ImplBase\n (-oldImplBase\u304A\u3088\u3073(-fserver\u307E\u305F\u306F-fall))\u3002\n-td \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u304B\u308F\u308A\u306B\u3092\n \u4F7F\u7528\u3057\u307E\u3059\u3002\n-tieName \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066tie\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA tie\u306E\u5834\u5408\u306F%POATie (-fserverTie\u307E\u305F\u306F-fallTie) \n oldImplBase tie\u306E\u5834\u5408\u306F%_Tie\n (-oldImplBase\u304A\u3088\u3073(-fserverTie\u307E\u305F\u306F-fallTie))\u3002\n-v, -verbose \u8A73\u7D30\u30E2\u30FC\u30C9\u3002\n-version \u30D0\u30FC\u30B8\u30E7\u30F3\u756A\u53F7\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n From andrew at icedtea.classpath.org Wed Jul 24 13:32:59 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:32:59 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxp: 9 new changesets Message-ID: changeset 75bb397c4ae2 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=75bb397c4ae2 author: katleman date: Thu Jun 27 13:58:37 2013 -0700 Added tag jdk7u40-b31 for changeset 5b31380e2e0b changeset 06851832b1bb in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=06851832b1bb author: katleman date: Wed Jul 03 16:36:34 2013 -0700 Added tag jdk7u40-b32 for changeset 75bb397c4ae2 changeset 5ede168e9229 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5ede168e9229 author: joehw date: Tue Jul 02 16:39:11 2013 -0700 8016133: Regression: diff. behavior with user-defined SAXParser Reviewed-by: chegar, dfuchs, alanb changeset ce771024e07d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ce771024e07d author: lana date: Thu Jul 04 10:31:11 2013 -0700 Merge changeset b6590dd14864 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b6590dd14864 author: katleman date: Wed Jul 10 13:48:56 2013 -0700 Added tag jdk7u40-b33 for changeset ce771024e07d changeset 4149e4abea17 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4149e4abea17 author: joehw date: Wed Jul 10 15:08:19 2013 -0700 8016648: FEATURE_SECURE_PROCESSING set to true or false causes SAXParseException to be thrown Summary: jaxp 1.5 feature update Reviewed-by: alanb, dfuchs, lancea changeset 0a6c9143f0b6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0a6c9143f0b6 author: joehw date: Fri Jul 12 15:01:23 2013 -0700 8020430: NullPointerException in xml sqe nightly result on 2013-07-12 Reviewed-by: chegar, lancea changeset 23ba797b9e78 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=23ba797b9e78 author: lana date: Tue Jul 16 11:03:40 2013 -0700 Merge changeset 7d8341df70fe in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7d8341df70fe author: andrew date: Wed Jul 24 21:31:46 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 13 + .jcheck/conf | 2 - src/com/sun/org/apache/xalan/internal/XalanConstants.java | 45 +- src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java | 16 +- src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java | 192 ++++++++++ src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java | 56 +- src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java | 25 +- src/com/sun/org/apache/xerces/internal/impl/Constants.java | 47 +- src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java | 38 +- src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 29 +- src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 28 +- src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java | 21 +- src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java | 11 +- src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java | 34 +- src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java | 64 ++- src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java | 43 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java | 4 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java | 9 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java | 49 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java | 28 +- src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java | 12 + src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java | 23 + src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java | 24 +- src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java | 16 +- src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java | 190 +++++++++ src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java | 31 +- src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java | 14 +- src/org/xml/sax/helpers/XMLReaderFactory.java | 7 +- 28 files changed, 769 insertions(+), 302 deletions(-) diffs (truncated from 2059 to 500 lines): diff -r 5b31380e2e0b -r 7d8341df70fe .hgtags --- a/.hgtags Fri Jun 21 19:01:06 2013 -0700 +++ b/.hgtags Wed Jul 24 21:31:46 2013 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -191,6 +197,7 @@ 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -258,6 +265,7 @@ 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint 23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 @@ -314,6 +322,7 @@ 331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19 c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19 5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20 +7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0 d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21 d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22 0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23 @@ -324,3 +333,7 @@ 9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28 740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29 09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30 +5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1 +5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31 +75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32 +ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33 diff -r 5b31380e2e0b -r 7d8341df70fe .jcheck/conf --- a/.jcheck/conf Fri Jun 21 19:01:06 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 5b31380e2e0b -r 7d8341df70fe src/com/sun/org/apache/xalan/internal/XalanConstants.java --- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java Fri Jun 21 19:01:06 2013 -0700 +++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java Wed Jul 24 21:31:46 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -73,45 +73,19 @@ * Default value when FEATURE_SECURE_PROCESSING (FSP) is set to true */ public static final String EXTERNAL_ACCESS_DEFAULT_FSP = ""; - /** - * JDK version by which the default is to restrict external connection - */ - public static final int RESTRICT_BY_DEFAULT_JDK_VERSION = 8; + /** * FEATURE_SECURE_PROCESSING (FSP) is false by default */ - public static final String EXTERNAL_ACCESS_DEFAULT = getExternalAccessDefault(false); + public static final String EXTERNAL_ACCESS_DEFAULT = ACCESS_EXTERNAL_ALL; + + public static final String XML_SECURITY_PROPERTY_MANAGER = + ORACLE_JAXP_PROPERTY_PREFIX + "xmlSecurityPropertyManager"; /** - * Determine the default value of the external access properties - * - * jaxp 1.5 does not require implementations to restrict by default - * - * For JDK8: - * The default value is 'file' (including jar:file); The keyword "all" grants permission - * to all protocols. When {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} is on, - * the default value is an empty string indicating no access is allowed. - * - * For JDK7: - * The default value is 'all' granting permission to all protocols. If by default, - * {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} is true, it should - * not change the default value. However, if {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} - * is set explicitly, the values of the properties shall be set to an empty string - * indicating no access is allowed. - * - * @param isSecureProcessing indicating if Secure Processing is set - * @return default value + * Check if we're in jdk8 or above */ - public static String getExternalAccessDefault(boolean isSecureProcessing) { - String defaultValue = "all"; - if (isJDKandAbove(RESTRICT_BY_DEFAULT_JDK_VERSION)) { - defaultValue = "file"; - if (isSecureProcessing) { - defaultValue = EXTERNAL_ACCESS_DEFAULT_FSP; - } - } - return defaultValue; - } + public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8); /* * Check the version of the current JDK against that specified in the @@ -125,7 +99,7 @@ * @return true if the current version is the same or above that represented * by the parameter */ - public static boolean isJDKandAbove(int compareTo) { + public static boolean isJavaVersionAtLeast(int compareTo) { String javaVersion = SecuritySupport.getSystemProperty("java.version"); String versions[] = javaVersion.split("\\.", 3); if (Integer.parseInt(versions[0]) >= compareTo || @@ -134,5 +108,4 @@ } return false; } - } // class Constants diff -r 5b31380e2e0b -r 7d8341df70fe src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java --- a/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Fri Jun 21 19:01:06 2013 -0700 +++ b/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Wed Jul 24 21:31:46 2013 +0100 @@ -229,7 +229,8 @@ * @return the name of the protocol if rejected, null otherwise */ public static String checkAccess(String systemId, String allowedProtocols, String accessAny) throws IOException { - if (systemId == null || allowedProtocols.equalsIgnoreCase(accessAny)) { + if (systemId == null || (allowedProtocols != null && + allowedProtocols.equalsIgnoreCase(accessAny))) { return null; } @@ -262,6 +263,9 @@ * @return true if the protocol is in the list */ private static boolean isProtocolAllowed(String protocol, String allowedProtocols) { + if (allowedProtocols == null) { + return false; + } String temp[] = allowedProtocols.split(","); for (String t : temp) { t = t.trim(); @@ -273,18 +277,16 @@ } /** - * Read from $java.home/lib/jaxp.properties for the specified property + * Read JAXP system property in this order: system property, + * $java.home/lib/jaxp.properties if the system property is not specified * * @param propertyId the Id of the property * @return the value of the property */ - public static String getDefaultAccessProperty(String sysPropertyId, String defaultVal) { - String accessExternal = SecuritySupport.getSystemProperty(sysPropertyId); + public static String getJAXPSystemProperty(String sysPropertyId) { + String accessExternal = getSystemProperty(sysPropertyId); if (accessExternal == null) { accessExternal = readJAXPProperty(sysPropertyId); - if (accessExternal == null) { - accessExternal = defaultVal; - } } return accessExternal; } diff -r 5b31380e2e0b -r 7d8341df70fe src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java Wed Jul 24 21:31:46 2013 +0100 @@ -0,0 +1,192 @@ +/* + * Copyright (c) 2013 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.org.apache.xalan.internal.utils; + + +import com.sun.org.apache.xalan.internal.XalanConstants; +import javax.xml.XMLConstants; + +/** + * This class manages security related properties + * + */ +public final class XMLSecurityPropertyManager { + + /** + * States of the settings of a property, in the order: default value, value + * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system + * properties, and jaxp api properties + */ + public static enum State { + //this order reflects the overriding order + DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY + } + + /** + * Limits managed by the security manager + */ + public static enum Property { + ACCESS_EXTERNAL_DTD(XMLConstants.ACCESS_EXTERNAL_DTD, + XalanConstants.EXTERNAL_ACCESS_DEFAULT), + ACCESS_EXTERNAL_STYLESHEET(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, + XalanConstants.EXTERNAL_ACCESS_DEFAULT); + + final String name; + final String defaultValue; + + Property(String name, String value) { + this.name = name; + this.defaultValue = value; + } + + public boolean equalsName(String propertyName) { + return (propertyName == null) ? false : name.equals(propertyName); + } + + String defaultValue() { + return defaultValue; + } + } + + + /** + * Values of the properties as defined in enum Properties + */ + private final String[] values; + /** + * States of the settings for each property in Properties above + */ + private State[] states = {State.DEFAULT, State.DEFAULT}; + + /** + * Default constructor. Establishes default values + */ + public XMLSecurityPropertyManager() { + values = new String[Property.values().length]; + for (Property property : Property.values()) { + values[property.ordinal()] = property.defaultValue(); + } + //read system properties or jaxp.properties + readSystemProperties(); + } + + /** + * Set the value for a specific property. + * + * @param property the property + * @param state the state of the property + * @param value the value of the property + */ + public void setValue(Property property, State state, String value) { + //only update if it shall override + if (state.compareTo(states[property.ordinal()]) >= 0) { + values[property.ordinal()] = value; + states[property.ordinal()] = state; + } + } + + /** + * Set the value of a property by its index + * @param index the index of the property + * @param state the state of the property + * @param value the value of the property + */ + public void setValue(int index, State state, String value) { + //only update if it shall override + if (state.compareTo(states[index]) >= 0) { + values[index] = value; + states[index] = state; + } + } + /** + * Return the value of the specified property + * + * @param property the property + * @return the value of the property + */ + public String getValue(Property property) { + return values[property.ordinal()]; + } + + /** + * Return the value of a property by its ordinal + * @param index the index of a property + * @return value of a property + */ + public String getValueByIndex(int index) { + return values[index]; + } + + /** + * Get the index by property name + * @param propertyName property name + * @return the index of the property if found; return -1 if not + */ + public int getIndex(String propertyName){ + for (Property property : Property.values()) { + if (property.equalsName(propertyName)) { + //internally, ordinal is used as index + return property.ordinal(); + } + } + return -1; + } + + /** + * Read from system properties, or those in jaxp.properties + */ + private void readSystemProperties() { + getSystemProperty(Property.ACCESS_EXTERNAL_DTD, + XalanConstants.SP_ACCESS_EXTERNAL_DTD); + getSystemProperty(Property.ACCESS_EXTERNAL_STYLESHEET, + XalanConstants.SP_ACCESS_EXTERNAL_STYLESHEET); + } + + /** + * Read from system properties, or those in jaxp.properties + * + * @param property the property + * @param systemProperty the name of the system property + */ + private void getSystemProperty(Property property, String systemProperty) { + try { + String value = SecuritySupport.getSystemProperty(systemProperty); + if (value != null) { + values[property.ordinal()] = value; + states[property.ordinal()] = State.SYSTEMPROPERTY; + return; + } + + value = SecuritySupport.readJAXPProperty(systemProperty); + if (value != null) { + values[property.ordinal()] = value; + states[property.ordinal()] = State.JAXPDOTPROPERTIES; + } + } catch (NumberFormatException e) { + //invalid setting ignored + } + } +} diff -r 5b31380e2e0b -r 7d8341df70fe src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java --- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Fri Jun 21 19:01:06 2013 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Wed Jul 24 21:31:46 2013 +0100 @@ -74,6 +74,9 @@ import com.sun.org.apache.xalan.internal.utils.ObjectFactory; import com.sun.org.apache.xalan.internal.utils.FactoryImpl; import com.sun.org.apache.xalan.internal.utils.SecuritySupport; +import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager; +import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property; +import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.State; import org.xml.sax.InputSource; import org.xml.sax.XMLFilter; @@ -228,11 +231,13 @@ * protocols allowed for external references set by the stylesheet processing instruction, Import and Include element. */ private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT; + /** * protocols allowed for external DTD references in source file and/or stylesheet. */ private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT; + private XMLSecurityPropertyManager _xmlSecurityPropertyMgr; /** * javax.xml.transform.sax.TransformerFactory implementation. @@ -249,16 +254,16 @@ this.m_DTMManagerClass = XSLTCDTMManager.getDTMManagerClass(useServicesMechanism); this._useServicesMechanism = useServicesMechanism; - String defaultAccess = XalanConstants.EXTERNAL_ACCESS_DEFAULT; if (System.getSecurityManager() != null) { _isSecureMode = true; _isNotSecureProcessing = false; - defaultAccess = XalanConstants.getExternalAccessDefault(true); } - _accessExternalStylesheet = SecuritySupport.getDefaultAccessProperty( - XalanConstants.SP_ACCESS_EXTERNAL_STYLESHEET, defaultAccess); - _accessExternalDTD = SecuritySupport.getDefaultAccessProperty( - XalanConstants.SP_ACCESS_EXTERNAL_DTD, defaultAccess); + + _xmlSecurityPropertyMgr = new XMLSecurityPropertyManager(); + _accessExternalDTD = _xmlSecurityPropertyMgr.getValue( + Property.ACCESS_EXTERNAL_DTD); + _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue( + Property.ACCESS_EXTERNAL_STYLESHEET); } /** @@ -318,11 +323,10 @@ else return Boolean.FALSE; } - else if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) { - return _accessExternalStylesheet; - } - else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) { - return _accessExternalDTD; + + int index = _xmlSecurityPropertyMgr.getIndex(name); + if (index > -1) { + return _xmlSecurityPropertyMgr.getValueByIndex(index); } // Throw an exception for all other attributes @@ -424,12 +428,15 @@ return; } } - else if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) { - _accessExternalStylesheet = (String)value; - return; - } - else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) { - _accessExternalDTD = (String)value; + + int index = _xmlSecurityPropertyMgr.getIndex(name); + if (index > -1) { + _xmlSecurityPropertyMgr.setValue(index, + State.APIPROPERTY, (String)value); + _accessExternalDTD = _xmlSecurityPropertyMgr.getValue( + Property.ACCESS_EXTERNAL_DTD); + _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue( + Property.ACCESS_EXTERNAL_STYLESHEET); return; } @@ -476,11 +483,18 @@ } _isNotSecureProcessing = !value; From andrew at icedtea.classpath.org Wed Jul 24 13:33:22 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:33:22 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxws: 4 new changesets Message-ID: changeset 83a688927f16 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=83a688927f16 author: katleman date: Thu Jun 27 13:58:40 2013 -0700 Added tag jdk7u40-b31 for changeset f500fd46c18b changeset 3ceef25a8cdd in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=3ceef25a8cdd author: katleman date: Wed Jul 03 16:36:36 2013 -0700 Added tag jdk7u40-b32 for changeset 83a688927f16 changeset 1ef33d25dd8c in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1ef33d25dd8c author: katleman date: Wed Jul 10 13:48:57 2013 -0700 Added tag jdk7u40-b33 for changeset 3ceef25a8cdd changeset 92dab5233b50 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=92dab5233b50 author: andrew date: Wed Jul 24 21:31:48 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 13 ++++++++++ .jcheck/conf | 2 - src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diffs (107 lines): diff -r f500fd46c18b -r 92dab5233b50 .hgtags --- a/.hgtags Fri Jun 21 19:01:22 2013 -0700 +++ b/.hgtags Wed Jul 24 21:31:48 2013 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -191,6 +197,7 @@ f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -258,6 +265,7 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 @@ -314,6 +322,7 @@ 82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19 dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20 +426b7a73ab43aca754c19dc21497ae90c147f91a icedtea-2.4.0 97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21 6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22 e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23 @@ -324,3 +333,7 @@ 016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28 15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29 2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30 +c0e48fdfb6959d4024f49e99321d368810d2d7ef icedtea-2.4.1 +f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31 +83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32 +3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33 diff -r f500fd46c18b -r 92dab5233b50 .jcheck/conf --- a/.jcheck/conf Fri Jun 21 19:01:22 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r f500fd46c18b -r 92dab5233b50 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Fri Jun 21 19:01:22 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Jul 24 21:31:48 2013 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { From andrew at icedtea.classpath.org Wed Jul 24 13:33:31 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:33:31 +0000 Subject: /hg/release/icedtea7-forest-2.4/langtools: 8 new changesets Message-ID: changeset c99780d6201b in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c99780d6201b author: katleman date: Thu Jun 27 13:58:54 2013 -0700 Added tag jdk7u40-b31 for changeset 9c343668b0a9 changeset 06285eb8d755 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=06285eb8d755 author: vromero date: Wed Jun 26 10:56:28 2013 +0100 8015668: overload resolution: performance regression in JDK 7 Reviewed-by: jjg changeset 056f998e75f8 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=056f998e75f8 author: lana date: Fri Jun 28 10:04:05 2013 -0700 Merge changeset 7a45e1dd8665 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7a45e1dd8665 author: katleman date: Wed Jul 03 16:36:45 2013 -0700 Added tag jdk7u40-b32 for changeset 056f998e75f8 changeset e9244bf15bfd in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e9244bf15bfd author: mfang date: Fri Jul 05 09:57:26 2013 -0700 8019541: 7u40 l10n resource file translation update Reviewed-by: robilad, naoto, yhuang changeset e36d8f754801 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e36d8f754801 author: mfang date: Fri Jul 05 10:34:21 2013 -0700 Merge changeset 08c5065870ef in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=08c5065870ef author: katleman date: Wed Jul 10 13:49:08 2013 -0700 Added tag jdk7u40-b33 for changeset e36d8f754801 changeset f3ef419fe842 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f3ef419fe842 author: andrew date: Wed Jul 24 21:32:17 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 13 +++++ .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties | 3 +- src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties | 4 +- src/share/classes/com/sun/tools/javac/comp/Resolve.java | 23 +++++---- src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties | 24 +++++----- src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties | 6 +- src/share/classes/com/sun/tools/javac/resources/javac_ja.properties | 6 +- src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties | 2 +- src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties | 4 +- 13 files changed, 58 insertions(+), 38 deletions(-) diffs (411 lines): diff -r 9c343668b0a9 -r f3ef419fe842 .hgtags --- a/.hgtags Fri Jun 21 19:03:21 2013 -0700 +++ b/.hgtags Wed Jul 24 21:32:17 2013 +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 @@ -314,6 +322,7 @@ 5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19 e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19 86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20 +cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0 c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21 eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22 e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23 @@ -324,3 +333,7 @@ 9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28 bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29 0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30 +91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1 +9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31 +056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32 +e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33 diff -r 9c343668b0a9 -r f3ef419fe842 .jcheck/conf --- a/.jcheck/conf Fri Jun 21 19:03:21 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 9c343668b0a9 -r f3ef419fe842 make/Makefile --- a/make/Makefile Fri Jun 21 19:03:21 2013 -0700 +++ b/make/Makefile Wed Jul 24 21:32:17 2013 +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 9c343668b0a9 -r f3ef419fe842 make/build.properties --- a/make/build.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/make/build.properties Wed Jul 24 21:32:17 2013 +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 task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 9c343668b0a9 -r f3ef419fe842 make/build.xml --- a/make/build.xml Fri Jun 21 19:03:21 2013 -0700 +++ b/make/build.xml Wed Jul 24 21:32:17 2013 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed Jul 24 21:32:17 2013 +0100 @@ -221,7 +221,8 @@ doclet.Serialization.Excluded_Class=\u5E38\u99D0\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306F\u3001\u9664\u5916\u3055\u308C\u305F\u30AF\u30E9\u30B9{0}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002 doclet.Serialization.Nonexcluded_Class=\u5E38\u99D0\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306F\u3001\u975E\u8868\u793A\u306E\u3001\u542B\u307E\u308C\u306A\u3044\u30AF\u30E9\u30B9{0}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002 doclet.exception_encountered={1}\u306E\u51E6\u7406\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n{0} -doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n-d \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n-use \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n-version @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-author @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-docfilessubdirs doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n-splitindex 1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n-windowtitle \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n-doctitle \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n-header \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n-footer \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n-top \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-bottom \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-link \u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n-linkoffline \u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n-excludedocfilessubdir :.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n-group :.. \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n-nocomment \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n-nodeprecated @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-noqualifier ::... \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n-nosince @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-notimestamp \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n-nodeprecatedlist \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n-notree \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n-noindex \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n-nohelp \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n-nonavbar \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n-serialwarn @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n-tag ::
\u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n-taglet \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n-tagletpath \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n-Xdocrootparent \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B3\u30E1\u30F3\u30C8\u5185\u306E at docRoot(\u3053\u306E\u5F8C\u306B\u306F/..\u304C\u7D9A\u304F)\u306E\u3059\u3079\u3066\u306E\u51FA\u73FE\u7B87\u6240\u3092\u3067\u7F6E\u63DB\u3059\u308B\n-charset \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n-helpfile \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-linksource HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n-sourcetab \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n-keywords HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n-stylesheetfile \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n-docencoding \u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D +doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n-d \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n-use \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n-version @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-author @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-docfilessubdirs doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n-splitindex 1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n-windowtitle \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n-doctitle \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n-header \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n-footer \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n-top \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-bottom \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-link \u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n-linkoffline \u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n-excludedocfilessubdir :.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n-group :.. \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n-nocomment \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n-nodeprecated @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-noqualifier ::... \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n-nosince @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-notimestamp \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n-nodeprecatedlist \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n-notree \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n-noindex \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n-nohelp \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n-nonavbar \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n-serialwarn @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n-tag ::
\u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n-taglet \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n-tagletpath \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n-Xdocrootparent \ + \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B3\u30E1\u30F3\u30C8\u5185\u306E at docRoot(\u3053\u306E\u5F8C\u306B\u306F/..\u304C\u7D9A\u304F)\u306E\u3059\u3079\u3066\u306E\u51FA\u73FE\u7B87\u6240\u3092\u3067\u7F6E\u63DB\u3059\u308B\n-charset \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n-helpfile \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-linksource HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n-sourcetab \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n-keywords HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n-stylesheetfile \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n-docencoding \u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D diff -r 9c343668b0a9 -r f3ef419fe842 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 Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Wed Jul 24 21:32:17 2013 +0100 @@ -180,6 +180,6 @@ doclet.0_and_1={0}\u548C{1} #Documentation for Enums -doclet.enum_values_doc=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n
\nfor ({0} c : {0}.values())\n    System.out.println(c);\n
\n@\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4 +doclet.enum_values_doc=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n
\nfor ({0} c : {0}.values())\n    System.out.println(c);\n
\n at return \u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4 -doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26\u5B8C\u5168\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n at param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException +doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26\u5B8C\u5168\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n at param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n at return \u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n at throws \u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n at throws \u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/javac/comp/Resolve.java --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Jul 24 21:32:17 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, 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 @@ -48,6 +48,7 @@ import java.util.Set; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; /** Helper class for name resolution, used mostly by the attribution phase. * @@ -306,11 +307,11 @@ } /** Try to instantiate the type of a method so that it fits - * given type arguments and argument types. If succesful, return + * given type arguments and argument types. If successful, return * the method's instantiated type, else return null. * The instantiation will take into account an additional leading * formal parameter if the method is an instance method seen as a member - * of un underdetermined site In this case, we treat site as an additional + * of an undetermined site In this case, we treat site as an additional * parameter and the parameters of the class containing the method as * additional type variables that get instantiated. * @@ -2121,7 +2122,7 @@ */ class InapplicableSymbolsError extends ResolveError { - private List candidates = List.nil(); + private Set candidates = new LinkedHashSet(); InapplicableSymbolsError(Symbol sym) { super(WRONG_MTHS, "inapplicable symbols"); @@ -2135,7 +2136,7 @@ Name name, List argtypes, List typeargtypes) { - if (candidates.nonEmpty()) { + if (!candidates.isEmpty()) { JCDiagnostic err = diags.create(dkind, log.currentSource(), pos, @@ -2153,24 +2154,26 @@ //where List candidateDetails(Type site) { List details = List.nil(); - for (Candidate c : candidates) + for (Candidate c : candidates) { details = details.prepend(c.getDiagnostic(site)); + } return details.reverse(); } Symbol addCandidate(MethodResolutionPhase currentStep, Symbol sym, JCDiagnostic details) { Candidate c = new Candidate(currentStep, sym, details); - if (c.isValid() && !candidates.contains(c)) - candidates = candidates.append(c); + if (c.isValid() && !candidates.contains(c)) { + candidates.add(c); + } return this; } void clear() { - candidates = List.nil(); + candidates.clear(); } private Name getName() { - Symbol sym = candidates.head.sym; + Symbol sym = candidates.iterator().next().sym; return sym.name == names.init ? sym.owner.name : sym.name; diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Wed Jul 24 21:32:17 2013 +0100 @@ -175,7 +175,7 @@ compiler.err.wrong.target.for.polymorphic.signature.definition=MethodHandle API\u306E\u4F5C\u6210\u306B\u306F-target 7\u30E9\u30F3\u30BF\u30A4\u30E0\u4EE5\u4E0A\u304C\u5FC5\u8981\u3067\u3059\u3002\u73FE\u5728\u306F-target {0}\u3067\u3059 # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused -compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059 +compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CD\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059 compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F at interface\u30E1\u30F3\u30D0\u30FC\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059 @@ -401,7 +401,7 @@ compiler.err.native.meth.cant.have.body=native\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: type -compiler.err.neither.conditional.subtype=?\u306B\u5BFE\u3059\u308B\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B : \u3069\u3061\u3089\u3082\u4ED6\u65B9\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n2\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {0}\n3\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {1} +compiler.err.neither.conditional.subtype=?\u306B\u5BFE\u3059\u308B\u4E0D\u9069\u5408\u306A\u578B : \u3069\u3061\u3089\u3082\u4ED6\u65B9\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n2\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {0}\n3\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {1} compiler.err.new.not.allowed.in.annotation=''new''\u306F\u6CE8\u91C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 @@ -445,7 +445,7 @@ # Errors related to annotation processing # 0: symbol, 1: string, 2: stack-trace -compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2} +compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2} # 0: symbol, 1: string compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1} @@ -500,9 +500,9 @@ compiler.err.ret.outside.meth=\u30E1\u30BD\u30C3\u30C9\u306E\u5916\u306Ereturn\u6587\u3067\u3059 -compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059 +compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C{0}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u4E0D\u9069\u5408\u306A\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059 -compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059 +compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C{0}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u4E0D\u9069\u5408\u306A\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059 # 0: symbol, 1: symbol, 2: symbol compiler.err.does.not.override.abstract={0}\u306Fabstract\u3067\u306A\u304F\u3001{2}\u5185\u306Eabstract\u30E1\u30BD\u30C3\u30C9{1}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093 @@ -539,7 +539,7 @@ compiler.err.type.var.more.than.once.in.result=\u578B\u5909\u6570{0}\u306F{1}\u306E\u578B\u30672\u56DE\u4EE5\u4E0A\u51FA\u73FE\u3057\u307E\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3055\u308C\u306A\u3044\u307E\u307E\u306B\u306F\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: type, 2: string -compiler.err.types.incompatible.diff.ret=\u578B{0}\u3068\u578B{1}\u306E\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u4E21\u65B9\u3068\u3082{2}\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059 +compiler.err.types.incompatible.diff.ret=\u578B{0}\u3068\u578B{1}\u304C\u9069\u5408\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u4E21\u65B9\u3068\u3082{2}\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059 compiler.err.unclosed.char.lit=\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093 @@ -564,7 +564,7 @@ compiler.err.invalid.inferred.types={0}\u306E\u63A8\u5B9A\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1} # 0: message segment, 1: unused -compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093 +compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093 # 0: message segment, 1: message segment compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1} @@ -778,7 +778,7 @@ ## ## All warning messages are preceded by the following string. -compiler.warn.warning=\u8B66\u544A: +compiler.warn.warning=\u8B66\u544A: ## Warning messages may also include the following prefix to identify a ## lint option @@ -957,7 +957,7 @@ compiler.warn.diamond.redundant.args=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002 # 0: type, 1: type -compiler.warn.diamond.redundant.args.1=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002\n\u660E\u793A\u7684: {0}\n\u63A8\u5B9A: {1} +compiler.warn.diamond.redundant.args.1=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002\n\u660E\u793A\u7684: {0}\n\u63A8\u8AD6: {1} # 0: symbol, 1: message segment compiler.warn.varargs.redundant.trustme.anno={0}\u6CE8\u91C8\u304C\u5197\u9577\u3067\u3059\u3002{1} @@ -1035,7 +1035,7 @@ ## The following are all possible strings for the second argument ({1}) of the ## above strings. -compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059 +compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059 #0: symbol, 1: symbol compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1} @@ -1049,7 +1049,7 @@ compiler.misc.bad.const.pool.tag.at=\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30BF\u30B0{1}\u3067\u306E{0}\u304C\u4E0D\u6B63\u3067\u3059 -compiler.misc.bad.signature=\u30B7\u30B0\u30CB\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059 +compiler.misc.bad.signature=\u30B7\u30B0\u30CD\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059 compiler.misc.class.file.wrong.class=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4E0D\u6B63\u306A\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u3059 @@ -1154,7 +1154,7 @@ compiler.misc.no.unique.minimal.instance.exists=\u578B\u5909\u6570{0}(\u4E0B\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5C0F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093 # 0: type, 1: list of type -compiler.misc.incompatible.upper.bounds=\u63A8\u6E2C\u306E\u5909\u6570{0}\u306B\u306F\u3001\u9069\u5408\u3057\u306A\u3044\u4E0A\u9650{1}\u304C\u3042\u308A\u307E\u3059 +compiler.misc.incompatible.upper.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u4E0A\u9650{1}\u304C\u3042\u308A\u307E\u3059 # 0: list of type, 1: type, 2: type compiler.misc.infer.no.conforming.instance.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001{1}\u306F{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Wed Jul 24 21:32:17 2013 +0100 @@ -735,10 +735,10 @@ compiler.misc.verbose.checking.attribution=[\u6B63\u5728\u68C0\u67E5{0}] # 0: string -compiler.misc.verbose.parsing.done=[\u8BED\u6CD5\u5206\u6790\u5DF2\u5B8C\u6210, \u7528\u65F6 {0} \u6BEB\u79D2] +compiler.misc.verbose.parsing.done=[\u89E3\u6790\u5DF2\u5B8C\u6210, \u7528\u65F6 {0} \u6BEB\u79D2] # 0: file name -compiler.misc.verbose.parsing.started=[\u8BED\u6CD5\u5206\u6790\u5F00\u59CB\u65F6\u95F4 {0}] +compiler.misc.verbose.parsing.started=[\u89E3\u6790\u5F00\u59CB\u65F6\u95F4 {0}] # 0: string compiler.misc.verbose.total=[\u5171 {0} \u6BEB\u79D2] @@ -1002,7 +1002,7 @@ # 0: token, 1: token, 2: token compiler.err.expected3=\u9700\u8981{0}, {1}\u6216{2} -compiler.err.premature.eof=\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u5DF2\u5230\u8FBE\u6587\u4EF6\u7ED3\u5C3E +compiler.err.premature.eof=\u89E3\u6790\u65F6\u5DF2\u5230\u8FBE\u6587\u4EF6\u7ED3\u5C3E ## The following are related in form, but do not easily fit the above paradigm. compiler.err.dot.class.expected=\u9700\u8981 ''.class'' diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/javac/resources/javac_ja.properties --- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed Jul 24 21:32:17 2013 +0100 @@ -117,11 +117,11 @@ javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection(http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002 -javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n +javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n -javac.msg.proc.annotation.uncaught.exception=\n\n\u6CE8\u91C8\u51E6\u7406\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n +javac.msg.proc.annotation.uncaught.exception=\n\n\u6CE8\u91C8\u51E6\u7406\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n -javac.msg.resource=\n\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n +javac.msg.resource=\n\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n javac.version={0} {1} javac.fullVersion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}" diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties --- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Wed Jul 24 21:32:17 2013 +0100 @@ -27,7 +27,7 @@ main.error=\u30A8\u30E9\u30FC{0}\u500B main.warnings=\u8B66\u544A{0}\u500B main.warning=\u8B66\u544A{0}\u500B -main.usage=\u4F7F\u7528\u65B9\u6CD5: javadoc [options] [packagenames] [sourcefiles] [@files]\n-overview HTML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6982\u8981\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u8FBC\u3080\n-public public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u793A\u3059\n-protected protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n-package package/protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n-private \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n-help \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3059\u308B\n-doclet \u4EE3\u66FFdoclet\u3092\u4ECB\u3057\u3066\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n-docletpath doclet\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u63A2\u3059\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n-sourcepath \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n-classpath \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n-exclude \u9664\u5916\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u6307\u5B9A\u3059\u308B\n-subpackages \u518D\u5E30\u7684\u306B\u30ED\u30FC\u30C9\u3059\u308B\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3059\u308B\n-breakiterator BreakIterator\u3067\u6700\u521D\u306E\u6587\u3092\u8A08\u7B97\u3059\u308B\n-bootclasspath \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u306B\u3088\u308A\u30ED\u30FC\u30C9\u3055\u308C\u305F\n\t\t\t \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n-source \u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u4FDD\u3064\n-extdirs \u62E1\u5F35\u6A5F\u80FD\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n-verbose Javadoc\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n-locale en_US\u3084en_US_WIN\u306A\u3069\u306E\u4F7F\u7528\u3059\u308B\u30ED\u30B1\u30FC\u30EB\n-encoding \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D\n-quiet \u72B6\u614B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044\n-J \u3092\u5B9F\u884C\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059\n-X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3059\u308B\n +main.usage=\u4F7F\u7528\u65B9\u6CD5: javadoc [options] [packagenames] [sourcefiles] [@files]\n-overview HTML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6982\u8981\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u8FBC\u3080\n-public public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u793A\u3059\n-protected protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n-package package/protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n-private \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n-help \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3059\u308B\n-doclet \u4EE3\u66FFdoclet\u3092\u4ECB\u3057\u3066\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n-docletpath doclet\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u63A2\u3059\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n-sourcepath \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n-classpath \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n-exclude \u9664\u5916\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u6307\u5B9A\u3059\u308B\n-subpackages \u518D\u5E30\u7684\u306B\u30ED\u30FC\u30C9\u3059\u308B\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3059\u308B\n-breakiterator BreakIterator\u3067\u6700\u521D\u306E\u6587\u3092\u8A08\u7B97\u3059\u308B\n-bootclasspath \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u306B\u3088\u308A\u30ED\u30FC\u30C9\u3055\u308C\u305F\n\t\t\t \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n-source \u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u63D0\u4F9B\u3059\u308B\n-extdirs \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n-verbose Javadoc\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n-locale en_US\u3084en_US_WIN\u306A\u3069\u306E\u4F7F\u7528\u3059\u308B\u30ED\u30B1\u30FC\u30EB\n-encoding \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D\n-quiet \u72B6\u614B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044\n-J \u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059\n-X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3059\u308B\n main.Xusage=-Xmaxerrs \u51FA\u529B\u3059\u308B\u30A8\u30E9\u30FC\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n-Xmaxwarns \u51FA\u529B\u3059\u308B\u8B66\u544A\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n\n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002 main.option.already.seen={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8907\u6570\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002 main.requires_argument=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002 diff -r 9c343668b0a9 -r f3ef419fe842 src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties --- a/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Fri Jun 21 19:03:21 2013 -0700 +++ b/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Wed Jul 24 21:32:17 2013 +0100 @@ -33,10 +33,10 @@ old.jni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-old\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 old.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-old\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 old.not.supported=\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306Ejavah\u3067\u306F\u30AA\u30D7\u30B7\u30E7\u30F3-old\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -invalid.method.signature=\u7121\u52B9\u306A\u30E1\u30BD\u30C3\u30C9\u30FB\u30B7\u30B0\u30CB\u30C1\u30E3: {0} +invalid.method.signature=\u7121\u52B9\u306A\u30E1\u30BD\u30C3\u30C9\u30FB\u30B7\u30B0\u30CD\u30C1\u30E3: {0} jni.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 jni.no.stubs=JNI\u306F\u30B9\u30BF\u30D6\u3092\u5FC5\u8981\u3068\u3057\u307E\u305B\u3093\u3002JNI\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -jni.sigerror={0}\u306E\u7F72\u540D\u3092\u5224\u5B9A\u3067\u304D\u307E\u305B\u3093 +jni.sigerror={0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093 dir.file.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-d\u3068-o\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 From andrew at icedtea.classpath.org Wed Jul 24 13:33:46 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:33:46 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: 51 new changesets Message-ID: changeset 8c0bb41c24b2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8c0bb41c24b2 author: katleman date: Thu Jun 27 13:58:29 2013 -0700 Added tag jdk7u40-b31 for changeset 645b68762a36 changeset 0125094eb636 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0125094eb636 author: amurillo date: Fri Jun 21 18:55:50 2013 -0700 8017252: new hotspot build - hs24-b51 Reviewed-by: jcoomes changeset 707635752c58 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=707635752c58 author: ehelin date: Sat Jun 22 10:42:14 2013 +0200 8016734: Remove extra code due to duplicated push Reviewed-by: brutisso, tschatzl changeset 913ce96aaa86 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=913ce96aaa86 author: ehelin date: Sat Jun 22 14:16:32 2013 +0200 Merge changeset c0643ff8feb5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c0643ff8feb5 author: adlertz date: Fri Jun 14 01:19:56 2013 +0200 8016157: During CTW: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block Summary: Disable rematerialization for negD node Reviewed-by: kvn, roland changeset 76e9dce17c31 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=76e9dce17c31 author: johnc date: Mon Jun 24 10:40:10 2013 -0700 8015237: Parallelize string table scanning during strong root processing Summary: Parallelize the scanning of the intern string table by having each GC worker claim a given number of buckets. Changes were also reviewed by Per Liden . Reviewed-by: tschatzl, stefank, twisti changeset 7c945fe9f388 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7c945fe9f388 author: johnc date: Mon Jun 24 10:45:58 2013 -0700 Merge changeset b986e7953c87 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b986e7953c87 author: johnc date: Mon Jun 24 14:27:22 2013 -0700 Merge changeset 7dd0c5a45d07 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7dd0c5a45d07 author: tschatzl date: Tue Jun 25 09:55:01 2013 +0200 8016740: assert in GC_locker from PSOldGen::expand with -XX:+PrintGCDetails and Verbose Summary: Use GC_locker::is_active_and_needs_gc() instead of GC_locker::is_active() for providing information about the reason of heap expansion. Reviewed-by: johnc, tamao changeset 3500f22d989d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3500f22d989d author: morris date: Tue Jun 25 11:32:33 2013 -0700 8013546: compiler/8011901/Test8011901.java fails with CompilationError: Compilation failed Summary: Remove JDK8 specific test Reviewed-by: kvn changeset 1122b46889b9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1122b46889b9 author: adlertz date: Wed Jun 26 00:40:13 2013 +0200 8017510: Add a regression test for 8005956 Summary: Regression test for 8005956 Reviewed-by: kvn, twisti changeset 8805ca77133d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8805ca77133d author: egahlin date: Wed Jun 26 17:02:04 2013 +0200 8016331: Minor issues in event tracing metadata Reviewed-by: stefank, brutisso, mgronlun changeset 43f92d82c553 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=43f92d82c553 author: mgronlun date: Wed Jun 26 17:48:12 2013 +0200 Merge changeset c1130faa6248 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c1130faa6248 author: adlertz date: Mon Jun 24 07:28:54 2013 +0200 8001345: VM crashes with assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc Summary: Remove unnecessary LoadN / DecodeN nodes at MemBarAcquire nodes. Reviewed-by: kvn, roland changeset f460d2390c02 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f460d2390c02 author: kvn date: Wed Jun 26 12:52:52 2013 -0700 Merge changeset dcb233d6bfad in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dcb233d6bfad author: brutisso date: Wed Jun 26 13:09:02 2013 +0200 8013791: G1: G1CollectorPolicy::initialize_flags() may set min_alignment > max_alignment Summary: Make sure max alignemnt is at least as large as min alignment Reviewed-by: johnc, jmasa, tschatzl changeset 785a9733f507 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=785a9733f507 author: brutisso date: Wed Jun 26 04:20:25 2013 -0700 Merge changeset a6a52b788186 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a6a52b788186 author: brutisso date: Wed Jun 26 16:05:29 2013 -0700 Merge changeset 91f2a56579c2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=91f2a56579c2 author: zgu date: Tue Jun 25 17:22:04 2013 -0400 8017478: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites Summary: Fixed possible NULL pointer that caused SIGSEGV Reviewed-by: coleenp, acorn, ctornqvi changeset b1e9bbeb81f3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b1e9bbeb81f3 author: zgu date: Wed Jun 26 20:21:16 2013 -0700 Merge changeset ad5bb04f36f5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ad5bb04f36f5 author: kvn date: Fri May 31 13:54:47 2013 -0700 8015441: runThese crashed with assert(opcode == Op_ConP || opcode == Op_ThreadLocal || opcode == Op_CastX2P ..) failed: sanity Summary: Relax the assert to accept any raw ptr types. Reviewed-by: roland changeset 2417fa1acf2b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2417fa1acf2b author: amurillo date: Fri Jun 28 00:44:12 2013 -0700 Merge changeset 9658c969b7cf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9658c969b7cf author: amurillo date: Fri Jun 28 00:44:13 2013 -0700 Added tag hs24-b51 for changeset 2417fa1acf2b changeset 67131c21181a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=67131c21181a author: katleman date: Wed Jul 03 16:36:28 2013 -0700 Added tag jdk7u40-b32 for changeset 9658c969b7cf changeset 4ebc4781f877 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4ebc4781f877 author: amurillo date: Fri Jun 28 00:52:15 2013 -0700 8019298: new hotspot build - hs24-b52 Reviewed-by: jcoomes changeset 973c3ede4866 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=973c3ede4866 author: brutisso date: Thu Jun 27 09:59:59 2013 +0200 8017483: G1 tests fail with native OOME on Solaris x86 after HeapBaseMinAddress has been increased Summary: Set HeapBaseMinAddress as default rather than ergo Reviewed-by: stefank, jmasa, kvn changeset 1dad4752d5f7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1dad4752d5f7 author: brutisso date: Fri Jun 28 14:25:25 2013 +0200 Merge changeset 12019d9953a8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=12019d9953a8 author: brutisso date: Sat Jun 29 01:23:27 2013 +0200 Merge changeset 9a72ee84e61b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9a72ee84e61b author: tamao date: Tue Jul 02 15:08:27 2013 -0700 7122222: GC log is limited to 2G for 32-bit Summary: Manual backport to hsx24 from hsx25: Enable large file support for generated 32-bit ostream.o on Linux and Solaris (as only the two need this) by setting -D_FILE_OFFSET_BITS=64 in compilation Reviewed-by: dcubed, jcoomes changeset b68a2c45f554 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b68a2c45f554 author: johnc date: Mon Jul 01 09:30:23 2013 -0700 8017070: G1: assert(_card_counts[card_num] <= G1ConcRSHotCardLimit) failed Summary: The assert is invalid when a card is being refined by two different threads and its count crosses the hot threshold - the refinement count will be updated once by each thread triggering the assert. Remove the assert and update the count using a bounded expression. Reviewed-by: jmasa, tamao, brutisso changeset 15706a73a506 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=15706a73a506 author: amurillo date: Thu Jul 04 03:19:49 2013 -0700 Merge changeset 0b9149d22ee0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0b9149d22ee0 author: amurillo date: Thu Jul 04 03:19:50 2013 -0700 Added tag hs24-b52 for changeset 15706a73a506 changeset 23eed087177a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=23eed087177a author: katleman date: Wed Jul 10 13:48:49 2013 -0700 Added tag jdk7u40-b33 for changeset 0b9149d22ee0 changeset b29fc5f70d65 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b29fc5f70d65 author: amurillo date: Thu Jul 04 03:38:59 2013 -0700 8019933: new hotspot build - hs24-b53 Reviewed-by: jcoomes changeset dd7d57bcd749 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dd7d57bcd749 author: ehelin date: Tue Jul 09 10:03:28 2013 +0200 8017588: SA: jstack -l throws UnalignedAddressException while attaching to core file for java that was started with CMS GC Reviewed-by: allwin, jiangli, tschatzl, dholmes changeset 1478a623482d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1478a623482d author: zgu date: Thu Jul 04 06:24:08 2013 -0400 8016074: NMT: assertion failed: assert(thread->thread_state() == from) failed: coming from wrong thread state Summary: Uses os::NakedYield() on Solaris instead of os::yield_all() Reviewed-by: acorn, coleenp, hseigel changeset 1331bffeb46e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1331bffeb46e author: adlertz date: Tue Jul 09 17:20:32 2013 +0200 8019625: Test compiler/8005956/PolynomialRoot.java timeouts on Solaris SPARCs Summary: Disable the test for SPARC and reduce the number of test iterations Reviewed-by: kvn changeset 25a649574b3b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=25a649574b3b author: kvn date: Tue Jul 09 17:45:10 2013 -0700 Merge changeset c4a8806c0302 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c4a8806c0302 author: dholmes date: Tue Jul 09 21:05:44 2013 -0400 8012144: multiple SIGSEGVs fails on staxf Summary: Missing fence in taskQueue lock-free code on some platforms Reviewed-by: dholmes, kvn, shade, johnc, goetz Contributed-by: Axel Siebenborn changeset 0d7106aa7e08 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0d7106aa7e08 author: dholmes date: Tue Jul 09 21:16:38 2013 -0400 Merge changeset fc4858327ae8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fc4858327ae8 author: dholmes date: Wed Jul 10 00:15:41 2013 -0400 Merge changeset 7bfdc3edfe1a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7bfdc3edfe1a author: jprovino date: Fri Jul 05 10:18:53 2013 -0400 8011064: Some tests have failed with SIGSEGV on arm-hflt on build b82 Summary: NMT_detail doesn't work on ARM because of missing frame pointers. Reviewed-by: dholmes, zgu changeset 3a41a31ecbd7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3a41a31ecbd7 author: vladidan date: Tue Jul 09 14:10:33 2013 -0400 Merge changeset f4d7fb7ba02e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f4d7fb7ba02e author: vladidan date: Tue Jul 09 16:49:37 2013 -0400 Merge changeset c30107a847a3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c30107a847a3 author: vladidan date: Wed Jul 10 10:24:00 2013 -0400 Merge changeset 6fa8cb2866c0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6fa8cb2866c0 author: dcubed date: Wed Jul 10 13:42:15 2013 -0700 8015884: runThese crashed with SIGSEGV, hs_err has an error instead of stacktrace Summary: Dl_info struct should only be used if dladdr() has returned non-zero (no errors) and always check the dladdr() return value; Dl_info.dli_sname and Dl_info.dli_saddr fields should only be used if non-NULL; update/improve runtime/6888954/vmerrors.sh test Reviewed-by: dsamersoff, zgu, hseigel, coleenp changeset c0b13febbf45 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c0b13febbf45 author: zgu date: Tue Jul 09 13:18:16 2013 -0400 8011760: assert(delta != 0) failed: dup pointer in MemBaseline::malloc_sort_by_addr Summary: Some of qsort implementation on Linux x86 compares element to itself, which is mistakenly treated as duplicate pointer Reviewed-by: dcubed, acorn changeset cd8439e6d2d6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cd8439e6d2d6 author: zgu date: Thu Jul 11 04:47:12 2013 +0200 Merge changeset 1118c5d38ac0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1118c5d38ac0 author: amurillo date: Thu Jul 11 06:25:24 2013 -0700 Merge changeset 1274c4750118 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1274c4750118 author: amurillo date: Thu Jul 11 06:25:25 2013 -0700 Added tag hs24-b53 for changeset 1118c5d38ac0 changeset 71498f89324b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=71498f89324b author: andrew date: Wed Jul 24 21:31:53 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 16 + .jcheck/conf | 2 - agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/libproc.h | 29 +- agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java | 30 +- make/hotspot_version | 2 +- make/linux/makefiles/adlc.make | 2 + make/linux/makefiles/buildtree.make | 2 + make/linux/makefiles/defs.make | 52 +- make/linux/makefiles/gcc.make | 30 +- make/linux/makefiles/jsig.make | 6 +- make/linux/makefiles/rules.make | 10 - make/linux/makefiles/saproc.make | 6 +- make/linux/makefiles/vm.make | 66 +- make/linux/makefiles/zero.make | 4 + make/linux/platform_zero.in | 2 +- make/solaris/makefiles/adlc.make | 6 +- make/solaris/makefiles/dtrace.make | 16 + make/solaris/makefiles/gcc.make | 4 +- make/solaris/makefiles/jsig.make | 4 + make/solaris/makefiles/rules.make | 10 - make/solaris/makefiles/saproc.make | 4 + make/solaris/makefiles/vm.make | 17 + make/windows/makefiles/vm.make | 8 + src/cpu/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +- src/os/bsd/vm/os_bsd.cpp | 195 +- src/os/linux/vm/os_linux.cpp | 125 +- src/os/solaris/vm/os_solaris.cpp | 227 +- src/os/solaris/vm/os_solaris.inline.hpp | 6 +- src/os/windows/vm/os_windows.cpp | 49 +- src/os/windows/vm/os_windows.hpp | 6 +- src/os/windows/vm/os_windows.inline.hpp | 8 +- src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +- src/share/vm/adlc/formssel.cpp | 9 + src/share/vm/adlc/formssel.hpp | 1 + src/share/vm/asm/codeBuffer.hpp | 2 +- src/share/vm/ci/ciTypeFlow.cpp | 2 +- src/share/vm/classfile/symbolTable.cpp | 39 +- src/share/vm/classfile/symbolTable.hpp | 17 +- src/share/vm/classfile/systemDictionary.cpp | 1 - src/share/vm/compiler/methodLiveness.cpp | 12 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 10 +- src/share/vm/gc_implementation/g1/g1CardCounts.cpp | 7 +- src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 3 +- src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +- src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +- src/share/vm/memory/collectorPolicy.cpp | 12 +- src/share/vm/memory/sharedHeap.cpp | 25 +- src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +- src/share/vm/oops/instanceKlass.hpp | 17 +- src/share/vm/opto/escape.cpp | 2 +- src/share/vm/opto/memnode.cpp | 21 +- src/share/vm/prims/jni.cpp | 18 +- src/share/vm/prims/jvmtiEnv.cpp | 3 + src/share/vm/runtime/arguments.cpp | 13 +- src/share/vm/runtime/globals.hpp | 2 +- src/share/vm/runtime/os.cpp | 3 + src/share/vm/runtime/os.hpp | 10 +- src/share/vm/runtime/vmStructs.cpp | 1 + src/share/vm/services/memBaseline.cpp | 2 +- src/share/vm/services/memReporter.cpp | 46 +- src/share/vm/services/memTracker.cpp | 11 +- src/share/vm/services/memTracker.hpp | 14 + src/share/vm/shark/sharkCompiler.cpp | 4 +- src/share/vm/trace/trace.dtd | 3 - src/share/vm/trace/trace.xml | 12 +- src/share/vm/trace/traceEventClasses.xsl | 2 +- src/share/vm/trace/traceEventIds.xsl | 2 +- src/share/vm/trace/traceTypes.xsl | 2 +- src/share/vm/utilities/bitMap.hpp | 2 +- src/share/vm/utilities/debug.cpp | 19 +- src/share/vm/utilities/debug.hpp | 4 +- src/share/vm/utilities/globalDefinitions.hpp | 8 + src/share/vm/utilities/ostream.cpp | 2 +- src/share/vm/utilities/taskqueue.hpp | 11 +- src/share/vm/utilities/vmError.cpp | 10 +- test/compiler/8005956/PolynomialRoot.java | 783 ++++++++++ test/compiler/8011901/Test8011901.java | 68 - test/gc/g1/TestRegionAlignment.java | 36 + test/runtime/6888954/vmerrors.sh | 23 +- test/runtime/7020373/GenOOMCrashClass.java | 157 ++ test/runtime/7020373/Test7020373.sh | 4 + test/runtime/7020373/testcase.jar | Bin 85 files changed, 1910 insertions(+), 527 deletions(-) diffs (truncated from 4171 to 500 lines): diff -r 645b68762a36 -r 71498f89324b .hgtags --- a/.hgtags Fri Jun 21 18:46:08 2013 -0700 +++ b/.hgtags Wed Jul 24 21:31:53 2013 +0100 @@ -50,6 +50,7 @@ faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 +b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 @@ -87,6 +88,7 @@ 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 +a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 @@ -160,6 +162,7 @@ b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 +591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 @@ -182,6 +185,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 +7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 @@ -210,6 +214,7 @@ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21 +f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04 @@ -264,6 +269,7 @@ f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 +a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01 @@ -311,6 +317,7 @@ cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17 +354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09 @@ -440,6 +447,7 @@ 4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09 +6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint 7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29 181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10 4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30 @@ -489,6 +497,7 @@ c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20 d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39 3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40 +ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0 3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21 d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41 aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22 @@ -509,3 +518,10 @@ 88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49 24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30 41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50 +5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1 +645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31 +2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51 +9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32 +15706a73a506943059a6bbf59e2ec8866a026114 hs24-b52 +0b9149d22ee08fe13b4f198ff258a1348e27b8b2 jdk7u40-b33 +1118c5d38ac0693d98f913485ceb3c57366cfbab hs24-b53 diff -r 645b68762a36 -r 71498f89324b .jcheck/conf --- a/.jcheck/conf Fri Jun 21 18:46:08 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 645b68762a36 -r 71498f89324b agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Fri Jun 21 18:46:08 2013 -0700 +++ b/agent/src/os/linux/Makefile Wed Jul 24 21:31:53 2013 +0100 @@ -23,7 +23,12 @@ # ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) -GCC = gcc + +ifndef BUILD_GCC +BUILD_GCC = gcc +endif + +GCC = $(BUILD_GCC) JAVAH = ${JAVA_HOME}/bin/javah @@ -40,7 +45,7 @@ LIBS = -lthread_db -CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64 +CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64 LIBSA = $(ARCH)/libsaproc.so @@ -73,7 +78,7 @@ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) test.o: test.c - $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c + $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r 645b68762a36 -r 71498f89324b agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Fri Jun 21 18:46:08 2013 -0700 +++ b/agent/src/os/linux/libproc.h Wed Jul 24 21:31:53 2013 +0100 @@ -41,9 +41,34 @@ These two files define pt_regs structure differently */ #ifdef _LP64 -#include "asm-sparc64/ptrace.h" +struct pt_regs { + unsigned long u_regs[16]; /* globals and ins */ + unsigned long tstate; + unsigned long tpc; + unsigned long tnpc; + unsigned int y; + + /* We encode a magic number, PT_REGS_MAGIC, along + * with the %tt (trap type) register value at trap + * entry time. The magic number allows us to identify + * accurately a trap stack frame in the stack + * unwinder, and the %tt value allows us to test + * things like "in a system call" etc. for an arbitray + * process. + * + * The PT_REGS_MAGIC is chosen such that it can be + * loaded completely using just a sethi instruction. + */ + unsigned int magic; +}; #else -#include "asm-sparc/ptrace.h" +struct pt_regs { + unsigned long psr; + unsigned long pc; + unsigned long npc; + unsigned long y; + unsigned long u_regs[16]; /* globals and ins */ +}; #endif #endif //sparc or sparcv9 diff -r 645b68762a36 -r 71498f89324b agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java --- a/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Fri Jun 21 18:46:08 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Wed Jul 24 21:31:53 2013 +0100 @@ -89,6 +89,7 @@ genericSignature = type.getAddressField("_generic_signature"); majorVersion = new CIntField(type.getCIntegerField("_major_version"), Oop.getHeaderSize()); minorVersion = new CIntField(type.getCIntegerField("_minor_version"), Oop.getHeaderSize()); + miscFlags = new CIntField(type.getCIntegerField("_misc_flags"), Oop.getHeaderSize()); headerSize = alignObjectOffset(Oop.getHeaderSize() + type.getSize()); // read field offset constants @@ -147,6 +148,16 @@ private static AddressField genericSignature; private static CIntField majorVersion; private static CIntField minorVersion; + private static CIntField miscFlags; + + private static final long MISC_REWRITTEN = 1 << 0; // methods rewritten. + private static final long MISC_HAS_NONSTATIC_FIELDS = 1 << 1; // for sizing with UseCompressedOops + private static final long MISC_SHOULD_VERIFY_CLASS = 1 << 1; // allow caching of preverification + private static final long MISC_IS_ANONYMOUS = 1 << 3; // has embedded _inner_classes field + + public boolean isAnonymous() { + return (miscFlags.getValue(this) & MISC_IS_ANONYMOUS) != 0; + } // type safe enum for ClassState from instanceKlass.hpp public static class ClassState { @@ -799,9 +810,22 @@ public long getObjectSize() { - long bodySize = alignObjectOffset(getVtableLen() * getHeap().getOopSize()) - + alignObjectOffset(getItableLen() * getHeap().getOopSize()) - + (getNonstaticOopMapSize()) * getHeap().getOopSize(); + final long oopSize = getHeap().getOopSize(); + + long vtableSize = alignObjectOffset(getVtableLen() * oopSize); + long itableSize = alignObjectOffset(getItableLen() * oopSize); + + long nonStaticOopMapSizeBytes = getNonstaticOopMapSize() * oopSize; + long alignedNonStaticOopMapSize = isInterface() || isAnonymous() ? + alignObjectOffset(nonStaticOopMapSizeBytes) : + nonStaticOopMapSizeBytes; + + long interfaceImplementorSize = isInterface() ? oopSize : 0; + long hostKlassSize = isAnonymous() ? oopSize : 0; + + long bodySize = vtableSize + itableSize + nonStaticOopMapSizeBytes + + interfaceImplementorSize + hostKlassSize; + return alignObjectSize(headerSize + bodySize); } diff -r 645b68762a36 -r 71498f89324b make/hotspot_version --- a/make/hotspot_version Fri Jun 21 18:46:08 2013 -0700 +++ b/make/hotspot_version Wed Jul 24 21:31:53 2013 +0100 @@ -35,7 +35,7 @@ HS_MAJOR_VER=24 HS_MINOR_VER=0 -HS_BUILD_NUMBER=50 +HS_BUILD_NUMBER=53 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/adlc.make --- a/make/linux/makefiles/adlc.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/adlc.make Wed Jul 24 21:31:53 2013 +0100 @@ -68,7 +68,9 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) CFLAGS_WARN = -Werror +endif CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/buildtree.make --- a/make/linux/makefiles/buildtree.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/buildtree.make Wed Jul 24 21:31:53 2013 +0100 @@ -57,6 +57,7 @@ # having to read the dependency files for the vm. -include $(SPEC) +include $(GAMMADIR)/make/defs.make include $(GAMMADIR)/make/scm.make include $(GAMMADIR)/make/altsrc.make @@ -194,6 +195,7 @@ $(BUILDTREE_COMMENT); \ echo; \ echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ + echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \ sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ echo; \ echo "GAMMADIR = $(GAMMADIR)"; \ diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/defs.make --- a/make/linux/makefiles/defs.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/defs.make Wed Jul 24 21:31:53 2013 +0100 @@ -242,10 +242,14 @@ # client and server subdirectories have symbolic links to ../libjsig.so EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz - else - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz + else + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo + endif + endif endif endif EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server @@ -254,11 +258,13 @@ ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz - else - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz + else + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo + endif endif endif endif @@ -266,11 +272,13 @@ ifeq ($(JVM_VARIANT_CLIENT),true) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz - else - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz + else + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo + endif endif endif endif @@ -282,12 +290,16 @@ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ $(EXPORT_LIB_DIR)/sa-jdi.jar ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - else - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + else + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + endif + endif endif endif ADD_SA_BINARIES/ppc = diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/gcc.make Wed Jul 24 21:31:53 2013 +0100 @@ -30,22 +30,21 @@ # When cross-compiling the ALT_COMPILER_PATH points # to the cross-compilation toolset ifdef CROSS_COMPILE_ARCH - CXX = $(ALT_COMPILER_PATH)/g++ - CC = $(ALT_COMPILER_PATH)/gcc - HOSTCXX = g++ - HOSTCC = gcc - STRIP = $(ALT_COMPILER_PATH)/strip + CXX ?= $(ALT_COMPILER_PATH)/g++ + CC ?= $(ALT_COMPILER_PATH)/gcc + HOSTCXX ?= g++ + HOSTCC ?= gcc + STRIP ?= $(ALT_COMPILER_PATH)/strip else - CXX = g++ - CC = gcc - HOSTCXX = $(CXX) - HOSTCC = $(CC) - STRIP = strip + CXX ?= g++ + CC ?= gcc + HOSTCXX ?= $(CXX) + HOSTCC ?= $(CC) + STRIP ?= strip endif AS = $(CC) -c endif - # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only # prints the numbers (e.g. "2.95", "3.2.1") CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1) @@ -66,15 +65,16 @@ # Compiler flags # position-independent code +ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),) PICFLAG = -fPIC +else +PICFLAG = -fpic +endif VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) -ifeq ($(JVM_VARIANT_ZERO), true) -CFLAGS += $(LIBFFI_CFLAGS) -endif ifeq ($(JVM_VARIANT_ZEROSHARK), true) CFLAGS += $(LIBFFI_CFLAGS) CFLAGS += $(LLVM_CFLAGS) @@ -129,7 +129,9 @@ endif # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) WARNINGS_ARE_ERRORS = -Werror +endif # Except for a few acceptable ones # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/jsig.make --- a/make/linux/makefiles/jsig.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/jsig.make Wed Jul 24 21:31:53 2013 +0100 @@ -62,8 +62,10 @@ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ + endif ifeq ($(STRIP_POLICY),all_strip) $(QUIETLY) $(STRIP) $@ else @@ -73,10 +75,12 @@ endif endif [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); } - ifeq ($(ZIP_DEBUGINFO_FILES),1) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO) $(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO) [ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); } + endif endif endif diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/rules.make --- a/make/linux/makefiles/rules.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/rules.make Wed Jul 24 21:31:53 2013 +0100 @@ -143,20 +143,10 @@ include $(GAMMADIR)/make/altsrc.make -# The non-PIC object files are only generated for 32 bit platforms. -ifdef LP64 %.o: %.cpp @echo Compiling $< $(QUIETLY) $(REMOVE_TARGET) $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) -else -%.o: %.cpp - @echo Compiling $< - $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ - $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ - $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) -endif %.o: %.s @echo Assembling $< diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/saproc.make --- a/make/linux/makefiles/saproc.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/saproc.make Wed Jul 24 21:31:53 2013 +0100 @@ -101,8 +101,11 @@ -lthread_db $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ + [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); } + endif ifeq ($(STRIP_POLICY),all_strip) $(QUIETLY) $(STRIP) $@ else @@ -111,11 +114,12 @@ # implied else here is no stripping at all endif endif - [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); } ifeq ($(ZIP_DEBUGINFO_FILES),1) + ifneq ($(STRIP_POLICY),no_strip) $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO) $(RM) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO) [ -f $(LIBSAPROC_G_DIZ) ] || { ln -s $(LIBSAPROC_DIZ) $(LIBSAPROC_G_DIZ); } + endif endif endif diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Fri Jun 21 18:46:08 2013 -0700 +++ b/make/linux/makefiles/vm.make Wed Jul 24 21:31:53 2013 +0100 @@ -97,15 +97,28 @@ ${HS_LIB_ARCH} \ From andrew at icedtea.classpath.org Wed Jul 24 13:34:13 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 24 Jul 2013 20:34:13 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 40 new changesets Message-ID: changeset 3a8f9e7f331f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3a8f9e7f331f author: katleman date: Thu Jun 27 13:58:45 2013 -0700 Added tag jdk7u40-b31 for changeset c2522d149ff6 changeset d6179d8024a8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d6179d8024a8 author: sla date: Wed Jun 26 19:15:34 2013 +0200 8019155: Update makefiles with correct jfr packages Reviewed-by: erikj, mgronlun, dholmes, tbell changeset 70b91714c76e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=70b91714c76e author: chegar date: Fri Jun 14 16:38:13 2013 +0100 8012156: tools/javac/file/zip/T6865530.java fails for win32/64 Reviewed-by: alanb changeset fd073e7b57f9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fd073e7b57f9 author: nloodin date: Thu Jun 27 16:02:54 2013 +0200 7199324: IPv6: JMXConnectorServer.getConnectionIDs() return IDs contradicting to address grammar Reviewed-by: alanb, sjiang Contributed-by: jaroslav.bachorik at oracle.com changeset b9f86896cd0a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b9f86896cd0a author: lana date: Fri Jun 28 10:04:15 2013 -0700 Merge changeset b1012a7e71ce in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b1012a7e71ce author: katleman date: Wed Jul 03 16:36:39 2013 -0700 Added tag jdk7u40-b32 for changeset b9f86896cd0a changeset 298aa6322743 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=298aa6322743 author: pchelko date: Tue Jul 02 12:33:03 2013 +0400 8019236: [macosx] Add javadoc to the handleWindowFocusEvent in CEmbeddedFrame Reviewed-by: ant, serb changeset 6bf5fa233df0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6bf5fa233df0 author: mchung date: Tue Jul 02 13:23:35 2013 -0700 8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a temporary switch to re-enable it Reviewed-by: jrose, alanb, chegar, twisti changeset e42c2964343c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e42c2964343c author: ehelin date: Tue Jul 02 17:04:58 2013 +0200 8017159: Unexclude sun/tools/JMAP/Basic.sh test Reviewed-by: alanb changeset a5e342a0b9fd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a5e342a0b9fd author: leonidr date: Thu Jul 04 18:57:38 2013 +0400 8014264: The applet pathguy_TimeDead throws java.lang.NullPointerException in java console once click drop-down check box. Reviewed-by: art, anthony, serb changeset f59060c18bb1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f59060c18bb1 author: lana date: Thu Jul 04 10:31:31 2013 -0700 Merge changeset 3d1035edff62 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3d1035edff62 author: mfang date: Fri Jul 05 09:59:07 2013 -0700 8019541: 7u40 l10n resource file translation update Reviewed-by: robilad, naoto, yhuang changeset 419939ecee83 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=419939ecee83 author: mfang date: Fri Jul 05 10:34:13 2013 -0700 Merge changeset ed809dc4f278 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ed809dc4f278 author: katleman date: Wed Jul 10 13:49:00 2013 -0700 Added tag jdk7u40-b33 for changeset 419939ecee83 changeset 34c9cec19fc5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34c9cec19fc5 author: rbackman date: Thu Jul 04 12:39:26 2013 +0200 8009985: [parfait] Uninitialised variable at jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Reviewed-by: sla, rbackman, alanb, dholmes, rdurbin Contributed-by: peter.allwin at oracle.com changeset 0020c338c0a4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0020c338c0a4 author: serb date: Mon Jul 08 20:31:38 2013 +0400 8004859: Graphics.getClipBounds/getClip return difference nonequivalent bounds, depending from transform Reviewed-by: prr, flar changeset 120f4b72ed29 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=120f4b72ed29 author: alexsch date: Tue Jul 09 17:15:19 2013 +0400 8019628: [macosx] closed/java/awt/Modal/BlockedMouseInputTest/BlockedMouseInputTest.html failed since 7u40b30 on MacOS Reviewed-by: serb, leonidr changeset b2c2cbad0d1d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b2c2cbad0d1d author: pchelko date: Tue Jul 09 14:50:54 2013 +0100 8006941: [macosx] Deadlock in drag and drop 7199783: Setting cursor on DragSourceContext does not work on OSX Reviewed-by: anthony, serb changeset e280fc2f1d74 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e280fc2f1d74 author: jgodinez date: Tue Jul 09 13:05:33 2013 -0700 8016737: After clicking on "Print UNCOLLATED" button, the print out come in order 'Page 1', 'Page 2', 'Page 1' Reviewed-by: jchen, prr changeset 311956930113 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=311956930113 author: leonidr date: Thu Jul 11 12:41:19 2013 +0400 8019265: [macosx] apple.laf.useScreenMenuBar regression comparing with jdk6 Reviewed-by: anthony, serb changeset c5d869453212 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c5d869453212 author: mullan date: Thu Jul 11 13:13:41 2013 -0400 8017173: XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated Reviewed-by: xuelei, vinnie changeset e2c7640fcacb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e2c7640fcacb author: vinnie date: Thu Jun 27 09:34:52 2013 -0700 7165807: Non optimized initialization of NSS crypto library leads to scalability issues Reviewed-by: mullan, valeriep changeset 09d0888ef9b6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09d0888ef9b6 author: vinnie date: Thu Jul 11 05:38:23 2013 -0700 Merge changeset 886d46986b72 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=886d46986b72 author: vinnie date: Thu Jul 11 14:16:57 2013 -0700 Merge changeset 69e208814cab in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=69e208814cab author: mchung date: Fri Jul 12 01:12:23 2013 -0700 8020228: Restore the translated version of logging_xx.properties Reviewed-by: mfang, coffeys changeset d73ed9e7c5ef in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d73ed9e7c5ef author: coffeys date: Fri Jul 12 11:36:15 2013 +0100 8019979: Replace CheckPackageAccess test with better one from closed repo Reviewed-by: mullan, robilad changeset 1217639266f5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1217639266f5 author: serb date: Fri Jul 12 16:53:17 2013 +0400 8019587: [macosx] Possibility to set the same frame for the different screens Reviewed-by: art, anthony changeset 2054d1654f11 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2054d1654f11 author: raginip date: Thu Jul 11 15:49:17 2013 -0700 8009168: accessibility.properties syntax issue Reviewed-by: ptbrunet, mfang, alexsch changeset 19e0f7fec24a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=19e0f7fec24a author: coffeys date: Fri Jul 12 14:16:42 2013 +0100 Merge changeset a568c4ab0973 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a568c4ab0973 author: vinnie date: Fri Jul 12 03:20:36 2013 -0700 8014805: NPE is thrown during certpath validation if certificate does not have AuthorityKeyIdentifier extension Reviewed-by: mullan, xuelei changeset 67ba888dc67b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=67ba888dc67b author: vinnie date: Fri Jul 12 03:29:31 2013 -0700 Merge changeset d8eaf786523d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d8eaf786523d author: vinnie date: Fri Jul 12 04:11:16 2013 -0700 Merge changeset 2dae408e2954 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2dae408e2954 author: vinnie date: Fri Jul 12 06:43:54 2013 -0700 Merge changeset 98d9339ffaa3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=98d9339ffaa3 author: joehw date: Fri Jul 12 15:08:43 2013 -0700 8020430: NullPointerException in xml sqe nightly result on 2013-07-12 Reviewed-by: chegar, lancea changeset 51b0cc3d5102 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=51b0cc3d5102 author: dfuchs date: Tue Jul 02 11:30:31 2013 +0200 8017174: NPE when using Logger.getAnonymousLogger or LogManager.getLogManager().getLogger Summary: This patch makes sure that LoggerContext instances created for applets have a root and global logger. Reviewed-by: mchung changeset 7e5d6f975831 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7e5d6f975831 author: coffeys date: Tue Jul 16 10:58:46 2013 +0100 8017566: Backout 8000450 - Cannot access to com.sun.corba.se.impl.orb.ORBImpl Reviewed-by: mchung, chegar changeset de37f0b34e9c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=de37f0b34e9c author: leonidr date: Tue Jul 16 16:12:34 2013 +0400 8020038: [macosx] Incorrect usage of invokeLater() and likes in callbacks called via JNI from AppKit thread Reviewed-by: art, anthony changeset 93ff09de1ad8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=93ff09de1ad8 author: serb date: Tue Jul 16 19:15:12 2013 +0400 8020298: [macosx] Incorrect merge in the lwawt code Reviewed-by: art, anthony changeset 7c1d6fc3b6da in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7c1d6fc3b6da author: lana date: Tue Jul 16 11:26:34 2013 -0700 Merge changeset 4a2244a0e816 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4a2244a0e816 author: andrew date: Wed Jul 24 21:32:02 2013 +0100 Merge jdk7u40-b34 diffstat: .hgtags | 13 + .jcheck/conf | 2 - make/com/sun/java/pack/Makefile | 7 +- make/com/sun/nio/sctp/Makefile | 2 + make/common/Defs-linux.gmk | 23 +- make/common/Library.gmk | 40 +- make/common/Program.gmk | 80 +- make/common/Release.gmk | 30 +- make/common/shared/Compiler-gcc.gmk | 76 +- make/common/shared/Defs-java.gmk | 9 +- make/common/shared/Defs-versions.gmk | 2 +- make/common/shared/Defs.gmk | 2 +- make/common/shared/Platform.gmk | 9 + make/common/shared/Sanity.gmk | 8 + make/docs/Makefile | 6 +- make/java/net/FILES_c.gmk | 7 + make/java/net/Makefile | 26 +- make/java/nio/Makefile | 226 +- make/java/security/Makefile | 12 +- make/java/sun_nio/Makefile | 2 +- make/java/version/Makefile | 5 + make/javax/sound/SoundDefs.gmk | 48 + make/jdk_generic_profile.sh | 73 +- make/sun/awt/FILES_c_unix.gmk | 10 + make/sun/awt/Makefile | 2 +- make/sun/awt/mawt.gmk | 39 +- make/sun/cmm/lcms/FILES_c_unix.gmk | 7 +- make/sun/cmm/lcms/Makefile | 8 +- make/sun/font/Makefile | 6 +- make/sun/jawt/Makefile | 7 + make/sun/jpeg/FILES_c.gmk | 6 +- make/sun/jpeg/Makefile | 11 +- make/sun/native2ascii/Makefile | 2 +- make/sun/net/FILES_java.gmk | 1 + make/sun/nio/cs/Makefile | 2 +- make/sun/security/pkcs11/mapfile-vers | 8 +- make/sun/splashscreen/FILES_c.gmk | 78 +- make/sun/splashscreen/Makefile | 35 +- make/sun/xawt/FILES_c_unix.gmk | 20 + make/sun/xawt/Makefile | 62 +- make/tools/Makefile | 9 + make/tools/freetypecheck/Makefile | 2 +- make/tools/generate_nimbus/Makefile | 1 + make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java | 22 +- make/tools/src/build/tools/compileproperties/CompileProperties.java | 9 +- make/tools/src/build/tools/dirdiff/DirDiff.java | 4 +- make/tools/src/build/tools/dtdbuilder/DTDBuilder.java | 34 +- make/tools/src/build/tools/dtdbuilder/DTDInputStream.java | 6 +- make/tools/src/build/tools/dtdbuilder/DTDParser.java | 44 +- make/tools/src/build/tools/dtdbuilder/PublicMapping.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/CharSet.java | 16 +- make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java | 8 +- make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java | 201 +- make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java | 6 +- make/tools/src/build/tools/generatecharacter/GenerateCharacter.java | 4 +- make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java | 147 +- make/tools/src/build/tools/generatecharacter/UnicodeSpec.java | 22 +- make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 4 +- make/tools/src/build/tools/hasher/Hasher.java | 38 +- make/tools/src/build/tools/jarsplit/JarSplit.java | 5 +- make/tools/src/build/tools/javazic/Gen.java | 14 +- make/tools/src/build/tools/javazic/GenDoc.java | 16 +- make/tools/src/build/tools/javazic/Main.java | 3 +- make/tools/src/build/tools/javazic/Simple.java | 23 +- make/tools/src/build/tools/javazic/Time.java | 10 +- make/tools/src/build/tools/javazic/Zoneinfo.java | 18 +- make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java | 14 +- make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java | 26 +- make/tools/src/build/tools/jdwpgen/AltNode.java | 4 +- make/tools/src/build/tools/jdwpgen/CommandSetNode.java | 11 +- make/tools/src/build/tools/jdwpgen/ConstantSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/ErrorSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/Node.java | 25 +- make/tools/src/build/tools/jdwpgen/OutNode.java | 14 +- make/tools/src/build/tools/jdwpgen/RootNode.java | 10 +- make/tools/src/build/tools/jdwpgen/SelectNode.java | 10 +- make/tools/src/build/tools/makeclasslist/MakeClasslist.java | 15 +- make/tools/src/build/tools/stripproperties/StripProperties.java | 4 +- src/macosx/classes/com/apple/eawt/FullScreenHandler.java | 3 +- src/macosx/classes/com/apple/eawt/_AppEventHandler.java | 100 +- src/macosx/classes/com/apple/eawt/event/GestureHandler.java | 4 +- src/macosx/classes/com/apple/laf/ScreenMenu.java | 9 +- src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties | 2 +- src/macosx/classes/sun/lwawt/LWComponentPeer.java | 2 +- src/macosx/classes/sun/lwawt/LWWindowPeer.java | 12 +- src/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java | 4 +- src/macosx/classes/sun/lwawt/macosx/CCursorManager.java | 36 - src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java | 100 +- src/macosx/classes/sun/lwawt/macosx/CDropTarget.java | 21 +- src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 11 + src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 37 +- src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java | 4 +- src/macosx/native/sun/awt/CDragSource.h | 25 +- src/macosx/native/sun/awt/CDragSource.m | 64 +- src/macosx/native/sun/awt/CDragSourceContextPeer.m | 45 +- src/macosx/native/sun/awt/CDropTarget.m | 27 +- src/macosx/native/sun/awt/CMenuItem.m | 9 +- src/share/bin/java.c | 8 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties | 2 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties | 2 +- src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 6 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +- src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties | 2 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties | 2 +- src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 + src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +- src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java | 2 +- src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties | 2 +- src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties | 8 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +- src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 3 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties | 2 +- src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java | 2 +- src/share/classes/java/awt/GraphicsDevice.java | 6 + src/share/classes/java/awt/color/ICC_Profile.java | 4 +- src/share/classes/java/io/InputStream.java | 2 +- src/share/classes/java/net/SocksSocketImpl.java | 4 +- src/share/classes/java/security/Policy.java | 1 - src/share/classes/java/util/logging/LogManager.java | 117 +- src/share/classes/javax/accessibility/AccessibleAction.java | 2 +- src/share/classes/javax/crypto/Cipher.java | 172 +- src/share/classes/javax/management/remote/rmi/RMIServerImpl.java | 9 + src/share/classes/javax/swing/JComponent.java | 13 +- src/share/classes/javax/swing/JDialog.java | 3 +- src/share/classes/javax/swing/JEditorPane.java | 11 +- src/share/classes/javax/swing/JFrame.java | 10 +- src/share/classes/javax/swing/JInternalFrame.java | 6 +- src/share/classes/javax/swing/JPopupMenu.java | 10 +- src/share/classes/javax/swing/MenuSelectionManager.java | 5 +- src/share/classes/javax/swing/PopupFactory.java | 14 +- src/share/classes/javax/swing/SwingUtilities.java | 6 +- src/share/classes/javax/swing/SwingWorker.java | 2 +- src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 6 +- src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +- src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 16 +- src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 8 +- src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +- src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +- src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +- src/share/classes/javax/swing/text/JTextComponent.java | 6 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 - src/share/classes/sun/applet/AppletPanel.java | 10 +- src/share/classes/sun/applet/AppletViewerPanel.java | 18 +- src/share/classes/sun/applet/resources/MsgAppletViewer_de.java | 2 +- src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java | 2 +- src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java | 4 +- src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java | 2 +- src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java | 6 +- src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +- src/share/classes/sun/awt/resources/awt_zh_CN.properties | 4 +- src/share/classes/sun/java2d/SunGraphics2D.java | 42 +- src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +- src/share/classes/sun/launcher/resources/launcher_de.properties | 4 +- src/share/classes/sun/launcher/resources/launcher_es.properties | 4 +- src/share/classes/sun/launcher/resources/launcher_it.properties | 2 +- src/share/classes/sun/launcher/resources/launcher_ja.properties | 3 +- src/share/classes/sun/launcher/resources/launcher_ko.properties | 2 +- src/share/classes/sun/launcher/resources/launcher_pt_BR.properties | 4 +- src/share/classes/sun/launcher/resources/launcher_zh_CN.properties | 6 +- src/share/classes/sun/launcher/resources/launcher_zh_TW.properties | 2 +- src/share/classes/sun/misc/SharedSecrets.java | 7 +- src/share/classes/sun/misc/URLClassPath.java | 12 +- src/share/classes/sun/misc/VM.java | 20 + src/share/classes/sun/misc/Version.java.template | 58 +- src/share/classes/sun/print/resources/serviceui_de.properties | 18 +- src/share/classes/sun/reflect/Reflection.java | 10 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 + src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties | 2 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 2 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +- src/share/classes/sun/security/pkcs11/Config.java | 15 +- src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 4 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/pkcs11/Secmod.java | 17 +- src/share/classes/sun/security/pkcs11/SunPKCS11.java | 28 +- src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +- src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 + src/share/classes/sun/security/tools/JarSignerResources_ja.java | 38 +- src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java | 4 +- src/share/classes/sun/security/util/AuthResources_zh_CN.java | 2 +- src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +- src/share/classes/sun/security/util/Resources_sv.java | 2 +- src/share/classes/sun/security/util/Resources_zh_CN.java | 2 +- src/share/classes/sun/security/x509/X509CertImpl.java | 61 +- src/share/classes/sun/swing/DefaultLookup.java | 3 +- src/share/classes/sun/swing/SwingUtilities2.java | 17 +- src/share/classes/sun/tools/jar/Main.java | 2 +- src/share/classes/sun/tools/jar/resources/jar_de.properties | 2 +- src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties | 2 +- src/share/classes/sun/tools/jar/resources/jar_sv.properties | 4 +- src/share/classes/sun/tools/native2ascii/Main.java | 9 +- src/share/classes/sun/tools/serialver/serialver_zh_CN.properties | 2 +- src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +- src/share/classes/sun/util/logging/resources/logging_de.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_es.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_fr.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_it.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_ja.properties | 12 +- src/share/classes/sun/util/logging/resources/logging_ko.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_pt_BR.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_sv.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_zh_CN.properties | 18 +- src/share/classes/sun/util/logging/resources/logging_zh_TW.properties | 12 +- src/share/demo/jvmti/gctest/sample.makefile.txt | 6 +- src/share/demo/jvmti/heapTracker/sample.makefile.txt | 19 +- src/share/demo/jvmti/heapViewer/sample.makefile.txt | 5 +- src/share/demo/jvmti/hprof/sample.makefile.txt | 6 +- src/share/demo/jvmti/minst/sample.makefile.txt | 19 +- src/share/demo/jvmti/mtrace/sample.makefile.txt | 20 +- src/share/demo/jvmti/versionCheck/sample.makefile.txt | 6 +- src/share/demo/jvmti/waiters/sample.makefile.txt | 8 +- src/share/lib/security/java.security-linux | 6 +- src/share/lib/security/java.security-macosx | 6 +- src/share/lib/security/java.security-solaris | 6 +- src/share/lib/security/java.security-windows | 6 +- src/share/lib/security/nss.cfg.in | 5 + src/share/lib/security/sunpkcs11-solaris.cfg | 14 +- src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 1 - src/share/native/com/sun/media/sound/SoundDefs.h | 8 + src/share/native/java/util/zip/Deflater.c | 46 +- src/share/native/java/util/zip/Inflater.c | 6 +- src/share/native/sun/awt/image/awt_ImageRep.c | 2 +- src/share/native/sun/awt/image/jpeg/README | 385 -- src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- src/share/native/sun/awt/image/jpeg/jcapimin.c | 284 - src/share/native/sun/awt/image/jpeg/jcapistd.c | 165 - src/share/native/sun/awt/image/jpeg/jccoefct.c | 453 -- src/share/native/sun/awt/image/jpeg/jccolor.c | 462 -- src/share/native/sun/awt/image/jpeg/jcdctmgr.c | 391 -- src/share/native/sun/awt/image/jpeg/jchuff.c | 913 ----- src/share/native/sun/awt/image/jpeg/jchuff.h | 51 - src/share/native/sun/awt/image/jpeg/jcinit.c | 76 - src/share/native/sun/awt/image/jpeg/jcmainct.c | 297 - src/share/native/sun/awt/image/jpeg/jcmarker.c | 682 --- src/share/native/sun/awt/image/jpeg/jcmaster.c | 594 --- src/share/native/sun/awt/image/jpeg/jcomapi.c | 110 - src/share/native/sun/awt/image/jpeg/jconfig.h | 43 - src/share/native/sun/awt/image/jpeg/jcparam.c | 614 --- src/share/native/sun/awt/image/jpeg/jcphuff.c | 837 ---- src/share/native/sun/awt/image/jpeg/jcprepct.c | 358 -- src/share/native/sun/awt/image/jpeg/jcsample.c | 523 --- src/share/native/sun/awt/image/jpeg/jctrans.c | 392 -- src/share/native/sun/awt/image/jpeg/jdapimin.c | 399 -- src/share/native/sun/awt/image/jpeg/jdapistd.c | 279 - src/share/native/sun/awt/image/jpeg/jdcoefct.c | 740 ---- src/share/native/sun/awt/image/jpeg/jdcolor.c | 398 -- src/share/native/sun/awt/image/jpeg/jdct.h | 180 - src/share/native/sun/awt/image/jpeg/jddctmgr.c | 273 - src/share/native/sun/awt/image/jpeg/jdhuff.c | 655 --- src/share/native/sun/awt/image/jpeg/jdhuff.h | 205 - src/share/native/sun/awt/image/jpeg/jdinput.c | 385 -- src/share/native/sun/awt/image/jpeg/jdmainct.c | 516 -- src/share/native/sun/awt/image/jpeg/jdmarker.c | 1384 -------- src/share/native/sun/awt/image/jpeg/jdmaster.c | 561 --- src/share/native/sun/awt/image/jpeg/jdmerge.c | 404 -- src/share/native/sun/awt/image/jpeg/jdphuff.c | 672 --- src/share/native/sun/awt/image/jpeg/jdpostct.c | 294 - src/share/native/sun/awt/image/jpeg/jdsample.c | 482 -- src/share/native/sun/awt/image/jpeg/jdtrans.c | 147 - src/share/native/sun/awt/image/jpeg/jerror.c | 272 - src/share/native/sun/awt/image/jpeg/jerror.h | 295 - src/share/native/sun/awt/image/jpeg/jfdctflt.c | 172 - src/share/native/sun/awt/image/jpeg/jfdctfst.c | 228 - src/share/native/sun/awt/image/jpeg/jfdctint.c | 287 - src/share/native/sun/awt/image/jpeg/jidctflt.c | 246 - src/share/native/sun/awt/image/jpeg/jidctfst.c | 372 -- src/share/native/sun/awt/image/jpeg/jidctint.c | 393 -- src/share/native/sun/awt/image/jpeg/jidctred.c | 402 -- src/share/native/sun/awt/image/jpeg/jinclude.h | 95 - src/share/native/sun/awt/image/jpeg/jmemmgr.c | 1124 ------ src/share/native/sun/awt/image/jpeg/jmemnobs.c | 113 - src/share/native/sun/awt/image/jpeg/jmemsys.h | 202 - src/share/native/sun/awt/image/jpeg/jmorecfg.h | 378 -- src/share/native/sun/awt/image/jpeg/jpeg-6b/README | 385 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c | 284 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c | 165 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c | 453 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c | 462 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c | 391 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c | 913 +++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h | 51 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c | 76 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c | 297 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c | 682 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c | 594 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c | 110 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h | 43 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c | 614 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c | 837 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c | 358 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c | 523 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c | 392 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c | 399 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c | 279 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c | 740 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c | 398 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h | 180 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c | 273 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c | 655 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h | 205 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c | 385 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c | 516 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c | 1384 ++++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c | 561 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c | 404 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c | 672 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c | 294 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c | 482 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c | 147 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c | 272 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h | 295 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c | 172 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c | 228 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c | 287 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c | 246 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c | 372 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c | 393 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c | 402 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h | 95 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 1124 ++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c | 113 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h | 202 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h | 378 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h | 396 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h | 1100 ++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c | 860 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c | 1314 +++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c | 183 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h | 18 + src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 2 +- src/share/native/sun/awt/image/jpeg/jpegint.h | 396 -- src/share/native/sun/awt/image/jpeg/jpeglib.h | 1100 ------ src/share/native/sun/awt/image/jpeg/jquant1.c | 860 ---- src/share/native/sun/awt/image/jpeg/jquant2.c | 1314 ------- src/share/native/sun/awt/image/jpeg/jutils.c | 183 - src/share/native/sun/awt/image/jpeg/jversion.h | 18 - src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 11 +- src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +- src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +- src/share/native/sun/font/freetypeScaler.c | 7 +- src/share/native/sun/java2d/loops/TransformHelper.c | 11 +- src/share/native/sun/security/pkcs11/j2secmod.c | 65 +- src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 6 +- src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java | 16 +- src/solaris/classes/sun/awt/X11/XChoicePeer.java | 32 +- src/solaris/classes/sun/awt/X11/XListPeer.java | 13 +- src/solaris/classes/sun/awt/X11/XWM.java | 10 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 + src/solaris/classes/sun/print/IPPPrintService.java | 11 +- src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 4 + src/solaris/native/com/sun/management/UnixOperatingSystem_md.c | 2 +- src/solaris/native/common/deps/cups_fp.c | 104 + src/solaris/native/common/deps/cups_fp.h | 61 + src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h | 302 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c | 188 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h | 161 + src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 + src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 + src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 + src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 65 + src/solaris/native/common/deps/glib2/gio_fp.c | 109 + src/solaris/native/common/deps/glib2/gio_fp.h | 61 + src/solaris/native/common/deps/glib2/glib_fp.h | 41 + src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 +++ src/solaris/native/common/deps/gtk2/gtk_fp.c | 398 ++ src/solaris/native/common/deps/gtk2/gtk_fp.h | 469 ++ src/solaris/native/common/deps/syscalls_fp.c | 122 + src/solaris/native/common/deps/syscalls_fp.h | 79 + src/solaris/native/java/lang/java_props_md.c | 7 +- src/solaris/native/sun/awt/CUPSfuncs.c | 137 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 2 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 20 +- src/solaris/native/sun/awt/fontconfig.h | 941 ----- src/solaris/native/sun/awt/fontpath.c | 400 +- src/solaris/native/sun/awt/gtk2_interface.c | 988 +---- src/solaris/native/sun/awt/gtk2_interface.h | 580 +--- src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +- src/solaris/native/sun/awt/swing_GTKEngine.c | 76 +- src/solaris/native/sun/awt/swing_GTKStyle.c | 20 +- src/solaris/native/sun/net/spi/DefaultProxySelector.c | 465 +- src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 - src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 94 +- src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 50 +- src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 111 +- src/solaris/native/sun/security/pkcs11/j2secmod_md.h | 11 +- src/solaris/native/sun/xawt/awt_Desktop.c | 103 +- src/windows/native/sun/security/pkcs11/j2secmod_md.h | 11 +- test/Makefile | 6 + test/ProblemList.txt | 3 - test/com/oracle/security/ucrypto/TestAES.java | 118 +- test/com/oracle/security/ucrypto/TestDigest.java | 24 +- test/com/oracle/security/ucrypto/TestRSA.java | 276 +- test/com/oracle/security/ucrypto/UcryptoTest.java | 28 +- test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +- test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java | 420 ++ test/com/sun/org/apache/xml/internal/security/encryption/XMLCipher/GetInstance.java | 44 + test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 + test/java/awt/Graphics2D/Test8004859/Test8004859.java | 102 + test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java | 94 + test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java | 97 + test/java/lang/SecurityManager/CheckPackageAccess.java | 122 +- test/java/net/URL/TestHttps.java | 34 + test/java/nio/MappedByteBuffer/Basic.java | 91 +- test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +- test/java/util/Locale/data/deflocale.sol10 | 1725 ---------- test/java/util/logging/LevelResourceBundle.java | 52 + test/java/util/logging/LogManagerInstanceTest.java | 2 +- test/java/util/logging/TestAppletLoggerContext.java | 610 +++ test/javax/management/remote/mandatory/connection/ConnectionTest.java | 24 + test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java | 5 +- test/javax/xml/jaxp/common/8020430/JAXP15RegTest.java | 63 + test/javax/xml/jaxp/common/8020430/TestBase.java | 95 + test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher | Bin test/sun/management/windows/revokeall.exe | Bin test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +- test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 + test/sun/reflect/GetCallerClass.java | 70 +- test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 + test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java | 410 ++ test/sun/tools/native2ascii/NativeErrors.java | 4 +- test/tools/launcher/RunpathTest.java | 84 + test/tools/pack200/MemoryAllocatorTest.java | 369 ++ 451 files changed, 33699 insertions(+), 31224 deletions(-) diffs (truncated from 74756 to 500 lines): diff -r c2522d149ff6 -r 4a2244a0e816 .hgtags --- a/.hgtags Wed Jun 26 12:47:44 2013 +0400 +++ b/.hgtags Wed Jul 24 21:32:02 2013 +0100 @@ -50,6 +50,7 @@ f708138c9aca4b389872838fe6773872fce3609e jdk7-b73 eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74 8885b22565077236a927e824ef450742e434a230 jdk7-b75 +fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76 e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78 @@ -63,6 +64,7 @@ eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87 b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88 +2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13 4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89 7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90 08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91 @@ -111,6 +113,7 @@ 554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136 +1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139 @@ -123,6 +126,7 @@ 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01 f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147 +7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02 a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03 b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04 @@ -141,6 +145,7 @@ 79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12 fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13 24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21 +a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02 7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03 fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04 @@ -157,6 +162,7 @@ 6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10 d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11 16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12 +907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13 09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14 9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01 @@ -191,6 +197,7 @@ e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15 966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16 aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17 +8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20 @@ -258,6 +265,7 @@ cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07 b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08 2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09 +b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10 9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11 ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12 @@ -313,6 +321,7 @@ eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19 a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19 bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20 +d1563025e086a464f05414267b84a6408f7b377d icedtea-2.4.0 0a00f10abb2df203f13a723be158fb759e54b19b jdk7u14-b21 d4bf5c15837c47d179c71f6df8716ad9bef53ef9 jdk7u14-b22 a76a886dc057582bf332e60a023d8f8a35526217 jdk7u40-b23 @@ -323,3 +332,7 @@ 2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28 d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29 60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30 +65d95818d79e340d042457ee1a8155d7658e86b6 icedtea-2.4.1 +c2522d149ff6663ed1d3602c88c286cff25a43a7 jdk7u40-b31 +b9f86896cd0aa9b83e472a90b20ae7c253fba633 jdk7u40-b32 +419939ecee8311c8a38ff624ae67e473f8c60e51 jdk7u40-b33 diff -r c2522d149ff6 -r 4a2244a0e816 .jcheck/conf --- a/.jcheck/conf Wed Jun 26 12:47:44 2013 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r c2522d149ff6 -r 4a2244a0e816 make/com/sun/java/pack/Makefile --- a/make/com/sun/java/pack/Makefile Wed Jun 26 12:47:44 2013 +0400 +++ b/make/com/sun/java/pack/Makefile Wed Jul 24 21:32:02 2013 +0100 @@ -75,7 +75,7 @@ OTHER_CXXFLAGS += $(ZINCLUDE) LDDFLAGS += $(ZIPOBJS) else - LDDFLAGS += $(ZLIB_LIBS) + OTHER_LDLIBS += $(ZLIB_LIBS) OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB endif else @@ -99,8 +99,7 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space - LDDFLAGS += -lc - OTHER_LDLIBS += $(LIBCXX) + OTHER_LDLIBS += -lc $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ifeq ("$(CC_VER_MAJOR)", "3") @@ -157,7 +156,7 @@ $(prep-target) $(RM) $(TEMPDIR)/mapfile-vers $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) + $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif diff -r c2522d149ff6 -r 4a2244a0e816 make/com/sun/nio/sctp/Makefile --- a/make/com/sun/nio/sctp/Makefile Wed Jun 26 12:47:44 2013 +0400 +++ b/make/com/sun/nio/sctp/Makefile Wed Jul 24 21:32:02 2013 +0100 @@ -60,7 +60,9 @@ -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders ifeq ($(PLATFORM), linux) +ifneq ($(COMPILER_WARNINGS_FATAL),false) COMPILER_WARNINGS_FATAL=true +endif #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl endif diff -r c2522d149ff6 -r 4a2244a0e816 make/common/Defs-linux.gmk --- a/make/common/Defs-linux.gmk Wed Jun 26 12:47:44 2013 +0400 +++ b/make/common/Defs-linux.gmk Wed Jul 24 21:32:02 2013 +0100 @@ -188,15 +188,26 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this # as the default. +CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_hppa += CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_m68k += +CFLAGS_REQUIRED_mips += +CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_ppc += -m32 +CFLAGS_REQUIRED_ppc64 += -m64 +CFLAGS_REQUIRED_s390 += +CFLAGS_REQUIRED_s390x += -m64 CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN +CFLAGS_REQUIRED_sh += -mieee ifeq ($(ZERO_BUILD), true) CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) ifeq ($(ZERO_ENDIANNESS), little) @@ -286,11 +297,15 @@ CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' -# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) -ifneq ($(ARCH),alpha) +# Alpha and sh archs do not like "alpha" or "sh" defined (potential general arch cleanup issue here) +ifeq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D_$(ARCH)_ +else +ifeq ($(ARCH),sh) + CPP_ARCH_FLAGS += -D_$(ARCH)_ +else CPP_ARCH_FLAGS += -D$(ARCH) -else - CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif endif CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ diff -r c2522d149ff6 -r 4a2244a0e816 make/common/Library.gmk --- a/make/common/Library.gmk Wed Jun 26 12:47:44 2013 +0400 +++ b/make/common/Library.gmk Wed Jul 24 21:32:02 2013 +0100 @@ -269,6 +269,7 @@ ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) ifeq ($(PLATFORM), solaris) # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from @@ -279,19 +280,20 @@ # # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. - (set -e ; \ - $(CD) $(@D) ; \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ - ) + (set -e ; \ + $(CD) $(@D) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) else # PLATFORM != solaris - (set -e ; \ - $(CD) $(@D) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ - ) - endif # PLATFORM == solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) + endif # PLATFORM == solaris + endif # STRIP_POLICY != no_strip ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else @@ -305,12 +307,14 @@ # implied else here is no stripping at all endif endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) - (set -e ; \ - $(CD) $(@D) ; \ - $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - ) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + ) + endif endif endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS endif # ENABLE_FULL_DEBUG_SYMBOLS diff -r c2522d149ff6 -r 4a2244a0e816 make/common/Program.gmk --- a/make/common/Program.gmk Wed Jun 26 12:47:44 2013 +0400 +++ b/make/common/Program.gmk Wed Jul 24 21:32:02 2013 +0100 @@ -62,12 +62,14 @@ program: $(ACTUAL_PROGRAM) # Work-around for missing processor specific mapfiles +ifneq (,$(filter $(ARCH), amd64 i586 sparc sparcv9)) ifndef CROSS_COMPILE_ARCH # reuse the mapfiles in the launcher's directory, the same should # be applicable to the tool launchers as well. FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) include $(BUILDDIR)/common/Mapfile-vers.gmk endif +endif include $(JDK_TOPDIR)/make/common/Rules.gmk @@ -126,6 +128,26 @@ endif # PLATFORM # +# Applications expect to be able to link against libjawt without invoking +# System.loadLibrary("jawt") first. This was the behaviour described in the +# devloper documentation of JAWT and what worked with OpenJDK6. +# +ifeq ($(PLATFORM), solaris) + ifeq ($(ARCH_DATA_MODEL), 32) + LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH) + LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH) + else # ! ARCH_DATA_MODEL 64-bit + LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH) + LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH) + endif # ARCH_DATA_MODEL +endif # PLATFORM SOLARIS +ifeq ($(PLATFORM), linux) + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH) + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH) +endif # PLATFORM LINUX + + +# # Launcher specific files. # FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX) @@ -250,7 +272,8 @@ ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1) - ifeq ($(PLATFORM), solaris) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(PLATFORM), solaris) # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from # empty section headers until a fixed $(OBJCOPY) is available. @@ -260,19 +283,20 @@ # # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. - (set -e ; \ - $(CD) $(@D) ; \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ - $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \ - ) - else # PLATFORM != solaris - (set -e ; \ - $(CD) $(@D) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ - $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \ - ) - endif # PLATFORM == solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \ + ) + else # PLATFORM != solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \ + ) + endif # PLATFORM == solaris + endif ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else @@ -286,17 +310,19 @@ # implied else here is no stripping at all endif endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) - (set -e ; \ - $(CD) $(@D) ; \ - $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \ - $(RM) $(@F).debuginfo ; \ - ) - # save ZIP'ed debug info with rest of the program's build artifacts - $(MV) $@.diz $(OBJDIR) - else - # save debug info with rest of the program's build artifacts - $(MV) $@.debuginfo $(OBJDIR) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \ + $(RM) $(@F).debuginfo ; \ + ) + # save ZIP'ed debug info with rest of the program's build artifacts + $(MV) $@.diz $(OBJDIR) + else + # save debug info with rest of the program's build artifacts + $(MV) $@.debuginfo $(OBJDIR) + endif endif endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS endif # ENABLE_FULL_DEBUG_SYMBOLS @@ -363,7 +389,9 @@ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 endif # SYSTEM_ZLIB else # PLATFORM !MACOSX - OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + ifneq ($(SYSTEM_ZLIB), true) + OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + endif endif OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' diff -r c2522d149ff6 -r 4a2244a0e816 make/common/Release.gmk --- a/make/common/Release.gmk Wed Jun 26 12:47:44 2013 +0400 +++ b/make/common/Release.gmk Wed Jul 24 21:32:02 2013 +0100 @@ -247,7 +247,7 @@ trim-image-jre trim-image-jdk \ identify-image-jre identify-image-jdk \ process-image-jre process-image-jdk sec-files sec-files-win \ - jgss-files $(EXTRA_IMAGE_TARGETS) server-jdk-image + jgss-files $(EXTRA_IMAGE_TARGETS) server-jdk-image else images:: sanity-images post-sanity-images \ @@ -423,7 +423,8 @@ ifdef BUILD_JFR JFR_CLASSES_DIRS= \ com/oracle/jrockit/jfr \ - oracle/jrockit/jfr + oracle/jrockit/jfr \ + jdk/internal/jfr endif # classes that go into jsse.jar @@ -540,7 +541,7 @@ $(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE $(process-doc-file) -# JRE files +# JRE files $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/% $(process-doc-file) ifeq ($(PLATFORM), windows) @@ -638,6 +639,7 @@ $(ECHO) "oracle/jrockit/jfr/parser/" >> $@ $(ECHO) "oracle/jrockit/jfr/settings/" >> $@ $(ECHO) "oracle/jrockit/jfr/tools/" >> $@ + $(ECHO) "jdk/internal/jfr/events/" >> $@ endif @@ -931,7 +933,7 @@ done $(RM) $(JRE_BIN_LIST) -# Duplicate current j2re-image contents to server-j2re-image +# Duplicate current j2re-image contents to server-j2re-image # for the server version of jre, before deploy build server-jdk-image:: ifeq ($(PLATFORM), macosx) @@ -1114,13 +1116,9 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ - for sd in $(SOURCES) ; do \ - if [ -d $$sd ] ; then \ - $(FIND) $$sd $(SOURCE_FILES_filter) \ - -name '*.java' -print \ - >> $(ABS_TEMPDIR)/src-files.list ; \ - fi; \ - done ; \ + $(FIND) . $(SOURCE_FILES_filter) \ + -name '*.java' -print \ + >> $(ABS_TEMPDIR)/src-files.list ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \ @@ -1131,13 +1129,9 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ - for sd in $(SOURCES) ; do \ - if [ -d $$sd ] ; then \ - $(FIND) $$sd $(SOURCE_FILES_filter) \ - -name '*.java' -print \ - >> $(ABS_TEMPDIR)/src-files.list ; \ - fi; \ - done ; \ + $(FIND) . $(SOURCE_FILES_filter) \ + -name '*.java' -print \ + >> $(ABS_TEMPDIR)/src-files.list ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ ($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \ diff -r c2522d149ff6 -r 4a2244a0e816 make/common/shared/Compiler-gcc.gmk --- a/make/common/shared/Compiler-gcc.gmk Wed Jun 26 12:47:44 2013 +0400 +++ b/make/common/shared/Compiler-gcc.gmk Wed Jul 24 21:32:02 2013 +0100 @@ -53,18 +53,84 @@ ifeq ($(PLATFORM), linux) + ifndef BUILD_GCC + BUILD_GCC=$(COMPILER_PATH)gcc + endif + + ifndef BUILD_CPP + BUILD_CPP=$(COMPILER_PATH)g++ + endif + # Settings specific to Linux - CC = $(COMPILER_PATH)gcc - CPP = $(COMPILER_PATH)gcc -E + CC = $(BUILD_GCC) + CPP = $(BUILD_GCC) -E # statically link libstdc++ before C++ ABI is stablized on Linux - STATIC_CXX = true + ifneq ($(STATIC_CXX),false) + STATIC_CXX = true + endif ifeq ($(STATIC_CXX),true) # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" # We need to use gcc to statically link the C++ runtime. gcc and g++ use # the same subprocess to compile C++ files, so it is OK to build using gcc. - CXX = $(COMPILER_PATH)gcc + CXX = $(BUILD_GCC) else - CXX = $(COMPILER_PATH)g++ + CXX = $(BUILD_CPP) + endif + ifeq ($(ARCH), alpha) + # alpha + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* From gnu_andrew at member.fsf.org Wed Jul 24 17:51:19 2013 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 25 Jul 2013 01:51:19 +0100 Subject: IcedTea 2.3.11 Released! Message-ID: <20130725005119.GA26345@carrie.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. This release updates our OpenJDK 7 support to include support for the ARM32 JIT port running on HotSpot 23, meaning ARM users can move to the 2.3.x series. In addition, IcedTea includes the usual IcedTea patches to allow builds against system libraries and to support more esoteric architectures. In this release, use of the system version of LCMS is again enabled by default, but requires version 2.5 or above. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. What's New? =========== New in release 2.3.11 (2013-07-24): * System LCMS 2 support again enabled by default, requiring 2.5 or above. * ARM Port - Add arm_port from IcedTea 6 - Add patches/arm.patch from IcedTea 6 - Add patches/arm-debug.patch from IcedTea 6 - Add patches/arm-hsdis.patch from IcedTea 6 - Added jvmti event generation for dynamic_generate and compiled_method_load events to ARM JIT compiler - Adjust saved SP when safepointing. - First cut of invokedynamic - Fix trashed thread ptr after recursive re-entry from asm JIT. - JIT-compilation of ldc methodHandle - Rename a bunch of misleadingly-named functions - Changes for HSX22 - Changes for HSX23 - Corrected call from fast_method_handle_entry to CppInterpreter::method_handle_entry so that thread is loaded into r2 - Don't save locals at a return. - Fix call to handle_special_method(). Fix compareAndSwapLong. - Fix JIT bug that miscompiles org.eclipse.ui.internal.contexts.ContextAuthority.sourceChanged - invokedynamic and aldc for JIT - Modified safepoint check to rely on memory protect signal instead of polling - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel - PR1363: Fedora 19 / rawhide FTBFS SIGILL - Remove C++ flags from CC_COMPILE and fix usage in zeroshark.make. - RTC Thumb2 JIT enhancements. - Use ldrexd for atomic reads on ARMv7. - Use unified syntax for thumb code. The tarball can be downloaded from: http://icedtea.classpath.org/download/source/icedtea-2.3.11.tar.gz SHA256 checksum: 0f6ebdb217731fe64a259389c45dafc4759ce565647a6281c0afaccf3bb39f51 icedtea-2.3.11.tar.gz The tarball is accompanied by a digital signature available at: http://icedtea.classpath.org/download/source/icedtea-2.3.11.tar.gz.sig This is produced using my public key. See details below. PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 The following people helped with this release: * Andrew Dinn (ARM32 port) * Andrew Haley (ARM32 port) * Andrew Hughes (LCMS changes, release management) * Chris Phillips (ARM32 port, including PR1363 and HSX23 work) * Xerxes R?nby (PR1188) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.3.11.tar.gz $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.3.11/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130725/4026aef7/attachment.bin From ptisnovs at icedtea.classpath.org Thu Jul 25 02:41:10 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 25 Jul 2013 09:41:10 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset 16631714a0da in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=16631714a0da author: Pavel Tisnovsky date: Thu Jul 25 11:44:45 2013 +0200 Ten new tests added into BitBltUsingBgColor test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 352 +++++++++++++++----- 2 files changed, 266 insertions(+), 91 deletions(-) diffs (truncated from 1004 to 500 lines): diff -r 17d5c82fa9aa -r 16631714a0da ChangeLog --- a/ChangeLog Wed Jul 24 11:03:17 2013 +0200 +++ b/ChangeLog Thu Jul 25 11:44:45 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-25 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2013-07-24 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 17d5c82fa9aa -r 16631714a0da src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jul 24 11:03:17 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jul 25 11:44:45 2013 +0200 @@ -85,7 +85,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -102,7 +102,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -119,7 +119,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -136,7 +136,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -153,7 +153,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -170,7 +170,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -187,7 +187,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -204,7 +204,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -221,7 +221,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -238,7 +238,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -255,7 +255,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -272,7 +272,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -289,14 +289,14 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor * background color * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltEmptyBufferedImageTypeUshortGRAY(TestImage image, Graphics2D graphics2d, + private TestResult doBitBltEmptyBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, Color backgroundColor) { return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); @@ -306,7 +306,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -323,7 +323,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -340,7 +340,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -357,7 +357,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -374,7 +374,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -391,7 +391,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -408,7 +408,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -425,7 +425,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -442,7 +442,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -459,7 +459,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -476,7 +476,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_555_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -493,7 +493,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -510,14 +510,14 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_GRAY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor * background color * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltCheckerBufferedImageTypeUshortGRAY(TestImage image, Graphics2D graphics2d, + private TestResult doBitBltCheckerBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, Color backgroundColor) { return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); @@ -527,7 +527,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -544,7 +544,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_4BYTE_ABGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -561,7 +561,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_4BYTE_ABGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -578,7 +578,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_ARGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -595,7 +595,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_ARGB_PRE * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -612,7 +612,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_BGR * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -629,7 +629,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -646,7 +646,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -663,7 +663,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_GRAY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -680,7 +680,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_INDEXED * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -697,7 +697,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_555_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -714,7 +714,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_565_RGB * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor @@ -731,25 +731,195 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_GRAY * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @param backgroundColor * background color * @return test result status - PASSED, FAILED or ERROR */ - private TestResult doBitBltDiagonalCheckerBufferedImageTypeUshortGRAY(TestImage image, Graphics2D graphics2d, + private TestResult doBitBltDiagonalCheckerBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, Color backgroundColor) { return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); } /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageType4ByteABGRPre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_INT_ARGB + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_INT_ARGB_PRE + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageTypeIntARGBPre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_INT_BGR + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_INT_RGB + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d From ptisnovs at icedtea.classpath.org Thu Jul 25 02:44:58 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 25 Jul 2013 09:44:58 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset fcdb4d1cf239 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=fcdb4d1cf239 author: Pavel Tisnovsky date: Thu Jul 25 11:48:39 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into ScriptEngineManagerClassTest. diffstat: ChangeLog | 7 +++ src/org/RhinoTests/ScriptEngineManagerClassTest.java | 41 +++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletions(-) diffs (104 lines): diff -r 205ca386a62e -r fcdb4d1cf239 ChangeLog --- a/ChangeLog Wed Jul 24 11:22:02 2013 +0200 +++ b/ChangeLog Thu Jul 25 11:48:39 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-25 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineManagerClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into ScriptEngineManagerClassTest. + 2013-07-24 Pavel Tisnovsky * src/org/RhinoTests/ScriptExceptionClassTest.java: diff -r 205ca386a62e -r fcdb4d1cf239 src/org/RhinoTests/ScriptEngineManagerClassTest.java --- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Wed Jul 24 11:22:02 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Thu Jul 25 11:48:39 2013 +0200 @@ -52,12 +52,13 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.ScriptEngineManager; - /** * Set of tests which check the API of ScriptEngineManager class using * Java reflection API. @@ -285,6 +286,7 @@ */ protected void testGetConstructors() { // map of constructors which should exists + @SuppressWarnings("unused") Map testedConstructors = null; Map testedConstructors_jdk6 = new HashMap(); Map testedConstructors_jdk7 = new HashMap(); @@ -332,6 +334,7 @@ */ protected void testGetDeclaredConstructors() { // map of constructors which should exists + @SuppressWarnings("unused") Map testedConstructors = null; Map testedConstructors_jdk6 = new HashMap(); Map testedConstructors_jdk7 = new HashMap(); @@ -1069,12 +1072,15 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -1229,6 +1235,39 @@ } /** + * Test for method javax.script.ScriptEngineManager.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.scriptEngineManagerClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngineManager.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.scriptEngineManagerClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.ScriptEngineManager.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.scriptEngineManagerClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngineManager.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.scriptEngineManagerClass.desiredAssertionStatus(), + "Method ScriptEngineManager.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptEngineManager */ @SuppressWarnings("cast") From andrew at icedtea.classpath.org Thu Jul 25 03:07:35 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:07:35 +0000 Subject: /hg/release/icedtea7-2.3: 6 new changesets Message-ID: changeset 5f132fbb8b4c in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=5f132fbb8b4c author: Andrew John Hughes date: Wed Jul 24 22:32:23 2013 +0100 List ARM port changes. 2013-07-24 Andrew John Hughes * NEWS: List ARM port changes. changeset 93abc9ac9cc2 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=93abc9ac9cc2 author: Andrew John Hughes date: Wed Jul 24 22:33:19 2013 +0100 Prepare for 2.3.11 release. 2013-07-24 Andrew John Hughes * NEWS: Set release date. * configure.ac: Set version to 2.3.11. changeset 197d1182abfd in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=197d1182abfd author: Andrew John Hughes date: Wed Jul 24 22:43:41 2013 +0100 Remove EXTRA_DIST reference to HotSpot-specific patches which no longer exist. 2013-07-24 Andrew John Hughes * Makefile.am: (EXTRA_DIST): Remove search for HotSpot-specific patches which no longer exist. changeset b2d6bf00d0fc in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=b2d6bf00d0fc author: Andrew John Hughes date: Thu Jul 25 01:33:41 2013 +0100 Re-enable system LCMS is 2.5 or above is available. 2013-07-24 Andrew John Hughes * acinclude.m4: (IT_CHECK_FOR_LCMS): Turn system LCMS back on by default if the version is 2.5 or above with the latest security fixes. changeset 05dd3f8c99d9 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=05dd3f8c99d9 author: Andrew John Hughes date: Thu Jul 25 01:39:29 2013 +0100 Mention LCMS 2 change. 2013-07-24 Andrew John Hughes * NEWS: Mention LCMS 2 change. changeset 3fc5ad52d3b4 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=3fc5ad52d3b4 author: Andrew John Hughes date: Thu Jul 25 11:07:25 2013 +0100 Added tag icedtea-2.3.11 for changeset 05dd3f8c99d9 diffstat: .hgtags | 1 + ChangeLog | 26 ++++++++++++++++++++++++++ Makefile.am | 2 -- NEWS | 29 ++++++++++++++++++++++++++++- acinclude.m4 | 7 +++---- configure.ac | 2 +- 6 files changed, 59 insertions(+), 8 deletions(-) diffs (126 lines): diff -r 4c7988ed06f8 -r 3fc5ad52d3b4 .hgtags --- a/.hgtags Wed Jul 17 21:21:52 2013 +0100 +++ b/.hgtags Thu Jul 25 11:07:25 2013 +0100 @@ -47,3 +47,4 @@ eeda7cda31dc55c0faa4d2773cfc4c2f27bb6d7a icedtea-2.3.8 b382dc61dbdde9e404a459b5b71608674e6e3c34 icedtea-2.3.9 5f0394d24af3ae26333240f3c98c94eb170ffb0c icedtea-2.3.10 +05dd3f8c99d9f7682f2913105e0dbfca1d54574c icedtea-2.3.11 diff -r 4c7988ed06f8 -r 3fc5ad52d3b4 ChangeLog --- a/ChangeLog Wed Jul 17 21:21:52 2013 +0100 +++ b/ChangeLog Thu Jul 25 11:07:25 2013 +0100 @@ -1,3 +1,29 @@ +2013-07-24 Andrew John Hughes + + * NEWS: Mention LCMS 2 change. + +2013-07-24 Andrew John Hughes + + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Turn system LCMS back on by + default if the version is 2.5 or above with the + latest security fixes. + +2013-07-24 Andrew John Hughes + + * Makefile.am: + (EXTRA_DIST): Remove search for HotSpot-specific + patches which no longer exist. + +2013-07-24 Andrew John Hughes + + * NEWS: Set release date. + * configure.ac: Set version to 2.3.11. + +2013-07-24 Andrew John Hughes + + * NEWS: List ARM port changes. + 2013-07-17 Andrew John Hughes * patches/boot/ecj-opts.patch, diff -r 4c7988ed06f8 -r 3fc5ad52d3b4 Makefile.am --- a/Makefile.am Wed Jul 17 21:21:52 2013 +0100 +++ b/Makefile.am Thu Jul 25 11:07:25 2013 +0100 @@ -768,8 +768,6 @@ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/jamvm/*.patch \ - $(top_srcdir)/patches/boot/hotspot/*/*.patch \ - $(top_srcdir)/patches/hotspot/*/*.patch \ tools-copy contrib overlays \ javaws.png javaws.desktop \ jconsole.desktop policytool.desktop \ diff -r 4c7988ed06f8 -r 3fc5ad52d3b4 NEWS --- a/NEWS Wed Jul 17 21:21:52 2013 +0100 +++ b/NEWS Thu Jul 25 11:07:25 2013 +0100 @@ -10,7 +10,34 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.3.11 (2013-XX-XX): +New in release 2.3.11 (2013-07-24): + +* System LCMS 2 support again enabled by default, requiring 2.5 or above. +* ARM Port + - Add arm_port from IcedTea 6 + - Add patches/arm.patch from IcedTea 6 + - Add patches/arm-debug.patch from IcedTea 6 + - Add patches/arm-hsdis.patch from IcedTea 6 + - Added jvmti event generation for dynamic_generate and compiled_method_load events to ARM JIT compiler + - Adjust saved SP when safepointing. + - First cut of invokedynamic + - Fix trashed thread ptr after recursive re-entry from asm JIT. + - JIT-compilation of ldc methodHandle + - Rename a bunch of misleadingly-named functions + - Changes for HSX22 + - Changes for HSX23 + - Corrected call from fast_method_handle_entry to CppInterpreter::method_handle_entry so that thread is loaded into r2 + - Don't save locals at a return. + - Fix call to handle_special_method(). Fix compareAndSwapLong. + - Fix JIT bug that miscompiles org.eclipse.ui.internal.contexts.ContextAuthority.sourceChanged + - invokedynamic and aldc for JIT + - Modified safepoint check to rely on memory protect signal instead of polling + - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel + - PR1363: Fedora 19 / rawhide FTBFS SIGILL + - Remove C++ flags from CC_COMPILE and fix usage in zeroshark.make. + - RTC Thumb2 JIT enhancements. + - Use ldrexd for atomic reads on ARMv7. + - Use unified syntax for thumb code. New in release 2.3.10 (2013-06-28): diff -r 4c7988ed06f8 -r 3fc5ad52d3b4 acinclude.m4 --- a/acinclude.m4 Wed Jul 17 21:21:52 2013 +0100 +++ b/acinclude.m4 Thu Jul 25 11:07:25 2013 +0100 @@ -1908,18 +1908,17 @@ [ AC_MSG_CHECKING([whether to use the system LCMS install]) AC_ARG_ENABLE([system-lcms], - [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])], + [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])], [ ENABLE_SYSTEM_LCMS="${enableval}" ], [ - ENABLE_SYSTEM_LCMS="no" + ENABLE_SYSTEM_LCMS="yes" ]) AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then - AC_MSG_WARN([System LCMS may not have the latest security updates]) dnl Check for LCMS2 headers and libraries. - PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) + PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) if test "x${LCMS2_FOUND}" = xno then AC_MSG_ERROR([Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy.]) diff -r 4c7988ed06f8 -r 3fc5ad52d3b4 configure.ac --- a/configure.ac Wed Jul 17 21:21:52 2013 +0100 +++ b/configure.ac Thu Jul 25 11:07:25 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.3.11pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.3.11], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Thu Jul 25 03:08:07 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:08:07 +0000 Subject: /hg/release/icedtea7-forest-2.3: Added tag icedtea-2.3.11 for ch... Message-ID: changeset e62743867f54 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=e62743867f54 author: andrew date: Wed Jul 24 22:26:43 2013 +0100 Added tag icedtea-2.3.11 for changeset f143f229bd12 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r f143f229bd12 -r e62743867f54 .hgtags --- a/.hgtags Sun Jun 23 16:53:43 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:43 2013 +0100 @@ -262,3 +262,4 @@ 0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 12b96a57263c1215818f4d1abfb6dc8b4bc6b436 icedtea-2.3.9 fb1ac57ada6c9de6313982f0ab63276547b8819b icedtea-2.3.10 +f143f229bd127586e9553378c115136f461e58c2 icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 03:09:06 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:09:06 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Added tag icedtea-2.3.1... Message-ID: changeset d24281f1ddc2 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=d24281f1ddc2 author: andrew date: Wed Jul 24 22:26:51 2013 +0100 Added tag icedtea-2.3.11 for changeset 4413a836dcc7 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4413a836dcc7 -r d24281f1ddc2 .hgtags --- a/.hgtags Wed Jul 17 19:14:46 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:51 2013 +0100 @@ -387,3 +387,4 @@ a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01 ad5a321edea22c86af5c7844ed49f7b6105ab7ff icedtea-2.3.9 4e374ade4066e340199c6f2371769e9aa2852282 icedtea-2.3.10 +4413a836dcc7022fa64f60d7faa491aba1248edc icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 03:09:14 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:09:14 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: Added tag icedtea-2.3.11 fo... Message-ID: changeset 99c9a93a77b5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=99c9a93a77b5 author: andrew date: Wed Jul 24 22:26:54 2013 +0100 Added tag icedtea-2.3.11 for changeset 0a482b2f7c35 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 0a482b2f7c35 -r 99c9a93a77b5 .hgtags --- a/.hgtags Sun Jun 23 16:54:05 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:54 2013 +0100 @@ -317,3 +317,4 @@ a71103b8cbb155a4af136baaee4f4bdd30ee817c jdk7u25-b14 e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15 bd392c168d5c0e44f05f50fd0e0a1f90443bf897 icedtea-2.3.10 +0a482b2f7c351d157c5ae9ca495d762c2deaf37c icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 03:10:17 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:10:17 +0000 Subject: /hg/release/icedtea7-forest-2.3/corba: Added tag icedtea-2.3.11 ... Message-ID: changeset ea108ff3be9a in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ea108ff3be9a author: andrew date: Wed Jul 24 22:26:45 2013 +0100 Added tag icedtea-2.3.11 for changeset eda3895cb67e diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r eda3895cb67e -r ea108ff3be9a .hgtags --- a/.hgtags Sun Jun 23 16:53:44 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:45 2013 +0100 @@ -262,3 +262,4 @@ 94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01 47a6bf94ce11644ba0f1dc4f251f61ccd1b78c34 icedtea-2.3.9 8e581b67151110a223a6f42a135193261a551a0d icedtea-2.3.10 +eda3895cb67e1839d712370fb6d936b844f9de72 icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 03:10:24 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:10:24 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxp: Added tag icedtea-2.3.11 f... Message-ID: changeset 332f0234a53e in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=332f0234a53e author: andrew date: Wed Jul 24 22:26:46 2013 +0100 Added tag icedtea-2.3.11 for changeset 181faea8867b diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 181faea8867b -r 332f0234a53e .hgtags --- a/.hgtags Sun Jun 23 16:53:45 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:46 2013 +0100 @@ -262,3 +262,4 @@ 8a9867ee429440b657eb5852c4dae5f029356022 jdk7u17-b01 d2142901bcb789071858ae249d5a29f12d8bce78 icedtea-2.3.9 1a02956fcfaf708c626e06105dbf615594af88f7 icedtea-2.3.10 +181faea8867b60279d38450b37c52a916fd11046 icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 03:10:31 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:10:31 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxws: Added tag icedtea-2.3.11 ... Message-ID: changeset fdc4ad9f30c6 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=fdc4ad9f30c6 author: andrew date: Wed Jul 24 22:26:47 2013 +0100 Added tag icedtea-2.3.11 for changeset 5dc89903bfc7 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 5dc89903bfc7 -r fdc4ad9f30c6 .hgtags --- a/.hgtags Sun Jun 23 16:53:47 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:47 2013 +0100 @@ -262,3 +262,4 @@ b8496d1dc0058341da1790bc2e7d2dbba6d4f90e jdk7u17-b01 b1877762d45c1117b5476cf78400ae9affe1b76d icedtea-2.3.9 c0e829bfbf6281c829e0f6af051b96a9eba0052f icedtea-2.3.10 +5dc89903bfc7672a6f5f9e5078633ed33173da21 icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 03:10:39 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 10:10:39 +0000 Subject: /hg/release/icedtea7-forest-2.3/langtools: Added tag icedtea-2.3... Message-ID: changeset 6c9b532f4281 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=6c9b532f4281 author: andrew date: Wed Jul 24 22:26:49 2013 +0100 Added tag icedtea-2.3.11 for changeset e2c5f493844a diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r e2c5f493844a -r 6c9b532f4281 .hgtags --- a/.hgtags Sun Jun 23 16:53:49 2013 +0100 +++ b/.hgtags Wed Jul 24 22:26:49 2013 +0100 @@ -262,3 +262,4 @@ edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01 fd956199cb8213f9af95b694ebdde6aa1fd7f53a icedtea-2.3.9 8cf15d334ad372f540d7504212cc21ff7a223852 icedtea-2.3.10 +e2c5f493844a842ec31d5979825e4f35d9dd9bdb icedtea-2.3.11 From andrew at icedtea.classpath.org Thu Jul 25 09:10:19 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 16:10:19 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: Set Zero flags for ARM32 in... Message-ID: changeset 4a0cf2c05cc6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4a0cf2c05cc6 author: andrew date: Thu Jul 25 17:10:09 2013 +0100 Set Zero flags for ARM32 in jdk_generic_profile.sh diffstat: make/jdk_generic_profile.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 99c9a93a77b5 -r 4a0cf2c05cc6 make/jdk_generic_profile.sh --- a/make/jdk_generic_profile.sh Wed Jul 24 22:26:54 2013 +0100 +++ b/make/jdk_generic_profile.sh Thu Jul 25 17:10:09 2013 +0100 @@ -280,7 +280,7 @@ # ZERO_ENDIANNESS is the endianness of the processor case "${ZERO_LIBARCH}" in - i386|amd64|ia64) + i386|amd64|ia64|arm) ZERO_ENDIANNESS=little ;; ppc*|s390*|sparc*|alpha) @@ -307,6 +307,9 @@ s390) ZERO_ARCHFLAG="-m31" ;; + arm) + ZERO_ARCHFLAG="-D_LITTLE_ENDIAN" + ;; *) ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}" esac From aazores at redhat.com Thu Jul 25 10:10:24 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 25 Jul 2013 13:10:24 -0400 Subject: [rfc][icedtea-web] AboutDialog IOExceptions Message-ID: <51F15C00.4000909@redhat.com> Jiri added a try/catch in the HTMLPanel's constructor so it no longer throws IOExceptions if given a bad resource URL, but the constructor was still marked as throwing IOExceptions. Just removing that since it's no longer true, and removing the try/catches everywhere else in the code that handled that (generally, calls to AboutDialog.display()). Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: javaws-about-exceptions.patch Type: text/x-patch Size: 5484 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130725/ee44374c/javaws-about-exceptions.patch From gitne at excite.co.jp Thu Jul 25 12:01:25 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 26 Jul 2013 04:01:25 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBBYm91dERpYWxvZyBJT0V4Y2VwdGlvbnM=?= Message-ID: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> "Andrew Azores" wrote: > Jiri added a try/catch in the HTMLPanel's constructor so it no longer > throws IOExceptions if given a bad resource URL, but the constructor was > still marked as throwing IOExceptions. Just removing that since it's no > longer true, and removing the try/catches everywhere else in the code > that handled that (generally, calls to AboutDialog.display()). > > Andrew A > - public HTMLPanel(URL url, String identifier) throws > IOException { > + public HTMLPanel(URL url, String identifier) { > super(new BorderLayout()); > id = identifier; > JEditorPane pane = new JEditorPane(); > - try{ > + try { > pane = new JEditorPane(url); > } catch(Exception ex){ > //no need to have invalid url fatal catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. Apart from that; nice clean up. :) Jacob From aazores at redhat.com Thu Jul 25 12:19:46 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 25 Jul 2013 15:19:46 -0400 Subject: [rfc][icedtea-web] AboutDialog IOExceptions In-Reply-To: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> References: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> Message-ID: <51F17A52.2020008@redhat.com> On 07/25/2013 03:01 PM, Jacob Wisor wrote: >> - public HTMLPanel(URL url, String identifier) throws >> IOException { >> + public HTMLPanel(URL url, String identifier) { >> super(new BorderLayout()); >> id = identifier; >> JEditorPane pane = new JEditorPane(); >> - try{ >> + try { >> pane = new JEditorPane(url); >> } catch(Exception ex){ >> //no need to have invalid url fatal > catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. > > Apart from that; nice clean up. > > Jacob The "try" is still there, I just added a space between the keyword and the opening brace . Good point about catching Exception in general though, I'll change that to IOException. Andrew A -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130725/6ddbd914/attachment.html From jvanek at redhat.com Thu Jul 25 12:31:48 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 25 Jul 2013 21:31:48 +0200 Subject: [rfc][icedtea-web] AboutDialog IOExceptions In-Reply-To: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> References: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> Message-ID: <51F17D24.4020008@redhat.com> On 07/25/2013 09:01 PM, Jacob Wisor wrote: > "Andrew Azores" wrote: >> Jiri added a try/catch in the HTMLPanel's constructor so it no longer >> throws IOExceptions if given a bad resource URL, but the constructor was >> still marked as throwing IOExceptions. Just removing that since it's no >> longer true, and removing the try/catches everywhere else in the code >> that handled that (generally, calls to AboutDialog.display()). >> >> Andrew A > >> - public HTMLPanel(URL url, String identifier) throws >> IOException { >> + public HTMLPanel(URL url, String identifier) { >> super(new BorderLayout()); >> id = identifier; >> JEditorPane pane = new JEditorPane(); >> - try{ >> + try { >> pane = new JEditorPane(url); >> } catch(Exception ex){ >> //no need to have invalid url fatal > catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. > there is an try :) If it compiles, then ok to push. Thanx for clean up and check! > Apart from that; nice clean up. :) > > Jacob From andrew at icedtea.classpath.org Thu Jul 25 12:28:12 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 25 Jul 2013 19:28:12 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Tell gcc explicitly tha... Message-ID: changeset ca2cc93a6640 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ca2cc93a6640 author: andrew date: Thu Jul 25 20:28:04 2013 +0100 Tell gcc explicitly that the input from stdin is C++, allowing C++ flags to be used. diffstat: make/linux/makefiles/zeroshark.make | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d24281f1ddc2 -r ca2cc93a6640 make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Wed Jul 24 22:26:51 2013 +0100 +++ b/make/linux/makefiles/zeroshark.make Thu Jul 25 20:28:04 2013 +0100 @@ -42,7 +42,7 @@ bytecodes_arm.s: bytecodes_arm.def mkbc @echo Generating ARM assembler bytecode sequences - $(CXX_COMPILE) -E - < $< | ./mkbc - $@ $(COMPILE_DONE) + $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) mkbc: $(GAMMADIR)/tools/mkbc.c @echo Compiling mkbc tool From jvanek at redhat.com Thu Jul 25 12:44:50 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 25 Jul 2013 21:44:50 +0200 Subject: [rfc][icedtea-web] AboutDialog IOExceptions In-Reply-To: <51F17A52.2020008@redhat.com> References: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> <51F17A52.2020008@redhat.com> Message-ID: <51F18032.5060202@redhat.com> On 07/25/2013 09:19 PM, Andrew Azores wrote: > On 07/25/2013 03:01 PM, Jacob Wisor wrote: > >>> - public HTMLPanel(URL url, String identifier) throws >>> IOException { >>> + public HTMLPanel(URL url, String identifier) { >>> super(new BorderLayout()); >>> id = identifier; >>> JEditorPane pane = new JEditorPane(); >>> - try{ >>> + try { >>> pane = new JEditorPane(url); >>> } catch(Exception ex){ >>> //no need to have invalid url fatal >> catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. >> >> Apart from that; nice clean up. >> >> Jacob > The "try" is still there, I just added a space between the keyword and > the opening brace. > > Good point about catching Exception in general though, I'll change that > to IOException. hmhhm.. I would like to catch also NPE here. So exception should be ok... If Jacob insists you can explicitli catch runtime and security one and rethrow... From aazores at icedtea.classpath.org Thu Jul 25 12:43:17 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Thu, 25 Jul 2013 19:43:17 +0000 Subject: /hg/icedtea-web: Cleaned up "throws IOException" from HTMLPanel ... Message-ID: changeset 9a6449585c09 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9a6449585c09 author: Andrew Azores date: Thu Jul 25 15:42:41 2013 -0400 Cleaned up "throws IOException" from HTMLPanel constructor and try/catches elsewhere which handled this diffstat: ChangeLog | 12 ++++++++++ netx/net/sourceforge/jnlp/about/AboutDialog.java | 8 +++--- netx/net/sourceforge/jnlp/about/HTMLPanel.java | 6 ++-- netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java | 9 +----- netx/net/sourceforge/jnlp/runtime/Boot.java | 10 +------ netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java | 9 +----- 6 files changed, 25 insertions(+), 29 deletions(-) diffs (158 lines): diff -r 6904f82aa501 -r 9a6449585c09 ChangeLog --- a/ChangeLog Mon Jul 22 10:13:30 2013 -0400 +++ b/ChangeLog Thu Jul 25 15:42:41 2013 -0400 @@ -1,3 +1,15 @@ +2013-07-25 Andrew Azores + * netx/net/sourceforge/jnlp/about/AboutDialog.java (AboutDialog, display): + removed "throws IOException" + * netx/net/sourceforge/jnlp/about/HTMLPanel.java (HTMLPanel): removed + "throws IOException" and changed try/catch to catch IOException rather + than Exception + * netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java: removed + try/catch around AboutDialog.display() call + * netx/net/sourceforge/jnlp/runtime/Boot.java (main): same + * netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java: + same + 2013-07-22 Andrew Azores * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: (getProxiesWithoutCaching) added java.vm.name read permission to fix diff -r 6904f82aa501 -r 9a6449585c09 netx/net/sourceforge/jnlp/about/AboutDialog.java --- a/netx/net/sourceforge/jnlp/about/AboutDialog.java Mon Jul 22 10:13:30 2013 -0400 +++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java Thu Jul 25 15:42:41 2013 -0400 @@ -45,7 +45,6 @@ import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.IOException; import java.net.URL; import javax.swing.JButton; @@ -70,7 +69,7 @@ private HTMLPanel aboutPanel, authorsPanel, newsPanel, changelogPanel, copyingPanel; private JButton aboutButton, authorsButton, newsButton, changelogButton, copyingButton; - public AboutDialog(boolean modal) throws IOException { + public AboutDialog(boolean modal) { super(new GridBagLayout()); frame = new JDialog((Frame)null, R("AboutDialogueTabAbout") + " IcedTea-Web", modal); @@ -186,10 +185,11 @@ frame.setVisible(true); } - public static void display() throws IOException { + public static void display() { display(false); } - public static void display(boolean modal) throws IOException { + + public static void display(boolean modal) { SwingUtilities.invokeLater(new AboutDialog(modal)); } diff -r 6904f82aa501 -r 9a6449585c09 netx/net/sourceforge/jnlp/about/HTMLPanel.java --- a/netx/net/sourceforge/jnlp/about/HTMLPanel.java Mon Jul 22 10:13:30 2013 -0400 +++ b/netx/net/sourceforge/jnlp/about/HTMLPanel.java Thu Jul 25 15:42:41 2013 -0400 @@ -53,13 +53,13 @@ private String id; - public HTMLPanel(URL url, String identifier) throws IOException { + public HTMLPanel(URL url, String identifier) { super(new BorderLayout()); id = identifier; JEditorPane pane = new JEditorPane(); - try{ + try { pane = new JEditorPane(url); - } catch(Exception ex){ + } catch (IOException ex) { //no need to have invalid url fatal ex.printStackTrace(); } diff -r 6904f82aa501 -r 9a6449585c09 netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java Mon Jul 22 10:13:30 2013 -0400 +++ b/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java Thu Jul 25 15:42:41 2013 -0400 @@ -24,13 +24,12 @@ import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.IOException; import javax.swing.Box; import javax.swing.JButton; import javax.swing.JLabel; + import net.sourceforge.jnlp.about.AboutDialog; - import net.sourceforge.jnlp.runtime.Translator; /** @@ -52,11 +51,7 @@ aboutButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - try { - AboutDialog.display(); - } catch (IOException ex) { - throw new RuntimeException(ex); - } + AboutDialog.display(); } }); c.fill = GridBagConstraints.BOTH; diff -r 6904f82aa501 -r 9a6449585c09 netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jul 22 10:13:30 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jul 25 15:42:41 2013 -0400 @@ -19,7 +19,6 @@ import static net.sourceforge.jnlp.runtime.Translator.R; import java.io.File; -import java.io.IOException; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; @@ -158,13 +157,8 @@ System.exit(0); } else { System.out.println(R("BLaunchAbout")); - try { - AboutDialog.display(); - return; - } catch (IOException e) { - System.out.println(R("BLaunchAboutFailure")); - throw new RuntimeException(e); - } + AboutDialog.display(); + return; } } diff -r 6904f82aa501 -r 9a6449585c09 netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java --- a/netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java Mon Jul 22 10:13:30 2013 -0400 +++ b/netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java Thu Jul 25 15:42:41 2013 -0400 @@ -41,9 +41,8 @@ import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.Observable; + import net.sourceforge.jnlp.about.AboutDialog; - import net.sourceforge.jnlp.splashscreen.impls.defaultsplashscreen2012.BasePainter; import net.sourceforge.jnlp.splashscreen.parts.BasicComponentSplashScreen; @@ -69,11 +68,7 @@ @Override public void mouseClicked(MouseEvent e) { if (e.getY() < painter.getAboutOfset().y && e.getX() > (painter.getAboutOfset().x)) { - try { - AboutDialog.display(); - } catch (Exception ex) { - ex.printStackTrace(); - } + AboutDialog.display(); } } }); From aazores at redhat.com Thu Jul 25 12:46:33 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 25 Jul 2013 15:46:33 -0400 Subject: [rfc][icedtea-web] AboutDialog IOExceptions In-Reply-To: <51F18032.5060202@redhat.com> References: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> <51F17A52.2020008@redhat.com> <51F18032.5060202@redhat.com> Message-ID: <51F18099.2040406@redhat.com> On 07/25/2013 03:44 PM, Jiri Vanek wrote: > On 07/25/2013 09:19 PM, Andrew Azores wrote: >> On 07/25/2013 03:01 PM, Jacob Wisor wrote: >> >>>> - public HTMLPanel(URL url, String identifier) throws >>>> IOException { >>>> + public HTMLPanel(URL url, String identifier) { >>>> super(new BorderLayout()); >>>> id = identifier; >>>> JEditorPane pane = new JEditorPane(); >>>> - try{ >>>> + try { >>>> pane = new JEditorPane(url); >>>> } catch(Exception ex){ >>>> //no need to have invalid url fatal >>> catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. >>> >>> Apart from that; nice clean up. >>> >>> Jacob >> The "try" is still there, I just added a space between the keyword and >> the opening brace. >> >> Good point about catching Exception in general though, I'll change that >> to IOException. > hmhhm.. I would like to catch also NPE here. So exception should be ok... > > If Jacob insists you can explicitli catch runtime and security one and rethrow... What NPE would there be? If "url" is null? In that case the JEditorPane throws an IOException (see setPage method). Andrew A From gitne at excite.co.jp Thu Jul 25 14:21:07 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 26 Jul 2013 06:21:07 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBBYm91dERpYWxvZyBJT0V4Y2VwdGlvbnM=?= Message-ID: <201307252121.r6PLL7B4000866@mail-web01.excite.co.jp> "Andrew Azores" wrote: > On 07/25/2013 03:01 PM, Jacob Wisor wrote: > > >> - public HTMLPanel(URL url, String identifier) throws > >> IOException { > >> + public HTMLPanel(URL url, String identifier) { > >> super(new BorderLayout()); > >> id = identifier; > >> JEditorPane pane = new JEditorPane(); > >> - try{ > >> + try { > >> pane = new JEditorPane(url); > >> } catch(Exception ex){ > >> //no need to have invalid url fatal > > catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. > > > > Apart from that; nice clean up. > > > > Jacob > > The "try" is still there, I just added a space between the keyword and > the opening brace . Oh right, I'm sorry, I should have looked more carefully. > Good point about catching Exception in general though, I'll change that > to IOException. > > Andrew A From gitne at excite.co.jp Thu Jul 25 14:37:48 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 26 Jul 2013 06:37:48 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBBYm91dERpYWxvZyBJT0V4Y2VwdGlvbnM=?= Message-ID: <201307252137.r6PLbmxw023323@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > On 07/25/2013 09:19 PM, Andrew Azores wrote: > > On 07/25/2013 03:01 PM, Jacob Wisor wrote: > > > >>> - public HTMLPanel(URL url, String identifier) throws > >>> IOException { > >>> + public HTMLPanel(URL url, String identifier) { > >>> super(new BorderLayout()); > >>> id = identifier; > >>> JEditorPane pane = new JEditorPane(); > >>> - try{ > >>> + try { > >>> pane = new JEditorPane(url); > >>> } catch(Exception ex){ > >>> //no need to have invalid url fatal > >> catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. > >> > >> Apart from that; nice clean up. > >> > >> Jacob > > The "try" is still there, I just added a space between the keyword and > > the opening brace. > > > > Good point about catching Exception in general though, I'll change that > > to IOException. > > hmhhm.. I would like to catch also NPE here. So exception should be ok... > > If Jacob insists you can explicitli catch runtime and security one and rethrow... I do not insist. ;) Catching NPE should be okay, if it adds some gaceful handling of an error. Rethrowing a RuntimeException does not make up for the potential vulnerability because the first general Exception catch may be all that an attacker needs to be successful. Or... I am simply exaggerating again :D From jvanek at redhat.com Thu Jul 25 22:18:13 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 26 Jul 2013 07:18:13 +0200 Subject: [rfc][icedtea-web] AboutDialog IOExceptions In-Reply-To: <51F18099.2040406@redhat.com> References: <201307251901.r6PJ1P3r018477@mail-web03.excite.co.jp> <51F17A52.2020008@redhat.com> <51F18032.5060202@redhat.com> <51F18099.2040406@redhat.com> Message-ID: <51F20695.8040207@redhat.com> On 07/25/2013 09:46 PM, Andrew Azores wrote: > On 07/25/2013 03:44 PM, Jiri Vanek wrote: >> On 07/25/2013 09:19 PM, Andrew Azores wrote: >>> On 07/25/2013 03:01 PM, Jacob Wisor wrote: >>> >>>>> - public HTMLPanel(URL url, String identifier) throws >>>>> IOException { >>>>> + public HTMLPanel(URL url, String identifier) { >>>>> super(new BorderLayout()); >>>>> id = identifier; >>>>> JEditorPane pane = new JEditorPane(); >>>>> - try{ >>>>> + try { >>>>> pane = new JEditorPane(url); >>>>> } catch(Exception ex){ >>>>> //no need to have invalid url fatal >>>> catch without a try? Does this compile? Besides, catching any exception is a bad idea or habit because RuntimeException and SecurityException fall into that category too. This may be inherently unsafe. >>>> >>>> Apart from that; nice clean up. >>>> >>>> Jacob >>> The "try" is still there, I just added a space between the keyword and >>> the opening brace. >>> >>> Good point about catching Exception in general though, I'll change that >>> to IOException. >> hmhhm.. I would like to catch also NPE here. So exception should be ok... >> >> If Jacob insists you can explicitli catch runtime and security one and rethrow... > > What NPE would there be? If "url" is null? In that case the JEditorPane > throws an IOException (see setPage method). > > Andrew A fair enough. Go on then! thanx! From andrew at icedtea.classpath.org Fri Jul 26 01:51:38 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 08:51:38 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Use $(CC) as before for... Message-ID: changeset 799641e9320f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=799641e9320f author: andrew date: Fri Jul 26 09:51:14 2013 +0100 Use $(CC) as before for bytecodes_arm.s and mkoffsets targets diffstat: make/linux/makefiles/zeroshark.make | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r ca2cc93a6640 -r 799641e9320f make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Thu Jul 25 20:28:04 2013 +0100 +++ b/make/linux/makefiles/zeroshark.make Fri Jul 26 09:51:14 2013 +0100 @@ -42,7 +42,7 @@ bytecodes_arm.s: bytecodes_arm.def mkbc @echo Generating ARM assembler bytecode sequences - $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) + $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) mkbc: $(GAMMADIR)/tools/mkbc.c @echo Compiling mkbc tool @@ -51,7 +51,7 @@ mkoffsets: asm_helper.cpp @echo Compiling offset generator $(QUIETLY) $(REMOVE_TARGET) - $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) endif From ptisnovs at icedtea.classpath.org Fri Jul 26 02:00:18 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 26 Jul 2013 09:00:18 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset a12dc926e709 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a12dc926e709 author: Pavel Tisnovsky date: Fri Jul 26 11:03:56 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into ScriptEngineManagerClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/ScriptEngineManagerClassTest.java | 54 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diffs (77 lines): diff -r fcdb4d1cf239 -r a12dc926e709 ChangeLog --- a/ChangeLog Thu Jul 25 11:48:39 2013 +0200 +++ b/ChangeLog Fri Jul 26 11:03:56 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-26 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineManagerClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into ScriptEngineManagerClassTest. + 2013-07-25 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineManagerClassTest.java: diff -r fcdb4d1cf239 -r a12dc926e709 src/org/RhinoTests/ScriptEngineManagerClassTest.java --- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Thu Jul 25 11:48:39 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Fri Jul 26 11:03:56 2013 +0200 @@ -1235,6 +1235,60 @@ } /** + * Test for method javax.script.ScriptEngineManager.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.scriptEngineManagerClass.getGenericSuperclass(); + assertNotNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngineManager.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // get the right array of field signatures + String[] genericInterfaceNames = null; + switch (getJavaVersion()) { + case 6: + genericInterfaceNames = genericInterfaceNames_jdk6; + break; + case 7: + genericInterfaceNames = genericInterfaceNames_jdk7; + break; + case 8: + genericInterfaceNames = genericInterfaceNames_jdk8; + break; + } + + // get all generic interfaces + Type[] genericInterfaces = this.scriptEngineManagerClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length); + + // and transform the array into a list of field names + List interfacesAsString = new ArrayList(); + for (Type genericInterface : genericInterfaces) { + interfacesAsString.add(genericInterface.toString()); + } + + // check if all required interfaces really exists + for (String interfaceThatShouldExists : genericInterfaceNames) { + assertTrue(interfacesAsString.contains(interfaceThatShouldExists), + "interface " + interfaceThatShouldExists + " not found"); + } + } + + /** * Test for method javax.script.ScriptEngineManager.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From ptisnovs at icedtea.classpath.org Fri Jul 26 02:28:13 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 26 Jul 2013 09:28:13 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColorAlpha t... Message-ID: changeset 458d896ac158 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=458d896ac158 author: Pavel Tisnovsky date: Fri Jul 26 11:31:51 2013 +0200 Ten new tests added into BitBltUsingBgColorAlpha test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java | 150 ++++++++++++++++ 2 files changed, 155 insertions(+), 0 deletions(-) diffs (172 lines): diff -r 16631714a0da -r 458d896ac158 ChangeLog --- a/ChangeLog Thu Jul 25 11:44:45 2013 +0200 +++ b/ChangeLog Fri Jul 26 11:31:51 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-26 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: + Ten new tests added into BitBltUsingBgColorAlpha test suite. + 2013-07-25 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 16631714a0da -r 458d896ac158 src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Thu Jul 25 11:44:45 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Fri Jul 26 11:31:51 2013 +0200 @@ -1183,6 +1183,156 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundBlueAlpha000(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.blue, 0.0f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundBlueAlpha025(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.blue, 0.25f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundBlueAlpha050(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.blue, 0.5f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundBlueAlpha075(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.blue, 0.75f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundBlueAlpha100(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.blue, 1.00f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundYellowAlpha000(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.yellow, 0.0f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundYellowAlpha025(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.yellow, 0.25f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundYellowAlpha050(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.yellow, 0.5f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundYellowAlpha075(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.yellow, 0.75f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundYellowAlpha100(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, Color.yellow, 1.00f); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_PRE. * Background color is set to Color.black. * From andrew at icedtea.classpath.org Fri Jul 26 03:31:55 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 10:31:55 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Include $(CFLAGS) in as... Message-ID: changeset 37b254871acb in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=37b254871acb author: andrew date: Fri Jul 26 11:31:42 2013 +0100 Include $(CFLAGS) in assembler stage diffstat: make/linux/makefiles/zeroshark.make | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 799641e9320f -r 37b254871acb make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Fri Jul 26 09:51:14 2013 +0100 +++ b/make/linux/makefiles/zeroshark.make Fri Jul 26 11:31:42 2013 +0100 @@ -58,7 +58,7 @@ %.o: %.S @echo Assembling $< $(QUIETLY) $(REMOVE_TARGET) - $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) + $(COMPILE.CC) $(CFLAGS) -o $@ $< $(COMPILE_DONE) # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) From aazores at redhat.com Fri Jul 26 08:34:52 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 26 Jul 2013 11:34:52 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl refactor Message-ID: <51F2971C.7050005@redhat.com> Changelog: * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java (TinyHttpdImpl): BufferedReader and DataOutputStream become member variables rather than local to run. More informative/mnemonic variable names (writeErrorToPipe): new private method. (writeToPipe): new private method. (run): refactored to use writeToPipe and writeErrorToPipe, and ensuring that streams are closed when no longer in use. More informative/mnemonic variable names The patch looks big (relative to the size of the file) but it's really almost entirely variable renaming and method extractions. :) Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: TinyHttpdImpl_refactor.patch Type: text/x-patch Size: 13175 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130726/85c401de/TinyHttpdImpl_refactor.patch From andrew at icedtea.classpath.org Fri Jul 26 15:44:08 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:44:08 +0000 Subject: /hg/release/icedtea7-forest-2.3: Added tag icedtea-2.3.12 for ch... Message-ID: changeset 8f7b2e697b59 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=8f7b2e697b59 author: andrew date: Thu Jul 25 20:48:32 2013 +0100 Added tag icedtea-2.3.12 for changeset e62743867f54 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r e62743867f54 -r 8f7b2e697b59 .hgtags --- a/.hgtags Wed Jul 24 22:26:43 2013 +0100 +++ b/.hgtags Thu Jul 25 20:48:32 2013 +0100 @@ -263,3 +263,4 @@ 12b96a57263c1215818f4d1abfb6dc8b4bc6b436 icedtea-2.3.9 fb1ac57ada6c9de6313982f0ab63276547b8819b icedtea-2.3.10 f143f229bd127586e9553378c115136f461e58c2 icedtea-2.3.11 +e62743867f54fd52b397541a266cc1c35f25ee3c icedtea-2.3.12 From andrew at icedtea.classpath.org Fri Jul 26 15:44:19 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:44:19 +0000 Subject: /hg/release/icedtea7-forest-2.3/corba: Added tag icedtea-2.3.12 ... Message-ID: changeset 7f6068c72726 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=7f6068c72726 author: andrew date: Thu Jul 25 20:48:32 2013 +0100 Added tag icedtea-2.3.12 for changeset ea108ff3be9a diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r ea108ff3be9a -r 7f6068c72726 .hgtags --- a/.hgtags Wed Jul 24 22:26:45 2013 +0100 +++ b/.hgtags Thu Jul 25 20:48:32 2013 +0100 @@ -263,3 +263,4 @@ 47a6bf94ce11644ba0f1dc4f251f61ccd1b78c34 icedtea-2.3.9 8e581b67151110a223a6f42a135193261a551a0d icedtea-2.3.10 eda3895cb67e1839d712370fb6d936b844f9de72 icedtea-2.3.11 +ea108ff3be9a260a7f0e47743ea20d897de407d8 icedtea-2.3.12 From andrew at icedtea.classpath.org Fri Jul 26 15:44:33 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:44:33 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxp: Added tag icedtea-2.3.12 f... Message-ID: changeset 5393f32bae76 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=5393f32bae76 author: andrew date: Thu Jul 25 20:48:33 2013 +0100 Added tag icedtea-2.3.12 for changeset 332f0234a53e diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 332f0234a53e -r 5393f32bae76 .hgtags --- a/.hgtags Wed Jul 24 22:26:46 2013 +0100 +++ b/.hgtags Thu Jul 25 20:48:33 2013 +0100 @@ -263,3 +263,4 @@ d2142901bcb789071858ae249d5a29f12d8bce78 icedtea-2.3.9 1a02956fcfaf708c626e06105dbf615594af88f7 icedtea-2.3.10 181faea8867b60279d38450b37c52a916fd11046 icedtea-2.3.11 +332f0234a53eb42c90363abcdf361ae5f2b71ffa icedtea-2.3.12 From andrew at icedtea.classpath.org Fri Jul 26 15:44:42 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:44:42 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxws: Added tag icedtea-2.3.12 ... Message-ID: changeset ab28ab1e1484 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=ab28ab1e1484 author: andrew date: Thu Jul 25 20:48:34 2013 +0100 Added tag icedtea-2.3.12 for changeset fdc4ad9f30c6 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r fdc4ad9f30c6 -r ab28ab1e1484 .hgtags --- a/.hgtags Wed Jul 24 22:26:47 2013 +0100 +++ b/.hgtags Thu Jul 25 20:48:34 2013 +0100 @@ -263,3 +263,4 @@ b1877762d45c1117b5476cf78400ae9affe1b76d icedtea-2.3.9 c0e829bfbf6281c829e0f6af051b96a9eba0052f icedtea-2.3.10 5dc89903bfc7672a6f5f9e5078633ed33173da21 icedtea-2.3.11 +fdc4ad9f30c6e75a1ff4c7a37039e4f37b01740e icedtea-2.3.12 From andrew at icedtea.classpath.org Fri Jul 26 15:44:55 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:44:55 +0000 Subject: /hg/release/icedtea7-forest-2.3/langtools: Added tag icedtea-2.3... Message-ID: changeset 7bd72dadca4a in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=7bd72dadca4a author: andrew date: Thu Jul 25 20:48:34 2013 +0100 Added tag icedtea-2.3.12 for changeset 6c9b532f4281 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 6c9b532f4281 -r 7bd72dadca4a .hgtags --- a/.hgtags Wed Jul 24 22:26:49 2013 +0100 +++ b/.hgtags Thu Jul 25 20:48:34 2013 +0100 @@ -263,3 +263,4 @@ fd956199cb8213f9af95b694ebdde6aa1fd7f53a icedtea-2.3.9 8cf15d334ad372f540d7504212cc21ff7a223852 icedtea-2.3.10 e2c5f493844a842ec31d5979825e4f35d9dd9bdb icedtea-2.3.11 +6c9b532f428152081b7a610de342e6e90d9cbcb3 icedtea-2.3.12 From andrew at icedtea.classpath.org Fri Jul 26 15:45:07 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:45:07 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Added tag icedtea-2.3.1... Message-ID: changeset a6502a8a6b31 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=a6502a8a6b31 author: andrew date: Fri Jul 26 18:34:12 2013 +0100 Added tag icedtea-2.3.12 for changeset 37b254871acb diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 37b254871acb -r a6502a8a6b31 .hgtags --- a/.hgtags Fri Jul 26 11:31:42 2013 +0100 +++ b/.hgtags Fri Jul 26 18:34:12 2013 +0100 @@ -388,3 +388,4 @@ ad5a321edea22c86af5c7844ed49f7b6105ab7ff icedtea-2.3.9 4e374ade4066e340199c6f2371769e9aa2852282 icedtea-2.3.10 4413a836dcc7022fa64f60d7faa491aba1248edc icedtea-2.3.11 +37b254871acbef27e5f29c73982ac324e7df2b9a icedtea-2.3.12 From andrew at icedtea.classpath.org Fri Jul 26 15:45:18 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 26 Jul 2013 22:45:18 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: Added tag icedtea-2.3.12 fo... Message-ID: changeset 8c388c89a45c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8c388c89a45c author: andrew date: Thu Jul 25 20:48:39 2013 +0100 Added tag icedtea-2.3.12 for changeset 4a0cf2c05cc6 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4a0cf2c05cc6 -r 8c388c89a45c .hgtags --- a/.hgtags Thu Jul 25 17:10:09 2013 +0100 +++ b/.hgtags Thu Jul 25 20:48:39 2013 +0100 @@ -318,3 +318,4 @@ e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15 bd392c168d5c0e44f05f50fd0e0a1f90443bf897 icedtea-2.3.10 0a482b2f7c351d157c5ae9ca495d762c2deaf37c icedtea-2.3.11 +4a0cf2c05cc6f0abd48d72008d8880b7e7a874e1 icedtea-2.3.12 From bugzilla-daemon at icedtea.classpath.org Fri Jul 26 16:00:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 26 Jul 2013 23:00:13 +0000 Subject: [Bug 1507] New: Opening a VPN episode (Citrix). Serious fatal error window pop-up. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 Bug ID: 1507 Summary: Opening a VPN episode (Citrix). Serious fatal error window pop-up. Classification: Unclassified Product: IcedTea-Web Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: steve at slmandr.com CC: unassigned at icedtea.classpath.org IcedTea-Web Plugin version: 1.4 (suse-4.18.1-x86_64) Fri Jul 26 18:46:19 EDT 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. For more information click "more information button". at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:789) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader .java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java :382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java: 444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java: 420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) ... 2 more Chain: 1) at Fri Jul 26 18:41:36 EDT 2013 net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader .java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java :382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java: 444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java: 420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) 2) at Fri Jul 26 18:41:36 EDT 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. For more information click "more information button". at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:789) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader .java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java :382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java: 444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java: 420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) ... 2 more -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130726/2f080b11/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Jul 26 16:00:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 26 Jul 2013 23:00:48 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 Steve changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |1.4 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130726/2b50a6ad/attachment.html From gitne at excite.co.jp Fri Jul 26 16:49:00 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Sat, 27 Jul 2013 08:49:00 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXSBSZWdyZXNzaW9uIGFmdGVyIHJlZmFjdG9yaW5nIGZvciBYREcgc3BlY2lmaWNhdGlvbg==?= Message-ID: <201307262349.r6QNn0u3019467@mail-web01.excite.co.jp> Hello, I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. Exception occurred during event dispatching: java.lang.NullPointerException at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect ory.java:56) at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja va:360) at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j ava:343) at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java :66) at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) at java.awt.event.InvocationEvent.dispatch(Unknown Source) at java.awt.EventQueue.dispatchEventImpl(Unknown Source) at java.awt.EventQueue.access$400(Unknown Source) at java.awt.EventQueue$2.run(Unknown Source) at java.awt.EventQueue$2.run(Unknown Source) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) at java.awt.EventQueue.dispatchEvent(Unknown Source) at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) at java.awt.Dialog$1.run(Unknown Source) at java.awt.Dialog$3.run(Unknown Source) at java.security.AccessController.doPrivileged(Native Method) at java.awt.Dialog.show(Unknown Source) at java.awt.Component.show(Unknown Source) at java.awt.Component.setVisible(Unknown Source) at java.awt.Window.setVisible(Unknown Source) at java.awt.Dialog.setVisible(Unknown Source) at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi ewer.java:149) at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio nPerformed(TemporaryInternetFilesPanel.java:206) at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) at javax.swing.DefaultButtonModel.setPressed(Unknown Source) at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour ce) at java.awt.Component.processMouseEvent(Unknown Source) at javax.swing.JComponent.processMouseEvent(Unknown Source) at java.awt.Component.processEvent(Unknown Source) at java.awt.Container.processEvent(Unknown Source) at java.awt.Component.dispatchEventImpl(Unknown Source) at java.awt.Container.dispatchEventImpl(Unknown Source) at java.awt.Component.dispatchEvent(Unknown Source) at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) at java.awt.Container.dispatchEventImpl(Unknown Source) at java.awt.Window.dispatchEventImpl(Unknown Source) at java.awt.Component.dispatchEvent(Unknown Source) at java.awt.EventQueue.dispatchEventImpl(Unknown Source) at java.awt.EventQueue.access$400(Unknown Source) at java.awt.EventQueue$2.run(Unknown Source) at java.awt.EventQueue$2.run(Unknown Source) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) at java.awt.EventQueue$3.run(Unknown Source) at java.awt.EventQueue$3.run(Unknown Source) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) at java.awt.EventQueue.dispatchEvent(Unknown Source) at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.run(Unknown Source) The cause of this NullPointerException is a missing %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. To reproduce: Delete %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). Regards, Jacob From jvanek at redhat.com Sat Jul 27 05:43:07 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 27 Jul 2013 14:43:07 +0200 Subject: [icedtea-web] Regression after refactoring for XDG specification In-Reply-To: <201307262349.r6QNn0u3019467@mail-web01.excite.co.jp> References: <201307262349.r6QNn0u3019467@mail-web01.excite.co.jp> Message-ID: <51F3C05B.2020401@redhat.com> On 07/27/2013 01:49 AM, Jacob Wisor wrote: > Hello, > > I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. > > Exception occurred during event dispatching: > java.lang.NullPointerException > at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect > ory.java:56) > at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja > va:360) > at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j > ava:343) > at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java > :66) > at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) > > at java.awt.event.InvocationEvent.dispatch(Unknown Source) > at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > at java.awt.EventQueue.access$400(Unknown Source) > at java.awt.EventQueue$2.run(Unknown Source) > at java.awt.EventQueue$2.run(Unknown Source) > at java.security.AccessController.doPrivileged(Native Method) > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > Source) > at java.awt.EventQueue.dispatchEvent(Unknown Source) > at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > at java.awt.Dialog$1.run(Unknown Source) > at java.awt.Dialog$3.run(Unknown Source) > at java.security.AccessController.doPrivileged(Native Method) > at java.awt.Dialog.show(Unknown Source) > at java.awt.Component.show(Unknown Source) > at java.awt.Component.setVisible(Unknown Source) > at java.awt.Window.setVisible(Unknown Source) > at java.awt.Dialog.setVisible(Unknown Source) > at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi > ewer.java:149) > at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio > nPerformed(TemporaryInternetFilesPanel.java:206) > at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) > at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) > at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) > at javax.swing.DefaultButtonModel.setPressed(Unknown Source) > at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour > ce) > at java.awt.Component.processMouseEvent(Unknown Source) > at javax.swing.JComponent.processMouseEvent(Unknown Source) > at java.awt.Component.processEvent(Unknown Source) > at java.awt.Container.processEvent(Unknown Source) > at java.awt.Component.dispatchEventImpl(Unknown Source) > at java.awt.Container.dispatchEventImpl(Unknown Source) > at java.awt.Component.dispatchEvent(Unknown Source) > at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) > at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) > at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) > at java.awt.Container.dispatchEventImpl(Unknown Source) > at java.awt.Window.dispatchEventImpl(Unknown Source) > at java.awt.Component.dispatchEvent(Unknown Source) > at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > at java.awt.EventQueue.access$400(Unknown Source) > at java.awt.EventQueue$2.run(Unknown Source) > at java.awt.EventQueue$2.run(Unknown Source) > at java.security.AccessController.doPrivileged(Native Method) > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > Source) > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > Source) > at java.awt.EventQueue$3.run(Unknown Source) > at java.awt.EventQueue$3.run(Unknown Source) > at java.security.AccessController.doPrivileged(Native Method) > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > Source) > at java.awt.EventQueue.dispatchEvent(Unknown Source) > at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) > at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > at java.awt.EventDispatchThread.run(Unknown Source) > > The cause of this NullPointerException is a missing %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. > I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. > > To reproduce: Delete %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. J. From gitne at excite.co.jp Sun Jul 28 01:44:14 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Sun, 28 Jul 2013 17:44:14 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl0gUmVncmVzc2lvbiBhZnRlciByZWZhY3RvcmluZyBmb3IgWERHIHNwZWNpZmljYXRpb24=?= Message-ID: <201307280844.r6S8iE5j014514@mail-web02.excite.co.jp> Jiri Vanek writes: > > On 07/27/2013 01:49 AM, Jacob Wisor wrote: > > Hello, > > > > I get the following regression since the code has been refactored to conform to the XDG specification, at > least on Windows, but it should apply to Un*x systems too. > > > > Exception occurred during event dispatching: > > java.lang.NullPointerException > > at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirectory.java:56) > > at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.java:360) > > at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.java:343) > > at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java:66) > > at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) > > > > at java.awt.event.InvocationEvent.dispatch(Unknown Source) > > at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > > at java.awt.EventQueue.access$400(Unknown Source) > > at java.awt.EventQueue$2.run(Unknown Source) > > at java.awt.EventQueue$2.run(Unknown Source) > > at java.security.AccessController.doPrivileged(Native Method) > > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > > at java.awt.EventQueue.dispatchEvent(Unknown Source) > > at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > > at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > > at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > > at java.awt.Dialog$1.run(Unknown Source) > > at java.awt.Dialog$3.run(Unknown Source) > > at java.security.AccessController.doPrivileged(Native Method) > > at java.awt.Dialog.show(Unknown Source) > > at java.awt.Component.show(Unknown Source) > > at java.awt.Component.setVisible(Unknown Source) > > at java.awt.Window.setVisible(Unknown Source) > > at java.awt.Dialog.setVisible(Unknown Source) > > at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheViewer.java:149) > > at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actionPerformed(TemporaryInternetFilesPanel.java:206) > > at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) > > at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) > > at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) > > at javax.swing.DefaultButtonModel.setPressed(Unknown Source) > > at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Source) > > at java.awt.Component.processMouseEvent(Unknown Source) > > at javax.swing.JComponent.processMouseEvent(Unknown Source) > > at java.awt.Component.processEvent(Unknown Source) > > at java.awt.Container.processEvent(Unknown Source) > > at java.awt.Component.dispatchEventImpl(Unknown Source) > > at java.awt.Container.dispatchEventImpl(Unknown Source) > > at java.awt.Component.dispatchEvent(Unknown Source) > > at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) > > at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) > > at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) > > at java.awt.Container.dispatchEventImpl(Unknown Source) > > at java.awt.Window.dispatchEventImpl(Unknown Source) > > at java.awt.Component.dispatchEvent(Unknown Source) > > at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > > at java.awt.EventQueue.access$400(Unknown Source) > > at java.awt.EventQueue$2.run(Unknown Source) > > at java.awt.EventQueue$2.run(Unknown Source) > > at java.security.AccessController.doPrivileged(Native Method) > > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > > at java.awt.EventQueue$3.run(Unknown Source) > > at java.awt.EventQueue$3.run(Unknown Source) > > at java.security.AccessController.doPrivileged(Native Method) > > at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > > at java.awt.EventQueue.dispatchEvent(Unknown Source) > > at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > > at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > > at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) > > at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > > at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > > at java.awt.EventDispatchThread.run(Unknown Source) > > > > The cause of this NullPointerException is a missing %USERPROFILE%.cacheicedtea-webcache or > ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in > this folder, if non-existent it should be created. Btw. since > net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should > check the root parameter for null. > > I would have fixed this myself, but because I have not refactored the code to conform to the XDG > specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add > perhaps even more damage. > > > > To reproduce: Delete %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache and > then open the cache viewer (perhaps refresh). > > Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and > ~/.config/icedtea-web at startup. Good. I have also noticed that the "About" button on the "About IcedTea-Web" tab is misplaced on Windows. I suggest left-aligning it under the descriptive text. Please note, that for rtl writing systems this button should probably be right-aligned. It would be cool, if you would cover that case too. :) Regards, Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: Misplaced about button.png Type: image/png Size: 9467 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130728/ed47af5e/ISO-2022-JPBTWlzcGxhY2VkIGFib3V0IGJ1dHRvbi5wbmc.png From alex.kasko.lists at gmail.com Sun Jul 28 14:26:07 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Mon, 29 Jul 2013 00:26:07 +0300 Subject: [fyi][icedtea7] windows builds Message-ID: <51F58C6F.7080200@gmail.com> Hi, Just for your information, icedtea7 tip (hg:0a8108854365) builds fine on windows-i586 and windows-amd64 without additional patches. I've obtained sources from "icedtea7/openjdk" directory by running: ./configure \ --disable-system-zlib \ --disable-system-jpeg \ --disable-system-png \ --disable-system-gif \ --disable-system-lcms \ --disable-compile-against-syscalls \ --disable-nss and "make" on debian wheezy. Then built these sources on windows (xp and 2003x64) as separate openjdk builds (without icedtea infrastructure) using additional environment variables: set USE_SYSTEM_GTK=true set USE_SYSTEM_GCONF=true set USE_SYSTEM_GIO=true set USE_SYSTEM_CUPS=true set USE_SYSTEM_FONTCONFIG=true set RHINO_JAR=%LIBS_DIR%/rhino.jar set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 set DISABLE_INTREE_EC=true -- Regards, Alex Kasko From denisl at openscg.com Sun Jul 28 16:41:45 2013 From: denisl at openscg.com (Lussier, Denis) Date: Sun, 28 Jul 2013 19:41:45 -0400 Subject: [fyi][icedtea7] windows builds In-Reply-To: <51F58C6F.7080200@gmail.com> References: <51F58C6F.7080200@gmail.com> Message-ID: This is great. IMHO, the dominance of Windows as a client platform and the absence of Webstart-like browser support, made OpenJDK 6 for Windows more of an experiment/steppingStone than a production open source project. --Luss http://www.bigsql.org On Sun, Jul 28, 2013 at 5:26 PM, Alex Kasko wrote: > Hi, > > Just for your information, icedtea7 tip (hg:0a8108854365) builds fine on > windows-i586 and windows-amd64 without additional patches. > > I've obtained sources from "icedtea7/openjdk" directory by running: > > ./configure \ > --disable-system-zlib \ > --disable-system-jpeg \ > --disable-system-png \ > --disable-system-gif \ > --disable-system-lcms \ > --disable-compile-against-**syscalls \ > --disable-nss > > and "make" on debian wheezy. > > Then built these sources on windows (xp and 2003x64) as separate openjdk > builds (without icedtea infrastructure) using additional environment > variables: > > set USE_SYSTEM_GTK=true > set USE_SYSTEM_GCONF=true > set USE_SYSTEM_GIO=true > set USE_SYSTEM_CUPS=true > set USE_SYSTEM_FONTCONFIG=true > set RHINO_JAR=%LIBS_DIR%/rhino.jar > set FT2_CFLAGS=-I$(FREETYPE_**HEADERS_PATH) > -I$(FREETYPE_HEADERS_PATH)/**freetype2 > set DISABLE_INTREE_EC=true > > > -- > Regards, > Alex Kasko > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130728/a9ce58a2/attachment.html From ptisnovs at icedtea.classpath.org Mon Jul 29 03:04:41 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 29 Jul 2013 10:04:41 +0000 Subject: /hg/gfx-test: That class now extend BitBltAffineTransformOp, not... Message-ID: changeset 646968f6fced in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=646968f6fced author: Pavel Tisnovsky date: Mon Jul 29 12:08:18 2013 +0200 That class now extend BitBltAffineTransformOp, not GfxTest directly. Refactoring, added new tests to this test suite. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltRescaleOp.java | 232 ++++++++++++----------- 2 files changed, 123 insertions(+), 115 deletions(-) diffs (301 lines): diff -r 458d896ac158 -r 646968f6fced ChangeLog --- a/ChangeLog Fri Jul 26 11:31:51 2013 +0200 +++ b/ChangeLog Mon Jul 29 12:08:18 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-29 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltRescaleOp.java: + That class now extend BitBltAffineTransformOp, not GfxTest directly. + Refactoring, added new tests to this test suite. + 2013-07-26 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: diff -r 458d896ac158 -r 646968f6fced src/org/gfxtest/testsuites/BitBltRescaleOp.java --- a/src/org/gfxtest/testsuites/BitBltRescaleOp.java Fri Jul 26 11:31:51 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltRescaleOp.java Mon Jul 29 12:08:18 2013 +0200 @@ -41,12 +41,8 @@ package org.gfxtest.testsuites; import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.awt.image.BufferedImageOp; import java.awt.image.RescaleOp; -import org.gfxtest.framework.CommonBitmapOperations; -import org.gfxtest.framework.GfxTest; import org.gfxtest.framework.TestImage; import org.gfxtest.framework.TestResult; import org.gfxtest.framework.annotations.BitBltOperation; @@ -69,7 +65,7 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.NONE) @Zoom(1) -public class BitBltRescaleOp extends GfxTest +public class BitBltRescaleOp extends BitBltAffineTransformOp { private static final float NoFilterScale = 1.0f; private static final float BlackImageScale = 0.0f; @@ -113,112 +109,6 @@ private static final RescaleOp blackImageScaleROP = new RescaleOp(BlackImageScale, ZeroOffset, null); /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing checker pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing diagonal checker pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing grid pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** - * Test basic BitBlt operation for buffered image containing diagonal grid pattern - * with type TYPE_3BYTE_BGR - * - * @param image - * image used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @param rasterOp - * selected raster operation - * @return test result status - PASSED, FAILED or ERROR - */ - private TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, - BufferedImageOp rasterOp) - { - return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); - } - - /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -297,6 +187,34 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundDarkenScaleROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, darkenScaleROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundLightenOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, lightenOffsetROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundLightenRedOffsetROP(TestImage image, Graphics2D graphics2d) { return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, lightenRedOffsetROP); @@ -339,9 +257,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundLightenOffsetROP(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundLightenScaleROP(TestImage image, Graphics2D graphics2d) { - return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, lightenOffsetROP); + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, lightenScaleROP); } /** @@ -423,6 +341,62 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenRedOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenRedOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenGreenOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenGreenOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenBlueOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenBlueOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenScaleROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenScaleROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundLightenOffsetROP(TestImage image, Graphics2D graphics2d) { return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, lightenOffsetROP); @@ -437,9 +411,37 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenScaleROP(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundLightenRedOffsetROP(TestImage image, Graphics2D graphics2d) { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenScaleROP); + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, lightenRedOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundLightenGreenOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, lightenGreenOffsetROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundLightenBlueOffsetROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, lightenBlueOffsetROP); } /** From ptisnovs at icedtea.classpath.org Mon Jul 29 03:10:24 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 29 Jul 2013 10:10:24 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 7c346e26d3d8 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7c346e26d3d8 author: Pavel Tisnovsky date: Mon Jul 29 12:13:59 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into ScriptEngineFactoryClassTest. diffstat: ChangeLog | 7 +++ src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 38 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diffs (82 lines): diff -r a12dc926e709 -r 7c346e26d3d8 ChangeLog --- a/ChangeLog Fri Jul 26 11:03:56 2013 +0200 +++ b/ChangeLog Mon Jul 29 12:13:59 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-29 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into ScriptEngineFactoryClassTest. + 2013-07-26 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineManagerClassTest.java: diff -r a12dc926e709 -r 7c346e26d3d8 src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Fri Jul 26 11:03:56 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Mon Jul 29 12:13:59 2013 +0200 @@ -52,6 +52,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; @@ -914,12 +916,15 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -1074,6 +1079,39 @@ } /** + * Test for method javax.script.ScriptEngineFactory.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.scriptEngineFactoryClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngineFactory.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.scriptEngineFactoryClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.ScriptEngineFactory.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.scriptEngineFactoryClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngineFactory.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.scriptEngineFactoryClass.desiredAssertionStatus(), + "Method ScriptEngineFactory.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptEngineFactory */ @SuppressWarnings("cast") From jvanek at redhat.com Mon Jul 29 05:05:16 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 29 Jul 2013 14:05:16 +0200 Subject: [icedtea-web] Regression after refactoring for XDG specification In-Reply-To: <51F3C05B.2020401@redhat.com> References: <201307262349.r6QNn0u3019467@mail-web01.excite.co.jp> <51F3C05B.2020401@redhat.com> Message-ID: <51F65A7C.7030305@redhat.com> On 07/27/2013 02:43 PM, Jiri Vanek wrote: > On 07/27/2013 01:49 AM, Jacob Wisor wrote: >> Hello, >> >> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. >> >> Exception occurred during event dispatching: >> java.lang.NullPointerException >> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect >> ory.java:56) >> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja >> va:360) >> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j >> ava:343) >> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java >> :66) >> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) >> >> at java.awt.event.InvocationEvent.dispatch(Unknown Source) >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >> at java.awt.EventQueue.access$400(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.awt.EventQueue.dispatchEvent(Unknown Source) >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >> at java.awt.Dialog$1.run(Unknown Source) >> at java.awt.Dialog$3.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.awt.Dialog.show(Unknown Source) >> at java.awt.Component.show(Unknown Source) >> at java.awt.Component.setVisible(Unknown Source) >> at java.awt.Window.setVisible(Unknown Source) >> at java.awt.Dialog.setVisible(Unknown Source) >> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi >> ewer.java:149) >> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio >> nPerformed(TemporaryInternetFilesPanel.java:206) >> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) >> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) >> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) >> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) >> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour >> ce) >> at java.awt.Component.processMouseEvent(Unknown Source) >> at javax.swing.JComponent.processMouseEvent(Unknown Source) >> at java.awt.Component.processEvent(Unknown Source) >> at java.awt.Container.processEvent(Unknown Source) >> at java.awt.Component.dispatchEventImpl(Unknown Source) >> at java.awt.Container.dispatchEventImpl(Unknown Source) >> at java.awt.Component.dispatchEvent(Unknown Source) >> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) >> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) >> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) >> at java.awt.Container.dispatchEventImpl(Unknown Source) >> at java.awt.Window.dispatchEventImpl(Unknown Source) >> at java.awt.Component.dispatchEvent(Unknown Source) >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >> at java.awt.EventQueue.access$400(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.awt.EventQueue$3.run(Unknown Source) >> at java.awt.EventQueue$3.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.awt.EventQueue.dispatchEvent(Unknown Source) >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >> at java.awt.EventDispatchThread.run(Unknown Source) >> >> The cause of this NullPointerException is a missing %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. >> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. >> >> To reproduce: Delete %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). > > Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. Hm. this is strange. If you delete cache when running itw, then probably fault is moreover correct behaviour. How Are you starting cache viewer? When itw-settings are started, all the directories are created. (double ensured) I'm not a big fan of adding File f1 = new File(Defaults.USER_CONFIG_HOME); f1.mkdirs() File f2 = new File(Defaults.USER_CACHE_HOME); f2.mkdirs() on more places then this already is. When you are starting itw-settings (or javaws) what is output of console? Or is tehre any more ways how to run cache viwer? > > > J. > From jvanek at redhat.com Mon Jul 29 05:17:15 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 29 Jul 2013 14:17:15 +0200 Subject: [icedtea-web] Regression after refactoring for XDG specification In-Reply-To: <51F3C05B.2020401@redhat.com> References: <201307262349.r6QNn0u3019467@mail-web01.excite.co.jp> <51F3C05B.2020401@redhat.com> Message-ID: <51F65D4B.1020903@redhat.com> On 07/27/2013 02:43 PM, Jiri Vanek wrote: > On 07/27/2013 01:49 AM, Jacob Wisor wrote: >> Hello, >> >> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. >> >> Exception occurred during event dispatching: >> java.lang.NullPointerException >> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect >> ory.java:56) >> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja >> va:360) >> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j >> ava:343) >> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java >> :66) >> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) >> >> at java.awt.event.InvocationEvent.dispatch(Unknown Source) >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >> at java.awt.EventQueue.access$400(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.awt.EventQueue.dispatchEvent(Unknown Source) >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >> at java.awt.Dialog$1.run(Unknown Source) >> at java.awt.Dialog$3.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.awt.Dialog.show(Unknown Source) >> at java.awt.Component.show(Unknown Source) >> at java.awt.Component.setVisible(Unknown Source) >> at java.awt.Window.setVisible(Unknown Source) >> at java.awt.Dialog.setVisible(Unknown Source) >> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi >> ewer.java:149) >> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio >> nPerformed(TemporaryInternetFilesPanel.java:206) >> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) >> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) >> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) >> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) >> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour >> ce) >> at java.awt.Component.processMouseEvent(Unknown Source) >> at javax.swing.JComponent.processMouseEvent(Unknown Source) >> at java.awt.Component.processEvent(Unknown Source) >> at java.awt.Container.processEvent(Unknown Source) >> at java.awt.Component.dispatchEventImpl(Unknown Source) >> at java.awt.Container.dispatchEventImpl(Unknown Source) >> at java.awt.Component.dispatchEvent(Unknown Source) >> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) >> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) >> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) >> at java.awt.Container.dispatchEventImpl(Unknown Source) >> at java.awt.Window.dispatchEventImpl(Unknown Source) >> at java.awt.Component.dispatchEvent(Unknown Source) >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >> at java.awt.EventQueue.access$400(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.awt.EventQueue$2.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.awt.EventQueue$3.run(Unknown Source) >> at java.awt.EventQueue$3.run(Unknown Source) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >> Source) >> at java.awt.EventQueue.dispatchEvent(Unknown Source) >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >> at java.awt.EventDispatchThread.run(Unknown Source) >> >> The cause of this NullPointerException is a missing %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. >> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. >> >> To reproduce: Delete %USERPROFILE%\.cache\icedtea-web\cache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). > > Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. > Ok. There was simple usecase when the directories were not esured. Fixed by this patch. > > J. > -------------- next part -------------- A non-text attachment was scrubbed... Name: xdgForcingDirs.patch Type: text/x-patch Size: 1663 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130729/872ed384/xdgForcingDirs.patch From gitne at excite.co.jp Mon Jul 29 05:30:40 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Mon, 29 Jul 2013 21:30:40 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl0gUmVncmVzc2lvbiBhZnRlciByZWZhY3RvcmluZyBmb3IgWERHIHNwZWNpZmljYXRpb24=?= Message-ID: <201307291230.r6TCUe4V024330@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > On 07/27/2013 02:43 PM, Jiri Vanek wrote: > > On 07/27/2013 01:49 AM, Jacob Wisor wrote: > >> Hello, > >> > >> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. > >> > >> Exception occurred during event dispatching: > >> java.lang.NullPointerException > >> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirectory.java:56) > >> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.java:360) > >> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.java:343) > >> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java:66) > >> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) > >> > >> at java.awt.event.InvocationEvent.dispatch(Unknown Source) > >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > >> at java.awt.EventQueue.access$400(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > >> at java.awt.EventQueue.dispatchEvent(Unknown Source) > >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >> at java.awt.Dialog$1.run(Unknown Source) > >> at java.awt.Dialog$3.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.awt.Dialog.show(Unknown Source) > >> at java.awt.Component.show(Unknown Source) > >> at java.awt.Component.setVisible(Unknown Source) > >> at java.awt.Window.setVisible(Unknown Source) > >> at java.awt.Dialog.setVisible(Unknown Source) > >> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheViewer.java:149) > >> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actionPerformed(TemporaryInternetFilesPanel.java:206) > >> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) > >> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) > >> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) > >> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) > >> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Source) > >> at java.awt.Component.processMouseEvent(Unknown Source) > >> at javax.swing.JComponent.processMouseEvent(Unknown Source) > >> at java.awt.Component.processEvent(Unknown Source) > >> at java.awt.Container.processEvent(Unknown Source) > >> at java.awt.Component.dispatchEventImpl(Unknown Source) > >> at java.awt.Container.dispatchEventImpl(Unknown Source) > >> at java.awt.Component.dispatchEvent(Unknown Source) > >> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) > >> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) > >> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) > >> at java.awt.Container.dispatchEventImpl(Unknown Source) > >> at java.awt.Window.dispatchEventImpl(Unknown Source) > >> at java.awt.Component.dispatchEvent(Unknown Source) > >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > >> at java.awt.EventQueue.access$400(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > >> at java.awt.EventQueue$3.run(Unknown Source) > >> at java.awt.EventQueue$3.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown Source) > >> at java.awt.EventQueue.dispatchEvent(Unknown Source) > >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > >> at java.awt.EventDispatchThread.run(Unknown Source) > >> > >> The cause of this NullPointerException is a missing %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. > >> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. > >> > >> To reproduce: Delete %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). > > > > Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. > > Hm. this is strange. If you delete cache when running itw, then probably fault is moreover correct > behaviour. > > > How Are you starting cache viewer? When itw-settings are started, all the directories are created. > (double ensured) I'm not a big fan of adding > > File f1 = new File(Defaults.USER_CONFIG_HOME); > f1.mkdirs() > File f2 = new File(Defaults.USER_CACHE_HOME); > f2.mkdirs() > > on more places then this already is. > > When you are starting itw-settings (or javaws) what is output of console? Or is tehre any more ways > how to run cache viwer? I just invoke itw-settings and click my way through the cache tab to the cache viewer. The output on the console is exactly as posted before. There is an NPE in net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirectory.java:56). When I create %USERPROFILE%\.cache\icedtea-web\cache manually everything works fine. Jacob From gitne at excite.co.jp Mon Jul 29 06:00:26 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Mon, 29 Jul 2013 22:00:26 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl0gUmVncmVzc2lvbiBhZnRlciByZWZhY3RvcmluZyBmb3IgWERHIHNwZWNpZmljYXRpb24=?= Message-ID: <201307291300.r6TD0QoM019754@mail-web02.excite.co.jp> "Jiri Vanek" wrote: > On 07/27/2013 02:43 PM, Jiri Vanek wrote: > > On 07/27/2013 01:49 AM, Jacob Wisor wrote: > >> Hello, > >> > >> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. > >> > >> Exception occurred during event dispatching: > >> java.lang.NullPointerException > >> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect > >> ory.java:56) > >> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja > >> va:360) > >> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j > >> ava:343) > >> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java > >> :66) > >> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) > >> > >> at java.awt.event.InvocationEvent.dispatch(Unknown Source) > >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > >> at java.awt.EventQueue.access$400(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >> Source) > >> at java.awt.EventQueue.dispatchEvent(Unknown Source) > >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >> at java.awt.Dialog$1.run(Unknown Source) > >> at java.awt.Dialog$3.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.awt.Dialog.show(Unknown Source) > >> at java.awt.Component.show(Unknown Source) > >> at java.awt.Component.setVisible(Unknown Source) > >> at java.awt.Window.setVisible(Unknown Source) > >> at java.awt.Dialog.setVisible(Unknown Source) > >> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi > >> ewer.java:149) > >> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio > >> nPerformed(TemporaryInternetFilesPanel.java:206) > >> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) > >> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) > >> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) > >> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) > >> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour > >> ce) > >> at java.awt.Component.processMouseEvent(Unknown Source) > >> at javax.swing.JComponent.processMouseEvent(Unknown Source) > >> at java.awt.Component.processEvent(Unknown Source) > >> at java.awt.Container.processEvent(Unknown Source) > >> at java.awt.Component.dispatchEventImpl(Unknown Source) > >> at java.awt.Container.dispatchEventImpl(Unknown Source) > >> at java.awt.Component.dispatchEvent(Unknown Source) > >> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) > >> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) > >> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) > >> at java.awt.Container.dispatchEventImpl(Unknown Source) > >> at java.awt.Window.dispatchEventImpl(Unknown Source) > >> at java.awt.Component.dispatchEvent(Unknown Source) > >> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > >> at java.awt.EventQueue.access$400(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.awt.EventQueue$2.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >> Source) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >> Source) > >> at java.awt.EventQueue$3.run(Unknown Source) > >> at java.awt.EventQueue$3.run(Unknown Source) > >> at java.security.AccessController.doPrivileged(Native Method) > >> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >> Source) > >> at java.awt.EventQueue.dispatchEvent(Unknown Source) > >> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > >> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > >> at java.awt.EventDispatchThread.run(Unknown Source) > >> > >> The cause of this NullPointerException is a missing %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. > >> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. > >> > >> To reproduce: Delete %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). > > > > Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. > > > > Ok. There was simple usecase when the directories were not esured. Fixed by this patch. > > > > J. It's almost working. Only %USERPROFILE%\.cache\icedtea-web or ~/.cache/icedtea-web gets created. It is neccessary to create all parent folders too. Please note that currently IcedTea-Web's default cache folder is %USERPROFILE%\.cache\icedtea-web\cache ~/.cache/icedtea-web/cache. I do not know whether this is desired, since it is a kind of tautology. The problem is that when NetX is run for the first time the default cache folder is already setup although it may not exist. It should get created either when setting up the cache folder on the cache tab is done or at least when the OK button is pressed, perhaps even earlier when the cache tab is selected so that opening the cache viewer does not break anything. + File f1 = new File(Defaults.USER_CONFIG_HOME); + File f2 = new File(Defaults.USER_CACHE_HOME); Another nit: Please give those local variables some meaningful names like cacheDirectory and configDirectory for better readability. Jacob From ptisnovs at redhat.com Mon Jul 29 07:52:58 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 29 Jul 2013 10:52:58 -0400 (EDT) Subject: [rfc][icedtea-web] Fix many memory leaks due to utf8fromidentifier misuse In-Reply-To: <51C9A507.3060905@redhat.com> References: <51C9A507.3060905@redhat.com> Message-ID: <2101425357.7689953.1375109578319.JavaMail.root@redhat.com> Hi Adam, this change (incl. refactoring) looks correct, ok for HEAD. Thanks Pavel ----- Adam Domurad wrote: > Hi all. Every single occurrence of utf8fromidentifier requires a call to > 'memfree' after being used. This patch addresses this (there were around > 40 occurrences). > > Some minor refactoring was bundled, sorry. It is hard not to bundle > clean-up to avoid making a mess. > > Most notably name->name_id in many places, to allow for use of 'name' to > hold the actual string. As well string fiddling was reduced in some places. > > A minor test is included in the changeset. > > ChangeLog: > 2013-06-24 Adam Domurad > > * plugin/icedteanp/IcedTeaPluginUtils.cc > (NPIdentifierAsString): Leak-free utf8fromidentifier wrapper. > * plugin/icedteanp/IcedTeaPluginUtils.h: Same. > * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Update calls > * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Same. > * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Same. > * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same. > * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc > (NPIdentifierAsString): New, tests utility function > * tests/cpp-unit-tests/browser_mock.cc > (mock_utf8fromidentifier): New, mocks NPAPI function > > Happy hacking, > -Adam > From alex.kasko.lists at gmail.com Mon Jul 29 09:56:37 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Mon, 29 Jul 2013 19:56:37 +0300 Subject: [fyi][icedtea7] windows builds In-Reply-To: References: <51F58C6F.7080200@gmail.com> Message-ID: <51F69EC5.704@gmail.com> On 07/29/2013 02:41 AM, Lussier, Denis wrote: > This is great. IMHO, the dominance of Windows as a client platform and the > absence of Webstart-like browser support, made OpenJDK 6 for Windows more > of an experiment/steppingStone than a production open source project. To be clear, I've built only openjdk part of icedtea7 without icedtea-web. Webstart from icedtea-web (pure java netx.jar) works on windows with any JRE and may be run like this: java -Xbootclasspath/a:netx.jar net.sourceforge.jnlp.runtime.Boot myapp.jnlp I think it may be wrapped into windows binary launcher quite easily. About browser-plugin - I think it's not so complex task to build it for windows firefox as a proof of concept (I have some experience with native firefox plugins). But make it stable with all security-related corner cases and support it further will require a lot of tedious work. It seems like an interesting project, but not for spare time. BTW, thanks for your (openscg) openjdk6 windows builds, they were the starting point for my builds. > > --Luss > http://www.bigsql.org > > On Sun, Jul 28, 2013 at 5:26 PM, Alex Kasko wrote: > >> Hi, >> >> Just for your information, icedtea7 tip (hg:0a8108854365) builds fine on >> windows-i586 and windows-amd64 without additional patches. >> >> I've obtained sources from "icedtea7/openjdk" directory by running: >> >> ./configure \ >> --disable-system-zlib \ >> --disable-system-jpeg \ >> --disable-system-png \ >> --disable-system-gif \ >> --disable-system-lcms \ >> --disable-compile-against-**syscalls \ >> --disable-nss >> >> and "make" on debian wheezy. >> >> Then built these sources on windows (xp and 2003x64) as separate openjdk >> builds (without icedtea infrastructure) using additional environment >> variables: >> >> set USE_SYSTEM_GTK=true >> set USE_SYSTEM_GCONF=true >> set USE_SYSTEM_GIO=true >> set USE_SYSTEM_CUPS=true >> set USE_SYSTEM_FONTCONFIG=true >> set RHINO_JAR=%LIBS_DIR%/rhino.jar >> set FT2_CFLAGS=-I$(FREETYPE_**HEADERS_PATH) >> -I$(FREETYPE_HEADERS_PATH)/**freetype2 >> set DISABLE_INTREE_EC=true >> >> >> -- >> Regards, >> Alex Kasko >> > -- Regards, Alex Kasko From gitne at excite.co.jp Mon Jul 29 10:56:21 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 30 Jul 2013 02:56:21 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtmeWldW2ljZWR0ZWE3XSB3aW5kb3dzIGJ1aWxkcw==?= Message-ID: <201307291756.r6THuL8p013190@mail-web03.excite.co.jp> Alex Kasko writes: > > On 07/29/2013 02:41 AM, Lussier, Denis wrote: > > This is great. IMHO, the dominance of Windows as a client platform and the > > absence of Webstart-like browser support, made OpenJDK 6 for Windows more > > of an experiment/steppingStone than a production open source project. > To be clear, I've built only openjdk part of icedtea7 without icedtea-web. > > Webstart from icedtea-web (pure java netx.jar) works on windows with any > JRE and may be run like this: > > java -Xbootclasspath/a:netx.jar net.sourceforge.jnlp.runtime.Boot > myapp.jnlp > > I think it may be wrapped into windows binary launcher quite easily. You actually do not need a /binary/ launcher. A batch file should do, if you want a more sophisticated launcher, especially to support the -J switch to pass arguments to the JVM a VBScript or JScript launcher can do an even better job. VBScript and JScript Windows Scripting Hosts are available since Windows 98 and Windows 2000, so there should be no problem here. Even Windows 7 handles some product activation and license management with VBScripts. So, that is probably the way to go. The Java part of NetX and plug-in lack quite a bit of Windows integration. Its overall quality is still far from production quality code that you would expect from comparable enterprise software. It is mainly missing signed code verification. You can import and export certificates, but the verification has not been implemented yet. > About browser-plugin - I think it's not so complex task to build it for > windows firefox as a proof of concept (I have some experience with > native firefox plugins). But make it stable with all security-related > corner cases and support it further will require a lot of tedious work. > It seems like an interesting project, but not for spare time. Yep, it is still a lot to do, too lengthy task just for some spare time work. From omajid at redhat.com Mon Jul 29 11:23:03 2013 From: omajid at redhat.com (Omair Majid) Date: Mon, 29 Jul 2013 14:23:03 -0400 Subject: [fyi][icedtea7] windows builds In-Reply-To: <201307291756.r6THuL8p013190@mail-web03.excite.co.jp> References: <201307291756.r6THuL8p013190@mail-web03.excite.co.jp> Message-ID: <51F6B307.8090508@redhat.com> Hi, On 07/29/2013 01:56 PM, Jacob Wisor wrote: > The Java part of NetX and plug-in lack quite a bit of Windows integration. > Its overall quality is still far from production quality code that you would > expect from comparable enterprise software. It is mainly missing signed code > verification. You can import and export certificates, but the verification > has not been implemented yet. Do you mean verification of signed jars? That's definitely implemented in icedtea-web and works on Linux. Is there some Linux-specific code there that fails to run on Windows? Thanks, Omair From gitne at excite.co.jp Mon Jul 29 12:16:45 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 30 Jul 2013 04:16:45 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtmeWldW2ljZWR0ZWE3XSB3aW5kb3dzIGJ1aWxkcw==?= Message-ID: <201307291916.r6TJGjU3015227@mail-web03.excite.co.jp> "Omair Majid" wrote: > Hi, > > On 07/29/2013 01:56 PM, Jacob Wisor wrote: > > The Java part of NetX and plug-in lack quite a bit of Windows integration. > > Its overall quality is still far from production quality code that you would > > expect from comparable enterprise software. It is mainly missing signed code > > verification. You can import and export certificates, but the verification > > has not been implemented yet. > > Do you mean verification of signed jars? That's definitely implemented > in icedtea-web and works on Linux. Yes, this is what I have meant. But of course, I may be wrong. That is at least the information I read in the documentation. I have not tested it on Windows. > Is there some Linux-specific code there that fails to run on Windows? So far, some exceptions pop up that I ignore, because they are not essential to what I am working on. I have not counted or reported them, but there are few. Furthermore, there is still this unresolved bug or insufficiency when backing up config files that usually becomes visibile on Windows systems, because its default file systems have different semantics for renaming and moving files, in contrast to Linux. Windows does not implement the XDG specification nor does it follow all POSIX standards, so configuration and cache files are stored in the wrong places. And then, most Windows enterprise system administrators expect to be able to configure systems via domain group policies, something that is not available on Linux systems and is delt with entierely differently than on Linux. Today, it is actually a must have feature for enterprise class Windows software. This is Windows specific and hence has not be thought of or implemented in IcedTea-Web. So, there is still a lot of integration stuff to do for Windows. Generally speaking, there is quite a bit of Linux specific code in IcedTea-Web. But, this is not surprising, since it is primarily being developed on Linux for Linux systems, which is okay. I have also experienced similar coding style with products that though are developed in Java, are primarily developed on Windows and for Windows systems. Regards, Jacob From omajid at redhat.com Mon Jul 29 13:15:02 2013 From: omajid at redhat.com (Omair Majid) Date: Mon, 29 Jul 2013 16:15:02 -0400 Subject: [fyi][icedtea7] windows builds In-Reply-To: <201307291916.r6TJGjU3015227@mail-web03.excite.co.jp> References: <201307291916.r6TJGjU3015227@mail-web03.excite.co.jp> Message-ID: <51F6CD46.50605@redhat.com> Hi, On 07/29/2013 03:16 PM, Jacob Wisor wrote: > "Omair Majid" wrote: >> Do you mean verification of signed jars? That's definitely >> implemented in icedtea-web and works on Linux. > > Yes, this is what I have meant. But of course, I may be wrong. We try very hard to make sure security mechanisms are in place and unsigned applications are sandboxed properly and signed applications are allowed to run with correct permissions. Last time I checked (approx 1 year ago) this was working. If this is broken, please yell loudly at the developers. If you think there's a security flaw, please let us know (privately) so we can fix it and get a release out ASAP. > That is at least the information I read in the documentation. This documentation must be very out-of-date. Do you have a link to it? If it's possible to fix it, I will be happy to do so. > Generally speaking, there is quite a bit of Linux specific code in > IcedTea-Web. But, this is not surprising, since it is primarily being > developed on Linux for Linux systems, which is okay. I have also > experienced similar coding style with products that though are > developed in Java, are primarily developed on Windows and for Windows > systems. Most of the developers are using Linux. If you want to propose patches for Windows, we will be happy to accept them. I will admit, though, that we do tend to ignore non-posix operating systems in icedtea-web. Thanks, Omair From gnu_andrew at member.fsf.org Mon Jul 29 17:10:29 2013 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 30 Jul 2013 01:10:29 +0100 Subject: IcedTea 2.3.12 Released! Message-ID: <20130730001029.GA21676@carrie.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. This release updates our OpenJDK 7 support to include support for the ARM32 JIT port running on HotSpot 23, meaning ARM users can move to the 2.3.x series. A number of build issues were discovered with the ARM port in the previous 2.3.11 release and this release provides fixes for these. In addition, IcedTea includes the usual IcedTea patches to allow builds against system libraries and to support more esoteric architectures. In this release, use of the system version of LCMS is again enabled by default, but requires version 2.5 or above. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. What's New? =========== New in release 2.3.12 (2013-07-26): * ARM Port - Set Zero flags for ARM32 in jdk_generic_profile.sh - Tell gcc explicitly that the bytecodes_arm.def input from stdin is C++, allowing C++ flags to be used. - Use $(CC) as before for bytecodes_arm.s and mkoffsets targets - Include $(CFLAGS) in assembler stage The tarball can be downloaded from: http://icedtea.classpath.org/download/source/icedtea-2.3.12.tar.gz SHA256 checksum: 3c4e88e7c1b2b39dcd7ed65c3b9a1a8dbd2a48848ce42e1d8a22a6821cf890d1 icedtea-2.3.12.tar.gz The tarball is accompanied by a digital signature available at: http://icedtea.classpath.org/download/source/icedtea-2.3.12.tar.gz.sig This is produced using my public key. See details below. PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 The following people helped with this release: * Andrew Hughes (build fixes and release management) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.3.12.tar.gz $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.3.12/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/aa3aaba1/attachment.bin From andrew at icedtea.classpath.org Mon Jul 29 17:11:28 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 30 Jul 2013 00:11:28 +0000 Subject: /hg/release/icedtea7-2.3: 4 new changesets Message-ID: changeset bd984d4f1e71 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=bd984d4f1e71 author: Andrew John Hughes date: Fri Jul 26 19:14:38 2013 +0100 Start 2.3.12 release cycle. 2013-07-25 Andrew John Hughes * configure.ac: Bump to 2.3.12pre. * NEWS: Add section for 2.3.12. changeset 57c98935315a in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=57c98935315a author: Andrew John Hughes date: Fri Jul 26 19:16:14 2013 +0100 Bring in forest changes for 2.3.12. 2013-07-26 Andrew John Hughes * Makefile.am: (CORBA_CHANGESET): Update to IcedTea 2.3.12 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Add changes from forest. * hotspot.map: Update default to IcedTea 2.3.12 HotSpot tag. changeset 15f12a7b52af in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=15f12a7b52af author: Andrew John Hughes date: Fri Jul 26 19:17:02 2013 +0100 Prepare for 2.3.12 release. 2013-07-26 Andrew John Hughes * NEWS: Set release date. * configure.ac: Set version to 2.3.12. changeset 2fae53e8b9ca in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=2fae53e8b9ca author: Andrew John Hughes date: Tue Jul 30 01:11:19 2013 +0100 Added tag icedtea-2.3.12 for changeset 15f12a7b52af diffstat: .hgtags | 1 + ChangeLog | 29 +++++++++++++++++++++++++++++ Makefile.am | 24 ++++++++++++------------ NEWS | 8 ++++++++ configure.ac | 2 +- hotspot.map | 2 +- 6 files changed, 52 insertions(+), 14 deletions(-) diffs (113 lines): diff -r 3fc5ad52d3b4 -r 2fae53e8b9ca .hgtags --- a/.hgtags Thu Jul 25 11:07:25 2013 +0100 +++ b/.hgtags Tue Jul 30 01:11:19 2013 +0100 @@ -48,3 +48,4 @@ b382dc61dbdde9e404a459b5b71608674e6e3c34 icedtea-2.3.9 5f0394d24af3ae26333240f3c98c94eb170ffb0c icedtea-2.3.10 05dd3f8c99d9f7682f2913105e0dbfca1d54574c icedtea-2.3.11 +15f12a7b52afd256dab7f6eb91050714e33871a9 icedtea-2.3.12 diff -r 3fc5ad52d3b4 -r 2fae53e8b9ca ChangeLog --- a/ChangeLog Thu Jul 25 11:07:25 2013 +0100 +++ b/ChangeLog Tue Jul 30 01:11:19 2013 +0100 @@ -1,3 +1,32 @@ +2013-07-26 Andrew John Hughes + + * NEWS: Set release date. + * configure.ac: Set version to 2.3.12. + +2013-07-26 Andrew John Hughes + + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea 2.3.12 tag. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Add changes from forest. + * hotspot.map: Update default to IcedTea 2.3.12 HotSpot + tag. + +2013-07-26 Andrew John Hughes + + * configure.ac: Bump to 2.3.12pre. + * NEWS: Add section for 2.3.12. + 2013-07-24 Andrew John Hughes * NEWS: Mention LCMS 2 change. diff -r 3fc5ad52d3b4 -r 2fae53e8b9ca Makefile.am --- a/Makefile.am Thu Jul 25 11:07:25 2013 +0100 +++ b/Makefile.am Tue Jul 30 01:11:19 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 25 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = eda3895cb67e -JAXP_CHANGESET = 181faea8867b -JAXWS_CHANGESET = 5dc89903bfc7 -JDK_CHANGESET = 0a482b2f7c35 -LANGTOOLS_CHANGESET = e2c5f493844a -OPENJDK_CHANGESET = f143f229bd12 +CORBA_CHANGESET = ea108ff3be9a +JAXP_CHANGESET = 332f0234a53e +JAXWS_CHANGESET = fdc4ad9f30c6 +JDK_CHANGESET = 4a0cf2c05cc6 +LANGTOOLS_CHANGESET = 6c9b532f4281 +OPENJDK_CHANGESET = e62743867f54 -CORBA_SHA256SUM = 7e1201261a38b588c1e87224c3480602b5eedd5d821d7c6cb41fdcf1271c2201 -JAXP_SHA256SUM = 71309e488b91266008c8573a32933f66502ddc10e31f808cb8f5fc04caa30f84 -JAXWS_SHA256SUM = 6fac4c4f6afd4ea61d2926987f24f0661f34c71e8947dd86340a0081c2988703 -JDK_SHA256SUM = c24a265ca703e32e742496447f95a49648f49a5577b0fb097865bed32a698032 -LANGTOOLS_SHA256SUM = e964e25b137d5c8a145df60b7cfee67538417191f9f6dd3c59dfe388a40c3b6f -OPENJDK_SHA256SUM = 80b1aba00ebd6ea0abc0b857ec7fc86c99a7b476d93c78dd35518034ce85956f +CORBA_SHA256SUM = 818f5613b218fe2a2036e6c65622b970839986c0c1ca95563f911b379a52b765 +JAXP_SHA256SUM = a3f99615331cdc3d5e38e7169bb4b03dc43ede25c73834114240b8768207b9dc +JAXWS_SHA256SUM = b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab +JDK_SHA256SUM = badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0 +LANGTOOLS_SHA256SUM = b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b +OPENJDK_SHA256SUM = 7bc64e2285b5bfefeb6a3900729c58beb2f04f2c57184a4fe48341c5087c3f61 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -r 3fc5ad52d3b4 -r 2fae53e8b9ca NEWS --- a/NEWS Thu Jul 25 11:07:25 2013 +0100 +++ b/NEWS Tue Jul 30 01:11:19 2013 +0100 @@ -10,6 +10,14 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.3.12 (2013-07-26): + +* ARM Port + - Set Zero flags for ARM32 in jdk_generic_profile.sh + - Tell gcc explicitly that the bytecodes_arm.def input from stdin is C++, allowing C++ flags to be used. + - Use $(CC) as before for bytecodes_arm.s and mkoffsets targets + - Include $(CFLAGS) in assembler stage + New in release 2.3.11 (2013-07-24): * System LCMS 2 support again enabled by default, requiring 2.5 or above. diff -r 3fc5ad52d3b4 -r 2fae53e8b9ca configure.ac --- a/configure.ac Thu Jul 25 11:07:25 2013 +0100 +++ b/configure.ac Tue Jul 30 01:11:19 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.3.11], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.3.12], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) diff -r 3fc5ad52d3b4 -r 2fae53e8b9ca hotspot.map --- a/hotspot.map Thu Jul 25 11:07:25 2013 +0100 +++ b/hotspot.map Tue Jul 30 01:11:19 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e From andrew at icedtea.classpath.org Mon Jul 29 17:26:44 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 30 Jul 2013 00:26:44 +0000 Subject: /hg/release/icedtea7-2.3: Start 2.3.13 release cycle. Message-ID: changeset cc5652c0b17e in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=cc5652c0b17e author: Andrew John Hughes date: Tue Jul 30 01:26:28 2013 +0100 Start 2.3.13 release cycle. 2013-07-29 Andrew John Hughes * configure.ac: Bump to 2.3.13pre. * NEWS: Add section for 2.3.13. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 2fae53e8b9ca -r cc5652c0b17e ChangeLog --- a/ChangeLog Tue Jul 30 01:11:19 2013 +0100 +++ b/ChangeLog Tue Jul 30 01:26:28 2013 +0100 @@ -1,3 +1,8 @@ +2013-07-29 Andrew John Hughes + + * configure.ac: Bump to 2.3.13pre. + * NEWS: Add section for 2.3.13. + 2013-07-26 Andrew John Hughes * NEWS: Set release date. diff -r 2fae53e8b9ca -r cc5652c0b17e NEWS --- a/NEWS Tue Jul 30 01:11:19 2013 +0100 +++ b/NEWS Tue Jul 30 01:26:28 2013 +0100 @@ -10,6 +10,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.3.13 (2013-XX-XX): + New in release 2.3.12 (2013-07-26): * ARM Port diff -r 2fae53e8b9ca -r cc5652c0b17e configure.ac --- a/configure.ac Tue Jul 30 01:11:19 2013 +0100 +++ b/configure.ac Tue Jul 30 01:26:28 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.3.12], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.3.13pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From jvanek at redhat.com Mon Jul 29 22:25:48 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 30 Jul 2013 07:25:48 +0200 Subject: [rfc][icedtea-web] TinyHttpdImpl refactor In-Reply-To: <51F2971C.7050005@redhat.com> References: <51F2971C.7050005@redhat.com> Message-ID: <51F74E5C.7060706@redhat.com> On 07/26/2013 05:34 PM, Andrew Azores wrote: > Changelog: > * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java (TinyHttpdImpl): BufferedReader and DataOutputStream become member variables rather than local to run. More informative/mnemonic variable names > (writeErrorToPipe): new private method. > (writeToPipe): new private method. > (run): refactored to use writeToPipe and writeErrorToPipe, and ensuring that streams are closed when no longer in use. More informative/mnemonic variable names > > The patch looks big (relative to the size of the file) but it's really almost entirely variable renaming and method extractions. :) Does not, I'm dealyed due to packaging stuff ;( Sorry Practicaly no objections to the code: * The unittests for this are however a must - for new method, constructors and especially for run - to ensure they behave as they behaved before. Not that the backward compatibility is important in tests extensions, but because it worked pretty well. I would rather this patch to be pushed to head only together with unittests, but if you swear, you can push in two pushes. Thanx for refactoring! J. From jvanek at redhat.com Mon Jul 29 22:46:55 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 30 Jul 2013 07:46:55 +0200 Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 In-Reply-To: <51C9F3C1.8070307@redhat.com> References: <51C9F3C1.8070307@redhat.com> Message-ID: <51F7534F.8090006@redhat.com> On 06/25/2013 09:47 PM, Andrew Azores wrote: > Changelog: > > * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, getResources): Constructor stores list of JNLP extensions, getResources returns this list > > * tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java: tests browser launch of HTML file with embedded JNLP applet referencing extension JNLP > * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html: same > * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp: same > * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp: same > * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java: same > * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java: same > * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same > > PluginBridge had null parserSettings, which caused a NPE in JNLPFile parse() method later on. I wasn't sure if there was a particular reason why the PluginBridge constructor never called super(), so instead it instantiates a new ParserSettings on its own, with default values. The constructor also stores a list of extension JNLP files, which are then returned later when getResources is called with the param ExtensionDesc.class. The reproducer tests set up a scenario as described in the original bug report; one HTML file which uses jnlp_href tag. This JNLP file has another JNLP file as an extension. Each of these JNLP files references one JAR. One of these JARs contains a helper class which is referenced by a > class in the other JAR. Previously this scenario would result in a NoClassDefFoundError for the helper class when a browser was used to load the HTML, although using javaws to launch the JNLP directly worked fine. > > Thanks, > > Andrew A > > > fix.patch > > > diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java > --- a/netx/net/sourceforge/jnlp/PluginBridge.java > +++ b/netx/net/sourceforge/jnlp/PluginBridge.java > @@ -26,19 +26,19 @@ import java.io.ByteArrayInputStream; > import java.io.File; > import java.io.IOException; > import java.io.InputStream; > +import java.net.MalformedURLException; > import java.net.URL; > -import java.net.MalformedURLException; > +import java.util.ArrayList; > +import java.util.Arrays; > import java.util.HashSet; > +import java.util.List; > import java.util.Locale; > -import java.util.List; > -import java.util.ArrayList; > import java.util.Map; > import java.util.Set; > > +import net.sourceforge.jnlp.runtime.JNLPRuntime; > import sun.misc.BASE64Decoder; > > -import net.sourceforge.jnlp.runtime.JNLPRuntime; > - > /** > * Allows reuse of code that expects a JNLPFile object, > * while overriding behaviour specific to applets. > @@ -47,6 +47,7 @@ public class PluginBridge extends JNLPFi > > private PluginParameters params; > private Set jars = new HashSet(); > + private List extensionJars = new ArrayList(); > //Folders can be added to the code-base through the archive tag > private List codeBaseFolders = new ArrayList(); > private String[] cacheJars = new String[0]; > @@ -90,6 +91,7 @@ public class PluginBridge extends JNLPFi > this.codeBase = codebase; > this.sourceLocation = documentBase; > this.params = params; > + this.parserSettings = new ParserSettings(); I believe this is wrong. Parser settings are depending on commandline (plugin) parameters. So you need to crete correct parser. If you check the Main method of javaws, you will se it. Maybe extraction of the code from Boot to some factory method in ParserSettings is most correct, here, but the refactoring can e done as separate changeset (as you wish, but you will need this here anyway) If you have just copy and paste the " this.parserSettings = new ParserSettings();" then probably also source was wrong. May you point it out? > > if (params.getJNLPHref() != null) { > useJNLPHref = true; > @@ -122,6 +124,9 @@ public class PluginBridge extends JNLPFi > String fileName = jarDesc.getLocation().toExternalForm(); > this.jars.add(fileName); > } > + > + // Store any extensions listed in the JNLP file to be returned later on, namely in getResources() > + extensionJars = Arrays.asList(jnlpFile.getResources().getExtensions()); > } catch (MalformedURLException e) { > // Don't fail because we cannot get the jnlp file. Parameters are optional not required. > // it is the site developer who should ensure that file exist. > @@ -308,6 +313,8 @@ public class PluginBridge extends JNLPFi > return result; > } catch (MalformedURLException ex) { /* Ignored */ > } > + } else if (launchType.equals(ExtensionDesc.class)) { > + return (List) extensionJars; // this list is populated when the PluginBridge is first constructed > } > return sharedResources.getResources(launchType); > } > > > reproducer.patch > > > diff --git a/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp I do not think this is custom reproducer. See below. > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp > @@ -0,0 +1,53 @@ ..snip (=ok:)) > diff --git a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile > @@ -0,0 +1,34 @@ > +TESTNAME=ExtensionJnlpsInApplet > + > +SRC_FILES=ExtensionJnlpHelper.java ExtensionJnlpTestApplet.java > +RESOURCE_FILES=ExtensionJnlpTest.html ExtensionJnlpTestApplet.jnlp ExtensionJnlpHelper.jnlp > +ENTRYPOINT_CLASSES=ExtensionJnlpHelper ExtensionJnlpTestApplet > + > +JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar > +JAVAC=$(BOOT_DIR)/bin/javac > +JAR=$(BOOT_DIR)/bin/jar > + > +TMPDIR:=$(shell mktemp -d) > + > +prepare-reproducer: > + echo PREPARING REPRODUCER $(TESTNAME) > + > + $(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(SRC_FILES) > + > + cd ../resources; \ > + cp $(RESOURCE_FILES) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \ > + cd -; \ > + ls; \ > + for CLASS in $(ENTRYPOINT_CLASSES); \ > + do \ > + cd $(TMPDIR); \ > + $(JAR) cfe "$$CLASS.jar" "$$CLASS" "$$CLASS.class"; \ > + cd -;\ > + mv $(TMPDIR)/"$$CLASS.jar" $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \ > + done; \ > + > + echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR) > + rm -rf $(TMPDIR) > + As far as I can read this just compile classes and jar them. Then copy ajr and resources. This is exactly what engine do for you for free. Unless I misread, please move this reproducer to simple ones. > +clean-reproducer: > + echo NOTHING TO CLEAN FOR $(TESTNAME) > diff --git a/tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java b/tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java > @@ -0,0 +1,74 @@ > +/* ExtensionJnlpsInAppletTest.java > +Copyright (C) 2013 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as published by > +the Free Software Foundation, version 2. > + > +IcedTea 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 for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.ServerAccess.AutoClose; > +import net.sourceforge.jnlp.annotations.Bug; > +import net.sourceforge.jnlp.annotations.KnownToFail; > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > +import net.sourceforge.jnlp.annotations.TestInBrowsers; > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > +import net.sourceforge.jnlp.browsertesting.Browsers; > +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; > + > +import org.junit.Assert; > +import org.junit.Test; > + > +public class ExtensionJnlpsInAppletTest extends BrowserTest { > + > + private static final String appletCloseString = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING; > + > + @Test > + @NeedsDisplay > + @TestInBrowsers(testIn={Browsers.one}) > + public void testExtensionJnlpsInAppletLaunch() throws Exception { > + ProcessResult pr = server.executeBrowser("/ExtensionJnlpTest.html", AutoClose.CLOSE_ON_BOTH); Those slashes before resources are not necessary. I'm in favour to remove them, Also TBH I'm not fan of CLOSE_ON_BOTH. I woul like to encourage you to use only CloseOnOk. AThe reason is that some completely unrelated exception can be fired, and it will cause this reproducer to fail. Although we (Me, Omair and Adam) have long ago decided that it is a correct behaviour, the instability of reproducers is proving the opposite. As you have already put an eye on reproducers engine, try to consider it. > + Assert.assertTrue("stdout should contain \"" + appletCloseString + "\" but did not", pr.stdout.contains(appletCloseString)); > + Assert.assertTrue("stdout should contain \"Applet test running\" but did not", pr.stdout.contains("Applet test running")); > + } > + > + @Test > + @NeedsDisplay > + @TestInBrowsers(testIn={Browsers.one}) > + @Bug(id="PR974") > + public void testExtensionJnlpsInAppletHelper() throws Exception { > + ProcessResult pr = server.executeBrowser("/ExtensionJnlpTest.html", AutoClose.CLOSE_ON_BOTH); > + Assert.assertTrue("stdout should contain \"" + appletCloseString + "\" but did not", pr.stdout.contains(appletCloseString)); > + Assert.assertTrue("stdout should contain \"Helper!\" but did not", pr.stdout.contains("Helper!")); > + } > + > +} Otherwise nice job. J. From ptisnovs at icedtea.classpath.org Tue Jul 30 02:02:42 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 30 Jul 2013 09:02:42 +0000 Subject: /hg/gfx-test: Added twelwe methods used by BitBlt test cases and... Message-ID: changeset 590ac4a8732d in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=590ac4a8732d author: Pavel Tisnovsky date: Tue Jul 30 11:06:17 2013 +0200 Added twelwe methods used by BitBlt test cases and BitBlt-related tests. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 191 +++++++++++++++++- 2 files changed, 195 insertions(+), 2 deletions(-) diffs (228 lines): diff -r 646968f6fced -r 590ac4a8732d ChangeLog --- a/ChangeLog Mon Jul 29 12:08:18 2013 +0200 +++ b/ChangeLog Tue Jul 30 11:06:17 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-30 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Added twelwe methods used by BitBlt test cases and BitBlt-related + tests. + 2013-07-29 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltRescaleOp.java: diff -r 646968f6fced -r 590ac4a8732d src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Mon Jul 29 12:08:18 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Tue Jul 30 11:06:17 2013 +0200 @@ -73,7 +73,58 @@ public class BitBltBufferedImageOp extends GfxTest { /** - * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_CUSTOM}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * * @param image * image used as a destination for BitBlt-type operations @@ -90,7 +141,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}. * * @param image * image used as a destination for BitBlt-type operations @@ -107,6 +158,142 @@ } /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageType4ByteABGRPre(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeIntARGBPre(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltEmptyBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp); + } + + /** * Test basic BitBlt operation for buffered image containing checker pattern * with type TYPE_3BYTE_BGR * From ptisnovs at icedtea.classpath.org Tue Jul 30 02:08:39 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 30 Jul 2013 09:08:39 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset 8ebc2504f836 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=8ebc2504f836 author: Pavel Tisnovsky date: Tue Jul 30 11:12:14 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into ScriptEngineFactoryClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 54 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diffs (77 lines): diff -r 7c346e26d3d8 -r 8ebc2504f836 ChangeLog --- a/ChangeLog Mon Jul 29 12:13:59 2013 +0200 +++ b/ChangeLog Tue Jul 30 11:12:14 2013 +0200 @@ -1,3 +1,9 @@ +2013-07-30 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into ScriptEngineFactoryClassTest. + 2013-07-29 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 7c346e26d3d8 -r 8ebc2504f836 src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Mon Jul 29 12:13:59 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Tue Jul 30 11:12:14 2013 +0200 @@ -1079,6 +1079,60 @@ } /** + * Test for method javax.script.ScriptEngineFactory.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.scriptEngineFactoryClass.getGenericSuperclass(); + assertNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngineFactory.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // get the right array of field signatures + String[] genericInterfaceNames = null; + switch (getJavaVersion()) { + case 6: + genericInterfaceNames = genericInterfaceNames_jdk6; + break; + case 7: + genericInterfaceNames = genericInterfaceNames_jdk7; + break; + case 8: + genericInterfaceNames = genericInterfaceNames_jdk8; + break; + } + + // get all generic interfaces + Type[] genericInterfaces = this.scriptEngineFactoryClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length); + + // and transform the array into a list of field names + List interfacesAsString = new ArrayList(); + for (Type genericInterface : genericInterfaces) { + interfacesAsString.add(genericInterface.toString()); + } + + // check if all required interfaces really exists + for (String interfaceThatShouldExists : genericInterfaceNames) { + assertTrue(interfacesAsString.contains(interfaceThatShouldExists), + "interface " + interfaceThatShouldExists + " not found"); + } + } + + /** * Test for method javax.script.ScriptEngineFactory.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From jvanek at redhat.com Tue Jul 30 02:57:55 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 30 Jul 2013 11:57:55 +0200 Subject: [icedtea-web] Regression after refactoring for XDG specification In-Reply-To: <201307291300.r6TD0QoM019754@mail-web02.excite.co.jp> References: <201307291300.r6TD0QoM019754@mail-web02.excite.co.jp> Message-ID: <51F78E23.8080700@redhat.com> On 07/29/2013 03:00 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 07/27/2013 02:43 PM, Jiri Vanek wrote: >>> On 07/27/2013 01:49 AM, Jacob Wisor wrote: >>>> Hello, >>>> >>>> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. >>>> >>>> Exception occurred during event dispatching: >>>> java.lang.NullPointerException >>>> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect >>>> ory.java:56) >>>> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja >>>> va:360) >>>> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j >>>> ava:343) >>>> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java >>>> :66) >>>> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) >>>> >>>> at java.awt.event.InvocationEvent.dispatch(Unknown Source) >>>> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >>>> at java.awt.EventQueue.access$400(Unknown Source) >>>> at java.awt.EventQueue$2.run(Unknown Source) >>>> at java.awt.EventQueue$2.run(Unknown Source) >>>> at java.security.AccessController.doPrivileged(Native Method) >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>> Source) >>>> at java.awt.EventQueue.dispatchEvent(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >>>> at java.awt.Dialog$1.run(Unknown Source) >>>> at java.awt.Dialog$3.run(Unknown Source) >>>> at java.security.AccessController.doPrivileged(Native Method) >>>> at java.awt.Dialog.show(Unknown Source) >>>> at java.awt.Component.show(Unknown Source) >>>> at java.awt.Component.setVisible(Unknown Source) >>>> at java.awt.Window.setVisible(Unknown Source) >>>> at java.awt.Dialog.setVisible(Unknown Source) >>>> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi >>>> ewer.java:149) >>>> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio >>>> nPerformed(TemporaryInternetFilesPanel.java:206) >>>> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) >>>> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) >>>> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) >>>> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) >>>> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour >>>> ce) >>>> at java.awt.Component.processMouseEvent(Unknown Source) >>>> at javax.swing.JComponent.processMouseEvent(Unknown Source) >>>> at java.awt.Component.processEvent(Unknown Source) >>>> at java.awt.Container.processEvent(Unknown Source) >>>> at java.awt.Component.dispatchEventImpl(Unknown Source) >>>> at java.awt.Container.dispatchEventImpl(Unknown Source) >>>> at java.awt.Component.dispatchEvent(Unknown Source) >>>> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) >>>> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) >>>> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) >>>> at java.awt.Container.dispatchEventImpl(Unknown Source) >>>> at java.awt.Window.dispatchEventImpl(Unknown Source) >>>> at java.awt.Component.dispatchEvent(Unknown Source) >>>> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >>>> at java.awt.EventQueue.access$400(Unknown Source) >>>> at java.awt.EventQueue$2.run(Unknown Source) >>>> at java.awt.EventQueue$2.run(Unknown Source) >>>> at java.security.AccessController.doPrivileged(Native Method) >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>> Source) >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>> Source) >>>> at java.awt.EventQueue$3.run(Unknown Source) >>>> at java.awt.EventQueue$3.run(Unknown Source) >>>> at java.security.AccessController.doPrivileged(Native Method) >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>> Source) >>>> at java.awt.EventQueue.dispatchEvent(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >>>> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >>>> at java.awt.EventDispatchThread.run(Unknown Source) >>>> >>>> The cause of this NullPointerException is a missing %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. >>>> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. >>>> >>>> To reproduce: Delete %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). >>> >>> Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. >>> >> >> Ok. There was simple usecase when the directories were not esured. Fixed by this patch. >>> >>> J. > > It's almost working. Only %USERPROFILE%\.cache\icedtea-web or ~/.cache/icedtea-web gets created. It is neccessary to create all parent folders too. Please note that currently IcedTea-Web's default cache folder is %USERPROFILE%\.cache\icedtea-web\cache ~/.cache/icedtea-web/cache. I do not know whether this is desired, since it is a kind of tautology. > The problem is that when NetX is run for the first time the default cache folder is already setup although it may not exist. It should get created either when setting up the cache folder on the cache tab is done or at least when the OK button is pressed, perhaps even earlier when the cache tab is selected so that opening the cache viewer does not break anything. > > + File f1 = new File(Defaults.USER_CONFIG_HOME); > + File f2 = new File(Defaults.USER_CACHE_HOME); > > Another nit: Please give those local variables some meaningful names like cacheDirectory and configDirectory for better readability. ook O:) > > Jacob > Looks like issue is a bit more widespread. What do you think now? -------------- next part -------------- A non-text attachment was scrubbed... Name: xdgForcingDirs2.patch Type: text/x-patch Size: 4461 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/94874de1/xdgForcingDirs2.patch From jvanek at redhat.com Tue Jul 30 04:29:34 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 30 Jul 2013 13:29:34 +0200 Subject: [rfc] [icdtea-web]favicon for testsuite Message-ID: <51F7A39E.8030607@redhat.com> When browsers, are lunching our test appelts html pages, they are requesting the favicon. With rising number of reproducers the logs are now filled by "fiele not found" [1] Another approach then to provide a favicon is to modify test server to return "not found" without a exception in this particular case. But I'm more fond for this one - both head and 1.4 J. [1] multipleSignaturesPerJarMismatchingJNLP --- multipleSignaturesPerJarMatchingApplet - firefox: Backuping firefox profiles from /home/tester/.mozilla/firefox to /tmp/backupedFirefox_5946057942198395465_profiles.default multipleSignaturesPerJarMatchingApplet - firefox: Connecting /usr/bin/firefox -new-tab http://localhost:39555/MultipleSignaturesPerJarMatching.html run: assassin forThread[Thread-5,5,] java.lang.UNIXProcess at 259e3c49 .. done /tmp/ICWDR_1374799132_BUILD/icedtea-web-image/bin/javaws -Xtrustall -headless http://localhost:39555/MultipleSignaturesPerJarMismatching.jnlp termination false run: Getting- GET: /MultipleSignaturesPerJarMatching.html run: Serving- GET: ./MultipleSignaturesPerJarMatching.html run: Getting- GET: /favicon.ico run: Serving- GET: ./favicon.ico run: java.io.FileNotFoundException: /tmp/ICWDR_1374799132_BUILD/icedtea-web/tests.build/reproducers_test_server_deploydir/./favicon.ico (No such file or directory) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.(FileInputStream.java:138) at net.sourceforge.jnlp.TinyHttpdImpl.run(TinyHttpdImpl.java:140) run --- run: Getting- GET: /favicon.ico run: Serving- GET: ./favicon.ico run: java.io.FileNotFoundException: /tmp/ICWDR_1374799132_BUILD/icedtea-web/tests.build/reproducers_test_server_deploydir/./favicon.ico (No such file or directory) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.(FileInputStream.java:138) at net.sourceforge.jnlp.TinyHttpdImpl.run(TinyHttpdImpl.java:140) and so on :-/ -------------- next part -------------- A non-text attachment was scrubbed... Name: favicon.ico Type: image/vnd.microsoft.icon Size: 1406 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/f8a3aee9/favicon.ico -------------- next part -------------- A non-text attachment was scrubbed... Name: favIcon.patch Type: text/x-patch Size: 1666 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/f8a3aee9/favIcon.patch From ptisnovs at redhat.com Tue Jul 30 05:03:41 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 30 Jul 2013 08:03:41 -0400 (EDT) Subject: [rfc] [icdtea-web]favicon for testsuite In-Reply-To: <51F7A39E.8030607@redhat.com> References: <51F7A39E.8030607@redhat.com> Message-ID: <984740450.8209047.1375185821806.JavaMail.root@redhat.com> Hi Jiri, this change is appropriate (given that almost nobody would be forced to really see this icon :-). Ok for head. Thanks, Pavel ----- Jiri Vanek wrote: > When browsers, are lunching our test appelts html pages, they are requesting the favicon. With > rising number of reproducers the logs are now filled by "fiele not found" [1] > Another approach then to provide a favicon is to modify test server to return "not found" without a > exception in this particular case. > > But I'm more fond for this one - both head and 1.4 > > J. > > [1] > multipleSignaturesPerJarMismatchingJNLP --- > multipleSignaturesPerJarMatchingApplet - firefox: Backuping firefox profiles from > /home/tester/.mozilla/firefox to /tmp/backupedFirefox_5946057942198395465_profiles.default > multipleSignaturesPerJarMatchingApplet - firefox: Connecting /usr/bin/firefox -new-tab > http://localhost:39555/MultipleSignaturesPerJarMatching.html > run: assassin forThread[Thread-5,5,] java.lang.UNIXProcess at 259e3c49 .. done > /tmp/ICWDR_1374799132_BUILD/icedtea-web-image/bin/javaws -Xtrustall -headless > http://localhost:39555/MultipleSignaturesPerJarMismatching.jnlp termination false > run: Getting- GET: /MultipleSignaturesPerJarMatching.html > run: Serving- GET: ./MultipleSignaturesPerJarMatching.html > run: Getting- GET: /favicon.ico > run: Serving- GET: ./favicon.ico > run: > java.io.FileNotFoundException: > /tmp/ICWDR_1374799132_BUILD/icedtea-web/tests.build/reproducers_test_server_deploydir/./favicon.ico > (No such file or directory) > at java.io.FileInputStream.open(Native Method) > at java.io.FileInputStream.(FileInputStream.java:138) > at net.sourceforge.jnlp.TinyHttpdImpl.run(TinyHttpdImpl.java:140) > > run --- > run: Getting- GET: /favicon.ico > run: Serving- GET: ./favicon.ico > run: > java.io.FileNotFoundException: > /tmp/ICWDR_1374799132_BUILD/icedtea-web/tests.build/reproducers_test_server_deploydir/./favicon.ico > (No such file or directory) > at java.io.FileInputStream.open(Native Method) > at java.io.FileInputStream.(FileInputStream.java:138) > at net.sourceforge.jnlp.TinyHttpdImpl.run(TinyHttpdImpl.java:140) > > > and so on :-/ From jvanek at icedtea.classpath.org Tue Jul 30 05:33:50 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 30 Jul 2013 12:33:50 +0000 Subject: /hg/icedtea-web: tests/reproducers/simple/simpletest1/resources/... Message-ID: changeset 754507c1709a in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=754507c1709a author: Jiri Vanek date: Tue Jul 30 14:28:12 2013 +0200 tests/reproducers/simple/simpletest1/resources/favicon.ico: new file hould be served by test server in reproducers run and so prevent FNF exception ChangeLog: fixed few entries below (added emty line between author and body) diffstat: ChangeLog | 8 ++++++++ tests/reproducers/simple/simpletest1/resources/favicon.ico | Bin 2 files changed, 8 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 9a6449585c09 -r 754507c1709a ChangeLog --- a/ChangeLog Thu Jul 25 15:42:41 2013 -0400 +++ b/ChangeLog Tue Jul 30 14:28:12 2013 +0200 @@ -1,4 +1,11 @@ +2013-07-30 Jiri Vanek + + * tests/reproducers/simple/simpletest1/resources/favicon.ico: new file + should be served by test server in reproducers run and so prevent FNF exception + * ChangeLog: fixed few entries below (added emty line between author and body) + 2013-07-25 Andrew Azores + * netx/net/sourceforge/jnlp/about/AboutDialog.java (AboutDialog, display): removed "throws IOException" * netx/net/sourceforge/jnlp/about/HTMLPanel.java (HTMLPanel): removed @@ -11,6 +18,7 @@ same 2013-07-22 Andrew Azores + * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: (getProxiesWithoutCaching) added java.vm.name read permission to fix Rhino parsing and PAC proxy configuration diff -r 9a6449585c09 -r 754507c1709a tests/reproducers/simple/simpletest1/resources/favicon.ico Binary file tests/reproducers/simple/simpletest1/resources/favicon.ico has changed From jvanek at icedtea.classpath.org Tue Jul 30 05:36:03 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 30 Jul 2013 12:36:03 +0000 Subject: /hg/release/icedtea-web-1.4: tests/reproducers/simple/simpletest... Message-ID: changeset e18d9ba86575 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=e18d9ba86575 author: Jiri Vanek date: Tue Jul 30 14:33:17 2013 +0200 tests/reproducers/simple/simpletest1/resources/favicon.ico: new file should be served by test server in reproducers run and so prevent FNF exception diffstat: ChangeLog | 5 +++++ tests/reproducers/simple/simpletest1/resources/favicon.ico | Bin 2 files changed, 5 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 6cd78e135d41 -r e18d9ba86575 ChangeLog --- a/ChangeLog Fri Jun 28 10:07:19 2013 -0400 +++ b/ChangeLog Tue Jul 30 14:33:17 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-30 Jiri Vanek + + * tests/reproducers/simple/simpletest1/resources/favicon.ico: new file + should be served by test server in reproducers run and so prevent FNF exception + 2013-06-28 Adam Domurad * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java diff -r 6cd78e135d41 -r e18d9ba86575 tests/reproducers/simple/simpletest1/resources/favicon.ico Binary file tests/reproducers/simple/simpletest1/resources/favicon.ico has changed From jvanek at redhat.com Tue Jul 30 05:38:43 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 30 Jul 2013 14:38:43 +0200 Subject: /hg/icedtea-web: Added java.vm.name read permission to fix Rhino... In-Reply-To: References: Message-ID: <51F7B3D3.8040505@redhat.com> IIRC - do not forget 1.4! On 07/22/2013 04:13 PM, aazores at icedtea.classpath.org wrote: > changeset 6904f82aa501 in /hg/icedtea-web > details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6904f82aa501 > author: Andrew Azores > date: Mon Jul 22 10:13:30 2013 -0400 > > Added java.vm.name read permission to fix Rhino evaluation of proxy PAC (RH982558) > > > diffstat: > > ChangeLog | 5 +++++ > netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java | 7 +++++++ > 2 files changed, 12 insertions(+), 0 deletions(-) > > diffs (39 lines): > > diff -r 7c75bf721d7c -r 6904f82aa501 ChangeLog > --- a/ChangeLog Thu Jul 18 08:53:46 2013 +0200 > +++ b/ChangeLog Mon Jul 22 10:13:30 2013 -0400 > @@ -1,3 +1,8 @@ > +2013-07-22 Andrew Azores > + * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: > + (getProxiesWithoutCaching) added java.vm.name read permission to fix > + Rhino parsing and PAC proxy configuration > + > 2013-07-18 Jiri Vanek > > IcedTea-Web is now following XDG .config and .cache specification(RH947647) > diff -r 7c75bf721d7c -r 6904f82aa501 netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java > --- a/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Thu Jul 18 08:53:46 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Mon Jul 22 10:13:30 2013 -0400 > @@ -48,6 +48,7 @@ > import java.security.Permissions; > import java.security.PrivilegedAction; > import java.security.ProtectionDomain; > +import java.util.PropertyPermission; > > import net.sourceforge.jnlp.util.TimedHashMap; > > @@ -124,9 +125,15 @@ > > EvaluatePacAction evaluatePacAction = new EvaluatePacAction(pacContents, pacUrl.toString(), > pacHelperFunctionContents, url); > + > + // Purposefully giving only these permissions rather than using java.policy. The "evaluatePacAction" > + // isn't supposed to do very much and so doesn't require all the default permissions given by > + // java.policy > Permissions p = new Permissions(); > p.add(new RuntimePermission("accessClassInPackage.org.mozilla.javascript")); > p.add(new SocketPermission("*", "resolve")); > + p.add(new PropertyPermission("java.vm.name", "read")); > + > ProtectionDomain pd = new ProtectionDomain(null, p); > AccessControlContext context = new AccessControlContext(new ProtectionDomain[] { pd }); > > From bugzilla-daemon at icedtea.classpath.org Tue Jul 30 05:56:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 30 Jul 2013 12:56:02 +0000 Subject: [Bug 1482] Log4j fails when JNLP is remote, works when local In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1482 --- Comment #3 from Aleksi Kallio --- Here is how you should be able to reproduce it (including info on OpenJDK version). It should fail before application startup proceeds to splash screen. [akallio at eskimohanhi ~]$ java -version java version "1.7.0_25" OpenJDK Runtime Environment (rhel-2.3.10.3.el6_4-x86_64) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) [akallio at eskimohanhi ~]$ javaws http://chipster.csc.fi/chipster-broken.jnlp java.lang.ExceptionInInitializerError at org.apache.log4j.Logger.getLogger(Logger.java:118) at fi.csc.microarray.client.SwingClientApplication.(SwingClientApplication.java:184) at fi.csc.microarray.client.SwingClientApplication.start(SwingClientApplication.java:1353) at fi.csc.microarray.MicroarrayMain.main(MicroarrayMain.java:165) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:594) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:889) Caused by: java.security.AccessControlException: access denied ("java.io.FilePermission" "/chipster.log" "write") at java.security.AccessControlContext.checkPermission(AccessControlContext.java:372) at java.security.AccessController.checkPermission(AccessController.java:559) at java.lang.SecurityManager.checkPermission(SecurityManager.java:549) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:284) at java.lang.SecurityManager.checkWrite(SecurityManager.java:979) at java.io.FileOutputStream.(FileOutputStream.java:203) at java.io.FileOutputStream.(FileOutputStream.java:136) at org.apache.log4j.FileAppender.setFile(FileAppender.java:290) at org.apache.log4j.RollingFileAppender.setFile(RollingFileAppender.java:194) at org.apache.log4j.FileAppender.activateOptions(FileAppender.java:164) at org.apache.log4j.config.PropertySetter.activate(PropertySetter.java:257) at org.apache.log4j.config.PropertySetter.setProperties(PropertySetter.java:133) at org.apache.log4j.config.PropertySetter.setProperties(PropertySetter.java:97) at org.apache.log4j.PropertyConfigurator.parseAppender(PropertyConfigurator.java:689) at org.apache.log4j.PropertyConfigurator.parseCategory(PropertyConfigurator.java:647) at org.apache.log4j.PropertyConfigurator.configureRootCategory(PropertyConfigurator.java:544) at org.apache.log4j.PropertyConfigurator.doConfigure(PropertyConfigurator.java:440) at org.apache.log4j.PropertyConfigurator.doConfigure(PropertyConfigurator.java:476) at org.apache.log4j.helpers.OptionConverter.selectAndConfigure(OptionConverter.java:471) at org.apache.log4j.LogManager.(LogManager.java:125) ... 10 more ^C -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/0b288b2f/attachment.html From aazores at icedtea.classpath.org Tue Jul 30 06:42:01 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Tue, 30 Jul 2013 13:42:01 +0000 Subject: /hg/release/icedtea-web-1.4: Added java.vm.name read permission ... Message-ID: changeset a0ca905f9ee7 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=a0ca905f9ee7 author: Andrew Azores date: Tue Jul 30 09:41:12 2013 -0400 Added java.vm.name read permission to fix Rhino evaluation of proxy PAC (RH982558) diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diffs (39 lines): diff -r e18d9ba86575 -r a0ca905f9ee7 ChangeLog --- a/ChangeLog Tue Jul 30 14:33:17 2013 +0200 +++ b/ChangeLog Tue Jul 30 09:41:12 2013 -0400 @@ -1,3 +1,8 @@ +2013-07-30 Andrew Azores + * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: + (getProxiesWithoutCaching) added java.vm.name read permission to fix + Rhino parsing and PAC proxy configuration + 2013-07-30 Jiri Vanek * tests/reproducers/simple/simpletest1/resources/favicon.ico: new file diff -r e18d9ba86575 -r a0ca905f9ee7 netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java --- a/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Tue Jul 30 14:33:17 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Tue Jul 30 09:41:12 2013 -0400 @@ -48,6 +48,7 @@ import java.security.Permissions; import java.security.PrivilegedAction; import java.security.ProtectionDomain; +import java.util.PropertyPermission; import net.sourceforge.jnlp.util.TimedHashMap; @@ -124,9 +125,15 @@ EvaluatePacAction evaluatePacAction = new EvaluatePacAction(pacContents, pacUrl.toString(), pacHelperFunctionContents, url); + + // Purposefully giving only these permissions rather than using java.policy. The "evaluatePacAction" + // isn't supposed to do very much and so doesn't require all the default permissions given by + // java.policy Permissions p = new Permissions(); p.add(new RuntimePermission("accessClassInPackage.org.mozilla.javascript")); p.add(new SocketPermission("*", "resolve")); + p.add(new PropertyPermission("java.vm.name", "read")); + ProtectionDomain pd = new ProtectionDomain(null, p); AccessControlContext context = new AccessControlContext(new ProtectionDomain[] { pd }); From gitne at excite.co.jp Tue Jul 30 09:14:53 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 31 Jul 2013 01:14:53 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl0gUmVncmVzc2lvbiBhZnRlciByZWZhY3RvcmluZyBmb3IgWERHIHNwZWNpZmljYXRpb24=?= Message-ID: <201307301614.r6UGErq1009615@mail-web01.excite.co.jp> "Jiri Vanek" wrote: > On 07/29/2013 03:00 PM, Jacob Wisor wrote: > > "Jiri Vanek" wrote: > >> On 07/27/2013 02:43 PM, Jiri Vanek wrote: > >>> On 07/27/2013 01:49 AM, Jacob Wisor wrote: > >>>> Hello, > >>>> > >>>> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. > >>>> > >>>> Exception occurred during event dispatching: > >>>> java.lang.NullPointerException > >>>> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect > >>>> ory.java:56) > >>>> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja > >>>> va:360) > >>>> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j > >>>> ava:343) > >>>> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java > >>>> :66) > >>>> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) > >>>> > >>>> at java.awt.event.InvocationEvent.dispatch(Unknown Source) > >>>> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > >>>> at java.awt.EventQueue.access$400(Unknown Source) > >>>> at java.awt.EventQueue$2.run(Unknown Source) > >>>> at java.awt.EventQueue$2.run(Unknown Source) > >>>> at java.security.AccessController.doPrivileged(Native Method) > >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >>>> Source) > >>>> at java.awt.EventQueue.dispatchEvent(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >>>> at java.awt.Dialog$1.run(Unknown Source) > >>>> at java.awt.Dialog$3.run(Unknown Source) > >>>> at java.security.AccessController.doPrivileged(Native Method) > >>>> at java.awt.Dialog.show(Unknown Source) > >>>> at java.awt.Component.show(Unknown Source) > >>>> at java.awt.Component.setVisible(Unknown Source) > >>>> at java.awt.Window.setVisible(Unknown Source) > >>>> at java.awt.Dialog.setVisible(Unknown Source) > >>>> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi > >>>> ewer.java:149) > >>>> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio > >>>> nPerformed(TemporaryInternetFilesPanel.java:206) > >>>> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) > >>>> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) > >>>> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) > >>>> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) > >>>> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour > >>>> ce) > >>>> at java.awt.Component.processMouseEvent(Unknown Source) > >>>> at javax.swing.JComponent.processMouseEvent(Unknown Source) > >>>> at java.awt.Component.processEvent(Unknown Source) > >>>> at java.awt.Container.processEvent(Unknown Source) > >>>> at java.awt.Component.dispatchEventImpl(Unknown Source) > >>>> at java.awt.Container.dispatchEventImpl(Unknown Source) > >>>> at java.awt.Component.dispatchEvent(Unknown Source) > >>>> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) > >>>> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) > >>>> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) > >>>> at java.awt.Container.dispatchEventImpl(Unknown Source) > >>>> at java.awt.Window.dispatchEventImpl(Unknown Source) > >>>> at java.awt.Component.dispatchEvent(Unknown Source) > >>>> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) > >>>> at java.awt.EventQueue.access$400(Unknown Source) > >>>> at java.awt.EventQueue$2.run(Unknown Source) > >>>> at java.awt.EventQueue$2.run(Unknown Source) > >>>> at java.security.AccessController.doPrivileged(Native Method) > >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >>>> Source) > >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >>>> Source) > >>>> at java.awt.EventQueue$3.run(Unknown Source) > >>>> at java.awt.EventQueue$3.run(Unknown Source) > >>>> at java.security.AccessController.doPrivileged(Native Method) > >>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown > >>>> Source) > >>>> at java.awt.EventQueue.dispatchEvent(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > >>>> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) > >>>> at java.awt.EventDispatchThread.run(Unknown Source) > >>>> > >>>> The cause of this NullPointerException is a missing %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. > >>>> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. > >>>> > >>>> To reproduce: Delete %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). > >>> > >>> Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. > >>> > >> > >> Ok. There was simple usecase when the directories were not esured. Fixed by this patch. > >>> > >>> J. > > > > It's almost working. Only %USERPROFILE%.cacheicedtea-web or ~/.cache/icedtea-web gets created. It is neccessary to create all parent folders too. Please note that currently IcedTea-Web's default cache folder is %USERPROFILE%.cacheicedtea-webcache ~/.cache/icedtea-web/cache. I do not know whether this is desired, since it is a kind of tautology. > > The problem is that when NetX is run for the first time the default cache folder is already setup although it may not exist. It should get created either when setting up the cache folder on the cache tab is done or at least when the OK button is pressed, perhaps even earlier when the cache tab is selected so that opening the cache viewer does not break anything. > > > > + File f1 = new File(Defaults.USER_CONFIG_HOME); > > + File f2 = new File(Defaults.USER_CACHE_HOME); > > > > Another nit: Please give those local variables some meaningful names like cacheDirectory and configDirectory for better readability. > > ook O:) > > > > Jacob > > > > Looks like issue is a bit more widespread. What do you think now? Looks good. Just one other thing: + File f = new File(value); + if (f.exists()) { + if (JNLPRuntime.isDebug()) { + System.out.println("OK: key " + key + " value: " + value + " exists"); + } + continue; + } + if (!f.mkdirs()) { + if (JNLPRuntime.isDebug()) { + System.out.println("ERROR: key " + key + " value: " + value + " not existed, and was NOT created"); This text should probably be written to stderr. + } + } else { + if (JNLPRuntime.isDebug()) { + System.out.println("OK: key " + key + " value: " + value + " not existed, and was created"); + } + } If the folder is a file that already exists, the folder in which the folder is created is write protected or the current user has no permission to write to it, or the path is for some reason not available (e.g. failed network connectivity) this circumstance is not handled gracefully and the user is not notified that his/her configuration cannot be saved. All that a user will get is a possibly cryptic exception on stderr that some value or property cannot be saved when clicking OK. The exact same exception pops up when the .cache folder could not have been silently created and then the cache viewer is opend. This is similar to the backup problem. This may seem as nit picking, but it actually adds greatly to the usability of the application in case of an error or unusual system configuration. Nevertheless, thank you for addressing this issue, so please keep up the good work. Regards, Jacob From andrew at icedtea.classpath.org Tue Jul 30 09:46:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 30 Jul 2013 16:46:37 +0000 Subject: /hg/release/icedtea7-2.3: Fix automatic enabling of the Zero bui... Message-ID: changeset 63207151eedc in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=63207151eedc author: Andrew John Hughes date: Thu Jan 17 00:39:24 2013 +0000 Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. 2013-01-16 Andrew John Hughes * acinclude.m4: (IT_ENABLE_ZERO_BUILD): Depend on IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that ENABLE_CACAO and ENABLE_JAMVM are set. This makes the tests work correctly again and means that Zero is turned on automatically where there is no CACAO or JamVM and the architecture is not supported by a HotSpot JIT. diffstat: ChangeLog | 11 +++++++++++ acinclude.m4 | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diffs (30 lines): diff -r cc5652c0b17e -r 63207151eedc ChangeLog --- a/ChangeLog Tue Jul 30 01:26:28 2013 +0100 +++ b/ChangeLog Thu Jan 17 00:39:24 2013 +0000 @@ -1,3 +1,14 @@ +2013-01-16 Andrew John Hughes + + * acinclude.m4: + (IT_ENABLE_ZERO_BUILD): Depend on + IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that + ENABLE_CACAO and ENABLE_JAMVM are set. This + makes the tests work correctly again and means + that Zero is turned on automatically where there + is no CACAO or JamVM and the architecture is not + supported by a HotSpot JIT. + 2013-07-29 Andrew John Hughes * configure.ac: Bump to 2.3.13pre. diff -r cc5652c0b17e -r 63207151eedc acinclude.m4 --- a/acinclude.m4 Tue Jul 30 01:26:28 2013 +0100 +++ b/acinclude.m4 Thu Jan 17 00:39:24 2013 +0000 @@ -653,6 +653,8 @@ AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD], [ AC_REQUIRE([IT_SET_ARCH_SETTINGS]) + AC_REQUIRE([IT_ENABLE_CACAO]) + AC_REQUIRE([IT_ENABLE_JAMVM]) AC_MSG_CHECKING([whether to use the zero-assembler port]) use_zero=no AC_ARG_ENABLE([zero], From ChrisPhi at redhat.com Tue Jul 30 10:18:23 2013 From: ChrisPhi at redhat.com (Chris Phillips) Date: Tue, 30 Jul 2013 13:18:23 -0400 Subject: Script used to build openjdk based icedtea7 2.3 from hg repo Message-ID: <51F7F55F.9020004@RedHat.Com> Hi The attached script builds the Icedtea7 2.3 openjdk based arm32 asm jit from the mercurial repositories: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 For Ed ... Chris -------------- next part -------------- #! /bin/ksh -xv echo "$0" "$@" export LC_ALL=C export LANG=C #export JAVA_HOME=${JAVA_HOME:-/local/bin/jdk1.7.0/} export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-1.7.0} export PATH="${JAVA_HOME}/bin/:${PATH}" export STATIC_CXX=false export SHELL=/bin/ksh export ALT_JDK_IMPORT_PATH=${JAVA_HOME} export ALT_BOOTDIR=${JAVA_HOME} export DISABLE_NIMBUS=true export ALLOW_DOWNLOADS=true #export LP64=1 build64=true #export HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS:-2} #export ANT_HOME=/local/openjdk/ant/apache-ant-1.8.4 #export PATH="/local/openjdk/ant:${JAVA_HOME}/bin:${PATH}" export PATH="${JAVA_HOME}/bin:${PATH}" # export ALT_FREETYPE_HEADERS_PATH=/usr/include/freetype2 export ALT_FREETYPE_LIB_PATH=/usr/lib export FT2_LIBS=-lfreetype export FT2_CFLAGS=-I/usr/include/freetype2 export ZLIB_CFLAGS=-I/usr/include export ZLIB_LIBS=-lz export JPEG_LIBS=-ljpeg #zero export JVM_VARIANT_ZERO=true export ZERO_BUILD=true export ZERO_LIBARCH=arm export ZERO_ENDIANNESS=little export ZERO_ARCHDEF=ARM #export ZERO_ARCHFLAG=-m64 #export LIBFFI_CFLAGS=$(env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config --cflags libffi) #export LIBFFI_LIBS=$(env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config --libs libffi) export ZERO_ARCHFLAG=-D_LITTLE_ENDIAN export LIBFFI_CFLAGS=$(pkg-config --cflags libffi) export LIBFFI_LIBS=$(pkg-config --libs libffi) # Export variables needed for all builds export ARCH_DATA_MODEL=32 export DEBUG_BINARIES=true export ZIP_DEBUGINFO_FILES=0 export SHARK_BUILD=false ###zero #JR ##export NO_DOCS=true ##export NO_DEMOS=true ##export NO_SAMPLES=true export HOTSPOT_BUILD_JOBS=2 ##export BUILD_LANGTOOLS=true ##export BUILD_HOTSPOT=true ##export BUILD_JDK=true ##export BUILD_CORBA=false ##export BUILD_DEPLOY=false ##export BUILD_INSTALL=false ##export BUILD_JAXP=false ##export BUILD_JAXWS=false ##export BUILD_SPONSORS=false $BUILD_HOTSPOT && [ -d build ] && { HOTSPOT_DIRS=$(find build -name hotspot -type d -prune -print) ${KEEP_HOTSPOT_HEADERS:-false} || [ "$HOTSPOT_DIRS" = "" ] || rm -f $(find $HOTSPOT_DIRS -name \*.gch) ${BUILD_HOTSPOT_CLEAN:-false} && rm -f $(find $HOTSPOT_DIRS -name \*.o) } ###JR export OPENJDK=true # #if [ -d hotspot ]; then #. jdk/make/jdk_generic_profile.sh . jdk/make/jdk_generic_profile.sh #cd hotspot/make #else #assuming we are in hotspot directory. #cd make #fi env java -version make $@ From ChPhilli at redhat.com Tue Jul 30 10:30:20 2013 From: ChPhilli at redhat.com (Chris Phillips) Date: Tue, 30 Jul 2013 13:30:20 -0400 Subject: Script used to build openjdk based icedtea7 2.3 from hg repo [2nd try] Message-ID: <51F7F82C.4030106@redhat.com> Hi The attached script builds the Icedtea7 2.3 openjdk based arm32 asm jit from the mercurial repositories: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 For Ed ... Chris -- -- -- Woda: "Java: write once, debug anywhere" Hong Zhang http://thehenrys.ca | Chris Phillips @ T.O. Red Hat OpenJDK JVM Engineer, | | mailto:ChrisPhi at RedHat.Com (416)483-3768 | | http://LGonQn.Org/www/Chris.Phillips cell: (416)505-3610 | "EPIC stands for Expects Perfectly Intuitive Compilers" P. Bannon http://www.hazmatmodine.com NOTICE: This email message is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. "blah blah blah - Ginger!" -- -- -------------- next part -------------- #! /bin/ksh -xv echo "$0" "$@" export LC_ALL=C export LANG=C #export JAVA_HOME=${JAVA_HOME:-/local/bin/jdk1.7.0/} export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-1.7.0} export PATH="${JAVA_HOME}/bin/:${PATH}" export STATIC_CXX=false export SHELL=/bin/ksh export ALT_JDK_IMPORT_PATH=${JAVA_HOME} export ALT_BOOTDIR=${JAVA_HOME} export DISABLE_NIMBUS=true export ALLOW_DOWNLOADS=true #export LP64=1 build64=true #export HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS:-2} #export ANT_HOME=/local/openjdk/ant/apache-ant-1.8.4 #export PATH="/local/openjdk/ant:${JAVA_HOME}/bin:${PATH}" export PATH="${JAVA_HOME}/bin:${PATH}" # export ALT_FREETYPE_HEADERS_PATH=/usr/include/freetype2 export ALT_FREETYPE_LIB_PATH=/usr/lib export FT2_LIBS=-lfreetype export FT2_CFLAGS=-I/usr/include/freetype2 export ZLIB_CFLAGS=-I/usr/include export ZLIB_LIBS=-lz export JPEG_LIBS=-ljpeg #zero export JVM_VARIANT_ZERO=true export ZERO_BUILD=true export ZERO_LIBARCH=arm export ZERO_ENDIANNESS=little export ZERO_ARCHDEF=ARM #export ZERO_ARCHFLAG=-m64 #export LIBFFI_CFLAGS=$(env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config --cflags libffi) #export LIBFFI_LIBS=$(env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config --libs libffi) export ZERO_ARCHFLAG=-D_LITTLE_ENDIAN export LIBFFI_CFLAGS=$(pkg-config --cflags libffi) export LIBFFI_LIBS=$(pkg-config --libs libffi) # Export variables needed for all builds export ARCH_DATA_MODEL=32 export DEBUG_BINARIES=true export ZIP_DEBUGINFO_FILES=0 export SHARK_BUILD=false ###zero #JR ##export NO_DOCS=true ##export NO_DEMOS=true ##export NO_SAMPLES=true export HOTSPOT_BUILD_JOBS=2 ##export BUILD_LANGTOOLS=true ##export BUILD_HOTSPOT=true ##export BUILD_JDK=true ##export BUILD_CORBA=false ##export BUILD_DEPLOY=false ##export BUILD_INSTALL=false ##export BUILD_JAXP=false ##export BUILD_JAXWS=false ##export BUILD_SPONSORS=false $BUILD_HOTSPOT && [ -d build ] && { HOTSPOT_DIRS=$(find build -name hotspot -type d -prune -print) ${KEEP_HOTSPOT_HEADERS:-false} || [ "$HOTSPOT_DIRS" = "" ] || rm -f $(find $HOTSPOT_DIRS -name \*.gch) ${BUILD_HOTSPOT_CLEAN:-false} && rm -f $(find $HOTSPOT_DIRS -name \*.o) } ###JR export OPENJDK=true # #if [ -d hotspot ]; then #. jdk/make/jdk_generic_profile.sh . jdk/make/jdk_generic_profile.sh #cd hotspot/make #else #assuming we are in hotspot directory. #cd make #fi env java -version make $@ From adomurad at icedtea.classpath.org Tue Jul 30 10:49:18 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Tue, 30 Jul 2013 17:49:18 +0000 Subject: /hg/icedtea-web: Fix many memory leaks due to utf8fromidentifier... Message-ID: changeset f1eaa1ee7891 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f1eaa1ee7891 author: Adam Domurad date: Tue Jul 30 13:49:13 2013 -0400 Fix many memory leaks due to utf8fromidentifier misuse diffstat: ChangeLog | 14 ++ plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 42 +---- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 7 +- plugin/icedteanp/IcedTeaPluginUtils.cc | 12 + plugin/icedteanp/IcedTeaPluginUtils.h | 3 + plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 152 +++++++++++----------- plugin/icedteanp/IcedTeaScriptablePluginObject.h | 36 ++-- tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 14 +- tests/cpp-unit-tests/browser_mock.cc | 12 +- 9 files changed, 163 insertions(+), 129 deletions(-) diffs (truncated from 779 to 500 lines): diff -r 754507c1709a -r f1eaa1ee7891 ChangeLog --- a/ChangeLog Tue Jul 30 14:28:12 2013 +0200 +++ b/ChangeLog Tue Jul 30 13:49:13 2013 -0400 @@ -1,3 +1,17 @@ +2013-07-30 Adam Domurad + + * plugin/icedteanp/IcedTeaPluginUtils.cc + (NPIdentifierAsString): Leak-free utf8fromidentifier wrapper. + * plugin/icedteanp/IcedTeaPluginUtils.h: Same. + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Update calls + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Same. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Same. + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same. + * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc + (NPIdentifierAsString): New, tests utility function + * tests/cpp-unit-tests/browser_mock.cc + (mock_utf8fromidentifier): New, mocks NPAPI function + 2013-07-30 Jiri Vanek * tests/reproducers/simple/simpletest1/resources/favicon.ico: new file diff -r 754507c1709a -r f1eaa1ee7891 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Tue Jul 30 14:28:12 2013 +0200 +++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Tue Jul 30 13:49:13 2013 -0400 @@ -751,36 +751,27 @@ JavaRequestProcessor::getMethodID(std::string classID, NPIdentifier methodName, std::vector args) { - JavaRequestProcessor* java_request; - std::string message = std::string(); - std::string* signature; - - signature = new std::string(); - *signature += "("; + std::string message, signature = "("; // FIXME: Need to determine how to extract array types and complex java objects for (int i=0; i < args.size(); i++) { - *signature += args[i]; + signature += args[i]; } - *signature += ")"; + signature += ")"; this->instance = 0; // context is always 0 (needed for java-side backwards compat.) this->reference = IcedTeaPluginUtilities::getReference(); IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &message); - message += " GetMethodID "; - message += classID; - message += " "; - message += browser_functions.utf8fromidentifier(methodName); - message += " "; - message += *signature; + message += " GetMethodID " + classID + " "; + message += IcedTeaPluginUtilities::NPIdentifierAsString(methodName) + " "; + message += signature; postAndWaitForResponse(message); IcedTeaPluginUtilities::releaseReference(); - delete signature; return result; } @@ -789,36 +780,27 @@ JavaRequestProcessor::getStaticMethodID(std::string classID, NPIdentifier methodName, std::vector args) { - JavaRequestProcessor* java_request; - std::string message = std::string(); - std::string* signature; - - signature = new std::string(); - *signature += "("; + std::string message, signature = "("; // FIXME: Need to determine how to extract array types and complex java objects for (int i=0; i < args.size(); i++) { - *signature += args[i]; + signature += args[i]; } - *signature += ")"; + signature += ")"; this->instance = 0; // context is always 0 (needed for java-side backwards compat.) this->reference = IcedTeaPluginUtilities::getReference(); IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &message); - message += " GetStaticMethodID "; - message += classID; - message += " "; - message += browser_functions.utf8fromidentifier(methodName); - message += " "; - message += *signature; + message += " GetStaticMethodID " + classID + " "; + message += IcedTeaPluginUtilities::NPIdentifierAsString(methodName) + " "; + message += signature; postAndWaitForResponse(message); IcedTeaPluginUtilities::releaseReference(); - delete signature; return result; } diff -r 754507c1709a -r f1eaa1ee7891 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Jul 30 14:28:12 2013 +0200 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Jul 30 13:49:13 2013 -0400 @@ -763,7 +763,7 @@ else property_identifier = browser_functions.getstringidentifier(property_id->c_str()); - PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", browser_functions.utf8fromidentifier(property_identifier), instance, member, value->c_str()); + PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", IcedTeaPluginUtilities::NPIdentifierAsString(property_identifier).c_str(), instance, member, value->c_str()); IcedTeaPluginUtilities::javaResultToNPVariant(instance, value, &value_variant); @@ -783,6 +783,7 @@ std::vector parameters = ((AsyncCallThreadData*) data)->parameters; instance = (NPP) parameters.at(0); + parent_ptr = (NPObject*) parameters.at(1); std::string* member_id = (std::string*) parameters.at(2); NPIdentifier member_identifier; @@ -795,11 +796,11 @@ member_identifier = browser_functions.getstringidentifier(member_id->c_str()); // Get the NPVariant corresponding to this member - PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, browser_functions.utf8fromidentifier(member_identifier)); + PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str()); if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier)) { - printf("%s not found!\n", browser_functions.utf8fromidentifier(member_identifier)); + printf("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str()); } ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr); diff -r 754507c1709a -r f1eaa1ee7891 plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Jul 30 14:28:12 2013 +0200 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Jul 30 13:49:13 2013 -0400 @@ -1087,6 +1087,18 @@ str = str.substr(start, end - start + 1); } +std::string IcedTeaPluginUtilities::NPIdentifierAsString(NPIdentifier id) { + NPUTF8* cstr = browser_functions.utf8fromidentifier(id); + if (cstr == NULL) { + /* Treat not-existing strings as empty. To tell if it was a valid string, + * use browser_functions.identifierisstring. */ + return std::string(); + } + std::string str = cstr; + browser_functions.memfree(cstr); + return str; +} + bool IcedTeaPluginUtilities::file_exists(std::string filename) { std::ifstream infile(filename.c_str()); diff -r 754507c1709a -r f1eaa1ee7891 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jul 30 14:28:12 2013 +0200 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jul 30 13:49:13 2013 -0400 @@ -211,6 +211,9 @@ /* This must be freed with browserfunctions.releasevariantvalue */ static NPVariant NPVariantStringCopy(const std::string& result); + /* Returns an std::string represented by the given identifier. */ + static std::string NPIdentifierAsString(NPIdentifier id); + /* Frees the given vector and the strings that its contents point to */ static void freeStringPtrVector(std::vector* v); diff -r 754507c1709a -r f1eaa1ee7891 plugin/icedteanp/IcedTeaScriptablePluginObject.cc --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Tue Jul 30 14:28:12 2013 +0200 +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Tue Jul 30 13:49:13 2013 -0400 @@ -59,14 +59,14 @@ } bool -IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name) +IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name_id) { printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj); return false; } bool -IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args, +IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args, uint32_t argCount,NPVariant *result) { printf ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj); @@ -82,17 +82,17 @@ } bool -IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name) +IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name_id) { printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj); return false; } bool -IcedTeaScriptablePluginObject::getProperty(NPObject *npobj, NPIdentifier name, NPVariant *result) +IcedTeaScriptablePluginObject::getProperty(NPObject *npobj, NPIdentifier name_id, NPVariant *result) { // Package request? - if (!strcmp(browser_functions.utf8fromidentifier(name), "java")) + if (IcedTeaPluginUtilities::NPIdentifierAsString(name_id) == "java") { //NPObject* obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name); //OBJECT_TO_NPVARIANT(obj, *result); @@ -104,14 +104,14 @@ } bool -IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value) +IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value) { printf ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj); return false; } bool -IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name) +IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name_id) { printf ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj); return false; @@ -189,13 +189,13 @@ void IcedTeaScriptableJavaPackageObject::setPackageName(const NPUTF8* name) { - this->package_name->append(name); + this->package_name->assign(name); } std::string IcedTeaScriptableJavaPackageObject::getPackageName() { - return this->package_name->c_str(); + return *this->package_name; } void @@ -211,14 +211,14 @@ } bool -IcedTeaScriptableJavaPackageObject::hasMethod(NPObject *npobj, NPIdentifier name) +IcedTeaScriptableJavaPackageObject::hasMethod(NPObject *npobj, NPIdentifier name_id) { // Silly caller. Methods are for objects! return false; } bool -IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args, +IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args, uint32_t argCount,NPVariant *result) { printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj); @@ -234,30 +234,31 @@ } bool -IcedTeaScriptableJavaPackageObject::hasProperty(NPObject *npobj, NPIdentifier name) +IcedTeaScriptableJavaPackageObject::hasProperty(NPObject *npobj, NPIdentifier name_id) { - PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::hasProperty %s\n", browser_functions.utf8fromidentifier(name)); + std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id); + + PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::hasProperty %s\n", name.c_str()); bool hasProperty = false; JavaResultData* java_result; JavaRequestProcessor* java_request = new JavaRequestProcessor(); NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj); int plugin_instance_id = get_id_from_instance(instance); + IcedTeaScriptableJavaPackageObject* scriptable_obj = (IcedTeaScriptableJavaPackageObject*)npobj; - PLUGIN_DEBUG("Object package name: \"%s\"\n", ((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName().c_str()); + PLUGIN_DEBUG("Object package name: \"%s\"\n", scriptable_obj->getPackageName().c_str()); // "^java" is always a package - if (((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName().length() == 0 && - ( !strcmp(browser_functions.utf8fromidentifier(name), "java") || - !strcmp(browser_functions.utf8fromidentifier(name), "javax"))) + if (scriptable_obj->getPackageName().empty() && (name == "java" || name == "javax")) { return true; } - std::string property_name = ((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName(); - if (property_name.length() > 0) + std::string property_name = scriptable_obj->getPackageName(); + if (!property_name.empty()) property_name += "."; - property_name += browser_functions.utf8fromidentifier(name); + property_name += name; PLUGIN_DEBUG("Looking for name \"%s\"\n", property_name.c_str()); @@ -279,12 +280,13 @@ } bool -IcedTeaScriptableJavaPackageObject::getProperty(NPObject *npobj, NPIdentifier name, NPVariant *result) +IcedTeaScriptableJavaPackageObject::getProperty(NPObject *npobj, NPIdentifier name_id, NPVariant *result) { + std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id); - PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::getProperty %s\n", browser_functions.utf8fromidentifier(name)); + PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::getProperty %s\n", name.c_str()); - if (!browser_functions.utf8fromidentifier(name)) + if (!browser_functions.identifierisstring(name_id)) return false; bool isPropertyClass = false; @@ -292,11 +294,12 @@ JavaRequestProcessor java_request = JavaRequestProcessor(); NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj); int plugin_instance_id = get_id_from_instance(instance); + IcedTeaScriptableJavaPackageObject* scriptable_obj = (IcedTeaScriptableJavaPackageObject*)npobj; - std::string property_name = ((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName(); - if (property_name.length() > 0) - property_name += "."; - property_name += browser_functions.utf8fromidentifier(name); + std::string property_name = scriptable_obj->getPackageName(); + if (!property_name.empty()) + property_name += "."; + property_name += name; java_result = java_request.findClass(plugin_instance_id, property_name); isPropertyClass = (java_result->return_identifier == 0); @@ -326,14 +329,14 @@ } bool -IcedTeaScriptableJavaPackageObject::setProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value) +IcedTeaScriptableJavaPackageObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value) { // Can't be going around setting properties on namespaces.. that's madness! return false; } bool -IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name) +IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name_id) { printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj); return false; @@ -462,28 +465,26 @@ } bool -IcedTeaScriptableJavaObject::hasMethod(NPObject *npobj, NPIdentifier name) +IcedTeaScriptableJavaObject::hasMethod(NPObject *npobj, NPIdentifier name_id) { - + std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id); IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) npobj; - PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasMethod %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); + PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasMethod %s (ival=%d)\n", name.c_str(), browser_functions.intfromidentifier(name_id)); bool hasMethod = false; // If object is an array and requested "method" may be a number, check for it first if ( scriptable_object->is_object_array || - (browser_functions.intfromidentifier(name) < 0)) + (browser_functions.intfromidentifier(name_id) < 0)) { - if (!browser_functions.utf8fromidentifier(name)) + if (!browser_functions.identifierisstring(name_id)) return false; JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - std::string methodName = browser_functions.utf8fromidentifier(name); - - java_result = java_request.hasMethod(scriptable_object->class_id, methodName); + java_result = java_request.hasMethod(scriptable_object->class_id, name); hasMethod = java_result->return_identifier != 0; } @@ -492,13 +493,13 @@ } bool -IcedTeaScriptableJavaObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args, +IcedTeaScriptableJavaObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args, uint32_t argCount, NPVariant *result) { - NPUTF8* method_name = browser_functions.utf8fromidentifier(name); + std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id); // Extract arg type array - PLUGIN_DEBUG("IcedTeaScriptableJavaObject::invoke %s. Args follow.\n", method_name); + PLUGIN_DEBUG("IcedTeaScriptableJavaObject::invoke %s. Args follow.\n", name.c_str()); for (int i=0; i < argCount; i++) { IcedTeaPluginUtilities::printNPVariant(args[i]); @@ -535,13 +536,13 @@ PLUGIN_DEBUG("Calling static method\n"); java_result = java_request.callStaticMethod( IcedTeaPluginUtilities::getSourceFromInstance(instance), - scriptable_object->class_id, browser_functions.utf8fromidentifier(name), arg_ids); + scriptable_object->class_id, name, arg_ids); } else { PLUGIN_DEBUG("Calling method normally\n"); java_result = java_request.callMethod( IcedTeaPluginUtilities::getSourceFromInstance(instance), - scriptable_object->instance_id, browser_functions.utf8fromidentifier(name), arg_ids); + scriptable_object->instance_id, name, arg_ids); } if (java_result->error_occurred) @@ -558,26 +559,26 @@ } bool -IcedTeaScriptableJavaObject::hasProperty(NPObject *npobj, NPIdentifier name) +IcedTeaScriptableJavaObject::hasProperty(NPObject *npobj, NPIdentifier name_id) { - PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasProperty %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); + std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id); + + PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasProperty %s (ival=%d)\n", name.c_str(), browser_functions.intfromidentifier(name_id)); bool hasProperty = false; IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj; // If it is an array, only length and indexes are valid if (scriptable_object->is_object_array) { - if (browser_functions.intfromidentifier(name) >= 0 || - !strcmp(browser_functions.utf8fromidentifier(name), "length")) + if (browser_functions.intfromidentifier(name_id) >= 0 || name == "length") hasProperty = true; } else { - - if (!browser_functions.utf8fromidentifier(name)) + if (!browser_functions.identifierisstring(name_id)) return false; - if (!strcmp(browser_functions.utf8fromidentifier(name), "Packages")) + if (name == "Packages") { hasProperty = true; } else { @@ -585,9 +586,7 @@ JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - std::string fieldName = browser_functions.utf8fromidentifier(name); - - java_result = java_request.hasField(scriptable_object->class_id, fieldName); + java_result = java_request.hasField(scriptable_object->class_id, name); hasProperty = java_result->return_identifier != 0; } @@ -598,9 +597,11 @@ } bool -IcedTeaScriptableJavaObject::getProperty(NPObject *npobj, NPIdentifier name, NPVariant *result) +IcedTeaScriptableJavaObject::getProperty(NPObject *npobj, NPIdentifier name_id, NPVariant *result) { - PLUGIN_DEBUG("IcedTeaScriptableJavaObject::getProperty %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); + std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id); + bool is_string_id = browser_functions.identifierisstring(name_id); + PLUGIN_DEBUG("IcedTeaScriptableJavaObject::getProperty %s (ival=%d)\n", name.c_str(), browser_functions.intfromidentifier(name_id)); JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); @@ -614,13 +615,11 @@ if (instance_id.length() > 0) // Could be an array or a simple object { // If array and requesting length - if ( scriptable_object->is_object_array && - browser_functions.utf8fromidentifier(name) && - !strcmp(browser_functions.utf8fromidentifier(name), "length")) + if ( scriptable_object->is_object_array && name == "length") { java_result = java_request.getArrayLength(instance_id); } else if ( scriptable_object->is_object_array && From gnu.andrew at redhat.com Tue Jul 30 10:24:57 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 30 Jul 2013 13:24:57 -0400 (EDT) Subject: [fyi][icedtea7] windows builds In-Reply-To: <51F58C6F.7080200@gmail.com> References: <51F58C6F.7080200@gmail.com> Message-ID: <1590288461.9969342.1375205097925.JavaMail.root@redhat.com> ----- Original Message ----- > Hi, > > Just for your information, icedtea7 tip (hg:0a8108854365) builds fine on > windows-i586 and windows-amd64 without additional patches. > > I've obtained sources from "icedtea7/openjdk" directory by running: > > ./configure \ > --disable-system-zlib \ > --disable-system-jpeg \ > --disable-system-png \ > --disable-system-gif \ > --disable-system-lcms \ > --disable-compile-against-syscalls \ > --disable-nss > > and "make" on debian wheezy. > > Then built these sources on windows (xp and 2003x64) as separate openjdk > builds (without icedtea infrastructure) using additional environment > variables: > > set USE_SYSTEM_GTK=true > set USE_SYSTEM_GCONF=true > set USE_SYSTEM_GIO=true > set USE_SYSTEM_CUPS=true > set USE_SYSTEM_FONTCONFIG=true > set RHINO_JAR=%LIBS_DIR%/rhino.jar > set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) > -I$(FREETYPE_HEADERS_PATH)/freetype2 > set DISABLE_INTREE_EC=true > > > -- > Regards, > Alex Kasko > This is good news. Some of those options will be backported to IcedTea 1.x for OpenJDK 6 for the 1.13 release, so should reduce the number of patches needed there too. I'm a little concerned by the use of the make flags. USE_SYSTEM_GTK, USE_SYSTEM_CUPS and USE_SYSTEM_FONTCONFIG are only ever used in make/sun/xawt/Makefile and make/sun/awt/mawt.gmk which I assume Windows doesn't include, as it seems unlikely you have these libraries installed. Do you have GConf or GIO available? That seems unlikely and both shouldn't be used at the same time... -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From andrew at icedtea.classpath.org Tue Jul 30 11:46:24 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 30 Jul 2013 18:46:24 +0000 Subject: /hg/release/icedtea7-2.4: Update to u40 b34. Message-ID: changeset 415c72468152 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=415c72468152 author: Andrew John Hughes date: Tue Jul 30 19:46:00 2013 +0100 Update to u40 b34. 2013-07-30 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to b34. (CORBA_CHANGESET): Update to IcedTea 2.4 branch HEAD. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * hotspot.map: Update to IcedTea 2.4 branch HotSpot HEAD. * patches/boot/ecj-diamond.patch: Regenerate. Add new cases in com.sun.org.apache.xml.internal.serializer.Encodings, sun.nio.ch.EPollArrayWrapper and sun.nio.ch.EPollSelectorImpl. Remove case in sun.util.logging.PlatformLogger. * patches/boot/ecj-multicatch.patch: Add new case in com.sun.org.apache.xml.internal.serializer.Encodings. diffstat: ChangeLog | 28 + Makefile.am | 26 +- hotspot.map | 2 +- patches/boot/ecj-diamond.patch | 1373 ++++++++++++++++++------------------ patches/boot/ecj-multicatch.patch | 14 + 5 files changed, 760 insertions(+), 683 deletions(-) diffs (truncated from 3683 to 500 lines): diff -r 3d95198cf8be -r 415c72468152 ChangeLog --- a/ChangeLog Mon Jul 08 17:49:52 2013 +0100 +++ b/ChangeLog Tue Jul 30 19:46:00 2013 +0100 @@ -1,3 +1,31 @@ +2013-07-30 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to b34. + (CORBA_CHANGESET): Update to IcedTea 2.4 branch HEAD. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update to IcedTea 2.4 branch HotSpot + HEAD. + * patches/boot/ecj-diamond.patch: + Regenerate. Add new cases in + com.sun.org.apache.xml.internal.serializer.Encodings, + sun.nio.ch.EPollArrayWrapper and + sun.nio.ch.EPollSelectorImpl. + Remove case in sun.util.logging.PlatformLogger. + * patches/boot/ecj-multicatch.patch: + Add new case in + com.sun.org.apache.xml.internal.serializer.Encodings. + 2013-07-08 Andrew John Hughes * configure.ac: Bump to 2.4.2pre. diff -r 3d95198cf8be -r 415c72468152 Makefile.am --- a/Makefile.am Mon Jul 08 17:49:52 2013 +0100 +++ b/Makefile.am Tue Jul 30 19:46:00 2013 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b31 +OPENJDK_VERSION = b34 JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 23ae4e0e0cce -JAXP_CHANGESET = 5be6b670d08b -JAXWS_CHANGESET = c0e48fdfb695 -JDK_CHANGESET = 65d95818d79e -LANGTOOLS_CHANGESET = 91c95fd8eea8 -OPENJDK_CHANGESET = ae86c6974e8e +CORBA_CHANGESET = 74ca39d558e8 +JAXP_CHANGESET = 7d8341df70fe +JAXWS_CHANGESET = 92dab5233b50 +JDK_CHANGESET = 4a2244a0e816 +LANGTOOLS_CHANGESET = f3ef419fe842 +OPENJDK_CHANGESET = b5f2715442df -CORBA_SHA256SUM = 618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395 -JAXP_SHA256SUM = df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34 -JAXWS_SHA256SUM = 972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037 -JDK_SHA256SUM = 97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432 -LANGTOOLS_SHA256SUM = 6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561 -OPENJDK_SHA256SUM = f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a +CORBA_SHA256SUM = 0f05df309e52837491274963e90232894838ef695880ebc6029dcb7c11d5d349 +JAXP_SHA256SUM = e74c92df177ace833e18d610dff33c04cd498a4da608ed177d3de9a9ed85387d +JAXWS_SHA256SUM = 4d6af21a16945b9241b22f20695719b68bb131f69d2c34c2e60bbb699a64e8e6 +JDK_SHA256SUM = 0f51d28ddc41eb54faa8ecda496153ce9fe844c02f4c87ed107b743555fc064f +LANGTOOLS_SHA256SUM = 6459ae92d498b60d5b49da889a509e6961616524cc90d5c18cd86a099e71b10c +OPENJDK_SHA256SUM = 07b6c6e45f000c60f8d6179756958d4298998bd410869171df390c3c5d1301f9 CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -r 3d95198cf8be -r 415c72468152 hotspot.map --- a/hotspot.map Mon Jul 08 17:49:52 2013 +0100 +++ b/hotspot.map Tue Jul 30 19:46:00 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 5f53e7717116 f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 71498f89324b ddc89554a6e0d768a4af81610c20c71545850184ad8c608e689917166cfaf188 diff -r 3d95198cf8be -r 415c72468152 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Mon Jul 08 17:49:52 2013 +0100 +++ b/patches/boot/ecj-diamond.patch Tue Jul 30 19:46:00 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-03 14:17:36.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-04 18:13:31.220314739 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-24 21:31:42.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-30 18:32:50.125579213 +0100 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,9 +11,9 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-03 14:17:36.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-04 18:13:31.232314934 +0100 -@@ -1316,7 +1316,7 @@ +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-24 21:31:42.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-30 18:32:50.141579926 +0100 +@@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set oaset; synchronized (this) { @@ -23,8 +23,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-03 14:17:36.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-04 18:13:31.236314998 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-24 21:31:42.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-30 18:32:50.145580045 +0100 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -43,9 +43,32 @@ } for (WorkerThread wt : copy) { +diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:55.970380942 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:29.097954416 +0100 +@@ -297,8 +297,8 @@ + // + private final static class EncodingInfos { + // These maps are final and not modified after initialization. +- private final Map _encodingTableKeyJava = new HashMap<>(); +- private final Map _encodingTableKeyMime = new HashMap<>(); ++ private final Map _encodingTableKeyJava = new HashMap(); ++ private final Map _encodingTableKeyMime = new HashMap(); + // This map will be added to after initialization: make sure it's + // thread-safe. This map should not be used frequently - only in cases + // where the mapping requested was not declared in the Encodings.properties +@@ -449,7 +449,7 @@ + + // create instances of EncodingInfo from the loaded mapping + Enumeration keys = props.keys(); +- Map canonicals = new HashMap<>(); ++ Map canonicals = new HashMap(); + while (keys.hasMoreElements()) { + final String javaName = (String) keys.nextElement(); + final String[] mimes = parseMimeTypes(props.getProperty(javaName)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-04 18:13:31.240315064 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-30 18:32:50.149580081 +0100 @@ -62,9 +62,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -61,8 +84,8 @@ private Reference loader; private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-04 18:13:31.244315128 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-30 18:32:50.149580081 +0100 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -82,8 +105,8 @@ CACHE.put(actual, map); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-04 18:13:31.252315258 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-30 18:32:50.153580096 +0100 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -155,8 +178,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-04 18:13:31.272315583 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-30 18:18:54.056413584 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-30 18:32:50.157580124 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -219,8 +242,8 @@ return true; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 18:12:33.863382065 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 18:13:31.276315648 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-30 18:18:53.968412200 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-30 18:32:50.161580154 +0100 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -231,8 +254,8 @@ InnerClass ic = new InnerClass(readClassRef(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-04 18:13:31.280315713 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-30 18:32:50.161580154 +0100 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -269,8 +292,8 @@ if (popset.add(values[i])) popvals.add(values[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-04 18:13:31.284315778 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-30 18:32:50.165580223 +0100 @@ -402,7 +402,7 @@ private static Map codeMap; @@ -281,8 +304,8 @@ Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-04 18:13:31.292315907 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-30 18:32:50.169580312 +0100 @@ -919,7 +919,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -311,8 +334,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 18:13:31.292315907 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-30 18:18:54.056413584 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-30 18:32:50.173580385 +0100 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -350,8 +373,8 @@ for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-04 18:13:31.296315973 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-30 18:32:50.173580385 +0100 @@ -45,7 +45,7 @@ private final ArrayList flist; @@ -362,8 +385,8 @@ for (int i = 0 ; i < capacity ; i++) { flist.add(null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 18:12:33.863382065 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 18:13:31.304316103 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-30 18:18:53.972412262 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-30 18:32:50.177580449 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map attrDefs; @@ -519,8 +542,8 @@ // Add to the end of ths list: if (!fileSet.contains(cls.file)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-04 18:13:31.308316167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-30 18:18:54.060413647 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-30 18:32:50.181580507 +0100 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -634,8 +657,8 @@ ClassEntry thisClass = curClass.thisClass; ClassEntry superClass = curClass.superClass; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-04 18:13:31.312316233 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-30 18:18:54.060413647 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-30 18:32:50.185580566 +0100 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -691,8 +714,8 @@ for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-04 18:13:31.316316297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-30 18:32:50.185580566 +0100 @@ -183,8 +183,8 @@ final Map attrDefs; final Map attrCommands; @@ -723,8 +746,8 @@ for (JarEntry je : Collections.list(jf.entries())) { InFile inFile = new InFile(jf, je); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-04 18:13:31.316316297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-30 18:32:50.189580623 +0100 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -735,8 +758,8 @@ maxForDebug += fillp; int min = Integer.MIN_VALUE; // farthest from the center diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-04 18:13:31.320316362 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-30 18:18:54.060413647 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-30 18:32:50.193580683 +0100 @@ -48,8 +48,8 @@ */ @@ -767,8 +790,8 @@ while (res.remove(null)); return res; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-04 18:13:31.324316427 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-30 18:32:50.193580683 +0100 @@ -58,12 +58,12 @@ private final Map memberEntries; @@ -789,8 +812,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-04 18:13:31.328316492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-30 18:18:54.060413647 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-30 18:32:50.197580747 +0100 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -801,8 +824,8 @@ String name = file.nameString; JarEntry je = new JarEntry(Utils.getJarEntryName(name)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-04 18:12:33.935383238 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-04 18:13:31.328316492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-30 18:18:54.060413647 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-30 18:32:50.201580815 +0100 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -812,9 +835,33 @@ // convenience methods to access the TL globals static TLGlobals getTLGlobals() { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-30 18:32:50.625587499 +0100 +@@ -54,7 +54,7 @@ + * Contains event dispatcher per thread group. + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * Constructs a new AbstractLine. +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-30 18:32:50.625587499 +0100 +@@ -59,7 +59,7 @@ + * dispatcher instance with a factory in EventDispatcher + */ + private static final Map dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap(); + + /** + * All RealTimeSequencers share this info object. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-04-04 18:13:31.752323374 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-30 18:32:50.201580815 +0100 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -825,8 +872,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-04-04 18:13:31.752323374 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-30 18:32:50.205580881 +0100 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -837,8 +884,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-04 18:13:31.332316557 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-30 18:32:50.209580944 +0100 @@ -1284,7 +1284,7 @@ */ public Collection toCollection() throws SQLException { @@ -858,8 +905,8 @@ // create a copy CachedRowSetImpl crsTemp; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-04 18:13:31.336316622 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-30 18:32:50.213581007 +0100 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -870,8 +917,8 @@ if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { iMatchKey = cRowset.findColumn(strMatchKey); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-04 18:13:31.340316687 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-07-30 18:32:50.213581007 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -886,8 +933,8 @@ ConfirmationInfo confirmation = new ConfirmationInfo(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-04 18:13:31.344316752 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-07-30 18:32:50.217581069 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -916,8 +963,8 @@ String value; while (peek(";") == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-04 18:13:31.344316752 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-07-30 18:32:50.221581130 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -928,8 +975,8 @@ // initial state private Subject subject; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-04 18:13:31.348316816 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-07-30 18:32:50.221581130 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -940,8 +987,8 @@ certList.add(fromKeyStore[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-04 18:13:31.352316882 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-07-30 18:32:50.225581191 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -952,8 +999,8 @@ /** * Initialize this LoginModule. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-04-04 18:13:31.352316882 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-07-30 18:32:50.225581191 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -964,8 +1011,8 @@ /** * Initialize this LoginModule. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-04-04 18:13:31.356316946 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-07-24 21:32:02.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-07-30 18:32:50.229581254 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -976,8 +1023,8 @@ while (i < certs.length) { userCertList.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java From bugzilla-daemon at icedtea.classpath.org Tue Jul 30 14:28:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 30 Jul 2013 21:28:25 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole at redhat.com |aazores at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/31d6cdc3/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jul 30 14:55:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 30 Jul 2013 21:55:26 +0000 Subject: [Bug 1508] New: Agent Ids and Host Ids Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1508 Bug ID: 1508 Summary: Agent Ids and Host Ids Classification: Unclassified Product: Thermostat Version: hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Thermostat Assignee: unassigned at icedtea.classpath.org Reporter: omajid at redhat.com CC: thermostat at icedtea.classpath.org Thermostat mixes agent and host in a number of places and we do not have a unified model of the what's common and what's different between the two. Perhaps they should even be the same? The API only defines a HostRef, but each HostRef actually refers to an agent. The Swing GUI treats each HostRef as a separate host, not an agent. Most command-line parts talk about host ids. 'list-vms' uses the column header "HOST_ID" and calls the option "host-id". -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/70c84e9a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jul 30 15:02:52 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 30 Jul 2013 22:02:52 +0000 Subject: [Bug 1508] Agent Ids and Host Ids In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1508 --- Comment #1 from Omair Majid --- Also see the thread starting here: http://icedtea.classpath.org/pipermail/thermostat/2012-August/002744.html -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130730/0f2621cc/attachment.html From gitne at excite.co.jp Tue Jul 30 16:47:02 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 31 Jul 2013 08:47:02 +0900 Subject: =?ISO-2022-JP?B?W3JmY11baWNlZHRlYS13ZWJdIENhY2hlIHZpZXdlciBjbGVhbnVw?= Message-ID: <201307302347.r6UNl2x1011963@mail-web03.excite.co.jp> Hello, * Added closing of cache viewer by ESC key * Added proper dis-/enabling of cache viewer's buttons * Added busy mouse cursor indicator when populating the cache viewer Everything is done on purpose on the AWT thread as before. Although I am personally not in favour of anonymous classes, I have tried to stick to the prevalent coding style. Unfortunatelly, I was unable to test the cache viewer's behavior because I do not know how to put synthetic cache entries into the cache. Can anyone help me with that? What does a the cache look like when filled with resources? Is there any index file that keeps track of the cache? Regards, Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: ESC closing of Cache viewer + cleanup.patch Type: text/x-patch Size: 10134 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130731/95a8e848/ISO-2022-JPBRVNDIGNsb3Npbmcgb2YgQ2FjaGUgdmlld2VyICsgY2xlYW51cC5wYXRjaA.patch From alex.kasko.lists at gmail.com Wed Jul 31 01:24:00 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Wed, 31 Jul 2013 11:24:00 +0300 Subject: [fyi][icedtea7] windows builds In-Reply-To: <1590288461.9969342.1375205097925.JavaMail.root@redhat.com> References: <51F58C6F.7080200@gmail.com> <1590288461.9969342.1375205097925.JavaMail.root@redhat.com> Message-ID: <51F8C9A0.1040907@gmail.com> On 07/30/2013 08:24 PM, Andrew Hughes wrote: > > ----- Original Message ----- >> Hi, >> >> Just for your information, icedtea7 tip (hg:0a8108854365) builds fine on >> windows-i586 and windows-amd64 without additional patches. >> >> I've obtained sources from "icedtea7/openjdk" directory by running: >> >> ./configure \ >> --disable-system-zlib \ >> --disable-system-jpeg \ >> --disable-system-png \ >> --disable-system-gif \ >> --disable-system-lcms \ >> --disable-compile-against-syscalls \ >> --disable-nss >> >> and "make" on debian wheezy. >> >> Then built these sources on windows (xp and 2003x64) as separate openjdk >> builds (without icedtea infrastructure) using additional environment >> variables: >> >> set USE_SYSTEM_GTK=true >> set USE_SYSTEM_GCONF=true >> set USE_SYSTEM_GIO=true >> set USE_SYSTEM_CUPS=true >> set USE_SYSTEM_FONTCONFIG=true >> set RHINO_JAR=%LIBS_DIR%/rhino.jar >> set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) >> -I$(FREETYPE_HEADERS_PATH)/freetype2 >> set DISABLE_INTREE_EC=true >> >> >> -- >> Regards, >> Alex Kasko >> > > This is good news. Some of those options will be backported to IcedTea 1.x for > OpenJDK 6 for the 1.13 release, so should reduce the number of patches needed there too. > > I'm a little concerned by the use of the make flags. USE_SYSTEM_GTK, USE_SYSTEM_CUPS and > USE_SYSTEM_FONTCONFIG are only ever used in make/sun/xawt/Makefile and make/sun/awt/mawt.gmk > which I assume Windows doesn't include, as it seems unlikely you have these libraries > installed. Do you have GConf or GIO available? That seems unlikely and both shouldn't be > used at the same time... All USE_SYSTEM* flags were used only to prevent inclusion of source files guarded with "ifndef USE_SYSTEM_*" (e.g. gconf_fp.c). None of these libraries are actually installed/used on windows build boxes. And you are right, USE_SYSTEM_GTK, USE_SYSTEM_CUPS and USE_SYSTEM_FONTCONFIG are not actually needed, because those makefiles are not included in windows builds. USE_SYSTEM_GCONF and USE_SYSTEM_GIO are needed though, they are used in make/java/net/Makefile and make/java/net/FILES_c.gmk . -- Regards, Alex Kasko From ptisnovs at icedtea.classpath.org Wed Jul 31 04:46:50 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 31 Jul 2013 11:46:50 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltBasicTests test s... Message-ID: changeset 0489bac8bc0e in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0489bac8bc0e author: Pavel Tisnovsky date: Wed Jul 31 13:49:52 2013 +0200 Eight new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 120 +++++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r 590ac4a8732d -r 0489bac8bc0e ChangeLog --- a/ChangeLog Tue Jul 30 11:06:17 2013 +0200 +++ b/ChangeLog Wed Jul 31 13:49:52 2013 +0200 @@ -1,3 +1,8 @@ +2013-07-31 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Eight new tests added into BitBltBasicTests test suite. + 2013-07-30 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: diff -r 590ac4a8732d -r 0489bac8bc0e src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Jul 30 11:06:17 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jul 31 13:49:52 2013 +0200 @@ -5096,6 +5096,126 @@ } /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for horizontal yellow gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalYellowGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for vertical yellow gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalYellowGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for vertical yellow gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalYellowGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Wed Jul 31 04:53:35 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 31 Jul 2013 11:53:35 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 75127200e6a0 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=75127200e6a0 author: Pavel Tisnovsky date: Wed Jul 31 13:57:08 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into ScriptEngineClassTest. diffstat: ChangeLog | 7 +++++ src/org/RhinoTests/ScriptEngineClassTest.java | 37 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diffs (78 lines): diff -r 8ebc2504f836 -r 75127200e6a0 ChangeLog --- a/ChangeLog Tue Jul 30 11:12:14 2013 +0200 +++ b/ChangeLog Wed Jul 31 13:57:08 2013 +0200 @@ -1,3 +1,10 @@ +2013-07-31 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into ScriptEngineClassTest. + 2013-07-30 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 8ebc2504f836 -r 75127200e6a0 src/org/RhinoTests/ScriptEngineClassTest.java --- a/src/org/RhinoTests/ScriptEngineClassTest.java Tue Jul 30 11:12:14 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineClassTest.java Wed Jul 31 13:57:08 2013 +0200 @@ -52,9 +52,12 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; +import javax.script.ScriptEngine; @@ -1022,6 +1025,7 @@ protected void testGetAnnotations() { // following annotations should be provided final String[] annotationsThatShouldExists_jdk6 = { + // this should be really empty }; final String[] annotationsThatShouldExists_jdk7 = { @@ -1182,6 +1186,39 @@ } /** + * Test for method javax.script.ScriptEngine.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.scriptEngineClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngine.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.scriptEngineClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.ScriptEngine.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.scriptEngineClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngine.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.scriptEngineClass.desiredAssertionStatus(), + "Method ScriptEngine.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptEngine */ @SuppressWarnings("cast") From andrew at icedtea.classpath.org Wed Jul 31 10:05:33 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 31 Jul 2013 17:05:33 +0000 Subject: /hg/icedtea6-hg: 4 new changesets Message-ID: changeset b83b6ac3b4a1 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b83b6ac3b4a1 author: Andrew John Hughes date: Wed Jul 31 16:35:55 2013 +0100 Remove 2013/04/16 errata patches, now upstream. 2013-07-31 Andrew John Hughes * patches/ecj/jcp-importsources.patch, * patches/openjdk/5102804-memory_leak.patch, * patches/openjdk/6501644-icu_sync.patch, * patches/openjdk/6669869-queries_per_appcontext.patch, * patches/openjdk/6886358-layout_update.patch, * patches/openjdk/6963811-deadlock_fix.patch, * patches/openjdk/7017324-kerning_crash.patch, * patches/openjdk/7064279-fixup.patch, * patches/openjdk/7064279-resource_release.patch, * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch, * patches/security/20130416/6657673-factory_finder.patch, * patches/security/20130416/6657673-fixup.patch, * patches/security/20130416/6657673.patch, * patches/security/20130416/7200507.patch, * patches/security/20130416/8000724.patch, * patches/security/20130416/8001031.patch, * patches/security/20130416/8001040.patch, * patches/security/20130416/8001322.patch, * patches/security/20130416/8001329.patch, * patches/security/20130416/8003335.patch, * patches/security/20130416/8003445.patch, * patches/security/20130416/8003543.patch, * patches/security/20130416/8004261.patch, * patches/security/20130416/8004336.patch, * patches/security/20130416/8004986.patch, * patches/security/20130416/8005432.patch, * patches/security/20130416/8005943.patch, * patches/security/20130416/8006309.patch, * patches/security/20130416/8006435.patch, * patches/security/20130416/8006790.patch, * patches/security/20130416/8006795.patch, * patches/security/20130416/8007406.patch, * patches/security/20130416/8007617.patch, * patches/security/20130416/8007667.patch, * patches/security/20130416/8007918.patch, * patches/security/20130416/8009063.patch, * patches/security/20130416/8009305.patch, * patches/security/20130416/8009699.patch, * patches/security/20130416/8009814.patch, * patches/security/20130416/8009857.patch: Remove unused patches. * Makefile.am: (SECURITY_PATCHES): Remove upstreamed security patches. changeset f9036c0f3155 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f9036c0f3155 author: Andrew John Hughes date: Mon Jul 22 23:59:29 2013 +0100 PR718: Backport LCMS2 support from IcedTea7 2013-07-22 Andrew John Hughes PR718: Backport LCMS2 support from IcedTea7 * Makefile.am: (LCMS_PATCHES): Populate based on which version of LCMS is being built. (ICEDTEA_PATCHES): Add LCMS_PATCHES. Remove lcms.patch and patches/jtreg-ReadWriteProfileTest.patch, the latter being 6733501 in disguise. * NEWS: Mention PR718. * acinclude.m4: (IT_ENABLE_LCMS2): New macro to enable or disable the use of LCMS 2 (enabled by default). * configure.ac: Invoke IT_ENABLE_LCMS2. * patches/libraries.patch: Adjust due to JPEG changes in 7002766. * patches/openjdk/6733501-icedtea_lcms_test.patch: Identical to ReadWriteProfileTest.patch with addition of upstream changeset information. * patches/openjdk/7002766-parfait-jpeg.patch: JPEG segment of 7002766 applied on all builds. * patches/openjdk/lcms2/6523398-writing_tags.patch, * patches/openjdk/lcms2/6988213-windows_build_failure.patch, * patches/openjdk/lcms2/7002766-parfait.patch, * patches/openjdk/lcms2/7042594-tck_failure.patch, * patches/openjdk/lcms2/7053526-lcms_2.4.patch, * patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch, * patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch, * patches/openjdk/lcms2/8007929-improve_curvesalloc.patch, * patches/openjdk/lcms2/8009654-cmsnamed_stability.patch, * patches/openjdk/lcms2/system_lcms2.patch: Add backports from OpenJDK 7 to provide LCMS 2 support. * patches/jtreg-ReadWriteProfileTest.patch: This is 6733501 above. changeset df51aa5a4270 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=df51aa5a4270 author: Andrew John Hughes date: Tue Jul 23 00:18:28 2013 +0100 Don't overwrite the hs23 ARM port with the one in-tree. 2013-07-22 Andrew John Hughes * Makefile.am: (ports): Only copy over arm_port directory contents if using the upstream HotSpot 20. (clean-ports): Likewise for cleanup. changeset 73409100db47 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=73409100db47 author: Andrew John Hughes date: Wed Jul 31 18:04:46 2013 +0100 Merge diffstat: ChangeLog | 89 + Makefile.am | 62 +- NEWS | 1 + acinclude.m4 | 17 + configure.ac | 2 + patches/ecj/jcp-importsources.patch | 10 - patches/jtreg-ReadWriteProfileTest.patch | 124 - patches/libraries.patch | 63 +- patches/openjdk/5102804-memory_leak.patch | 429 - patches/openjdk/6501644-icu_sync.patch | 8066 - patches/openjdk/6669869-queries_per_appcontext.patch | 355 - patches/openjdk/6733501-icedtea_lcms_test.patch | 133 + patches/openjdk/6886358-layout_update.patch | 13847 -- patches/openjdk/6963811-deadlock_fix.patch | 42 - patches/openjdk/7002766-parfait-jpeg.patch | 42 + patches/openjdk/7017324-kerning_crash.patch | 101 - patches/openjdk/7064279-fixup.patch | 71 - patches/openjdk/7064279-resource_release.patch | 436 - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch | 298 - patches/openjdk/lcms2/6523398-writing_tags.patch | 51207 ++++++++++ patches/openjdk/lcms2/6988213-windows_build_failure.patch | 25 + patches/openjdk/lcms2/7002766-parfait.patch | 20 + patches/openjdk/lcms2/7042594-tck_failure.patch | 375 + patches/openjdk/lcms2/7053526-lcms_2.4.patch | 10111 + patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch | 30 + patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch | 23 + patches/openjdk/lcms2/8007929-improve_curvesalloc.patch | 28 + patches/openjdk/lcms2/8009654-cmsnamed_stability.patch | 38 + patches/openjdk/lcms2/system_lcms2.patch | 93 + patches/security/20130416/6657673-factory_finder.patch | 54 - patches/security/20130416/6657673-fixup.patch | 229 - patches/security/20130416/6657673.patch | 9494 - patches/security/20130416/7200507.patch | 230 - patches/security/20130416/8000724.patch | 1368 - patches/security/20130416/8001031.patch | 5457 - patches/security/20130416/8001040.patch | 113 - patches/security/20130416/8001322.patch | 61 - patches/security/20130416/8001329.patch | 32 - patches/security/20130416/8003335.patch | 63 - patches/security/20130416/8003445.patch | 77 - patches/security/20130416/8003543.patch | 236 - patches/security/20130416/8004261.patch | 142 - patches/security/20130416/8004336.patch | 29 - patches/security/20130416/8004986.patch | 374 - patches/security/20130416/8005432.patch | 518 - patches/security/20130416/8005943.patch | 202 - patches/security/20130416/8006309.patch | 22 - patches/security/20130416/8006435.patch | 76 - patches/security/20130416/8006790.patch | 166 - patches/security/20130416/8006795.patch | 35 - patches/security/20130416/8007406.patch | 31 - patches/security/20130416/8007617.patch | 376 - patches/security/20130416/8007667.patch | 579 - patches/security/20130416/8007918.patch | 357 - patches/security/20130416/8009063.patch | 67 - patches/security/20130416/8009305.patch | 68 - patches/security/20130416/8009699.patch | 25 - patches/security/20130416/8009814.patch | 27 - patches/security/20130416/8009857.patch | 66 - 59 files changed, 62291 insertions(+), 44421 deletions(-) diffs (truncated from 107184 to 500 lines): diff -r 455071a8e0ec -r 73409100db47 ChangeLog --- a/ChangeLog Mon Jul 22 17:04:11 2013 +0100 +++ b/ChangeLog Wed Jul 31 18:04:46 2013 +0100 @@ -1,3 +1,92 @@ +2013-07-31 Andrew John Hughes + + * patches/ecj/jcp-importsources.patch, + * patches/openjdk/5102804-memory_leak.patch, + * patches/openjdk/6501644-icu_sync.patch, + * patches/openjdk/6669869-queries_per_appcontext.patch, + * patches/openjdk/6886358-layout_update.patch, + * patches/openjdk/6963811-deadlock_fix.patch, + * patches/openjdk/7017324-kerning_crash.patch, + * patches/openjdk/7064279-fixup.patch, + * patches/openjdk/7064279-resource_release.patch, + * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch, + * patches/security/20130416/6657673-factory_finder.patch, + * patches/security/20130416/6657673-fixup.patch, + * patches/security/20130416/6657673.patch, + * patches/security/20130416/7200507.patch, + * patches/security/20130416/8000724.patch, + * patches/security/20130416/8001031.patch, + * patches/security/20130416/8001040.patch, + * patches/security/20130416/8001322.patch, + * patches/security/20130416/8001329.patch, + * patches/security/20130416/8003335.patch, + * patches/security/20130416/8003445.patch, + * patches/security/20130416/8003543.patch, + * patches/security/20130416/8004261.patch, + * patches/security/20130416/8004336.patch, + * patches/security/20130416/8004986.patch, + * patches/security/20130416/8005432.patch, + * patches/security/20130416/8005943.patch, + * patches/security/20130416/8006309.patch, + * patches/security/20130416/8006435.patch, + * patches/security/20130416/8006790.patch, + * patches/security/20130416/8006795.patch, + * patches/security/20130416/8007406.patch, + * patches/security/20130416/8007617.patch, + * patches/security/20130416/8007667.patch, + * patches/security/20130416/8007918.patch, + * patches/security/20130416/8009063.patch, + * patches/security/20130416/8009305.patch, + * patches/security/20130416/8009699.patch, + * patches/security/20130416/8009814.patch, + * patches/security/20130416/8009857.patch: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + +2013-07-22 Andrew John Hughes + + * Makefile.am: + (ports): Only copy over arm_port directory + contents if using the upstream HotSpot 20. + (clean-ports): Likewise for cleanup. + +2013-07-22 Andrew John Hughes + + PR718: Backport LCMS2 support from IcedTea7 + * Makefile.am: + (LCMS_PATCHES): Populate based on which version + of LCMS is being built. + (ICEDTEA_PATCHES): Add LCMS_PATCHES. Remove + lcms.patch and patches/jtreg-ReadWriteProfileTest.patch, + the latter being 6733501 in disguise. + * NEWS: Mention PR718. + * acinclude.m4: + (IT_ENABLE_LCMS2): New macro to enable or disable + the use of LCMS 2 (enabled by default). + * configure.ac: Invoke IT_ENABLE_LCMS2. + * patches/libraries.patch: Adjust due to JPEG changes + in 7002766. + * patches/openjdk/6733501-icedtea_lcms_test.patch: + Identical to ReadWriteProfileTest.patch with addition + of upstream changeset information. + * patches/openjdk/7002766-parfait-jpeg.patch: + JPEG segment of 7002766 applied on all builds. + * patches/openjdk/lcms2/6523398-writing_tags.patch, + * patches/openjdk/lcms2/6988213-windows_build_failure.patch, + * patches/openjdk/lcms2/7002766-parfait.patch, + * patches/openjdk/lcms2/7042594-tck_failure.patch, + * patches/openjdk/lcms2/7053526-lcms_2.4.patch, + * patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch, + * patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch, + * patches/openjdk/lcms2/8007929-improve_curvesalloc.patch, + * patches/openjdk/lcms2/8009654-cmsnamed_stability.patch, + * patches/openjdk/lcms2/system_lcms2.patch: + Add backports from OpenJDK 7 to provide LCMS 2 support. + * patches/jtreg-ReadWriteProfileTest.patch: + This is 6733501 above. + 2013-07-18 Andrew John Hughes * patches/hotspot/hs23/arm-hsdis.patch: diff -r 455071a8e0ec -r 73409100db47 Makefile.am --- a/Makefile.am Mon Jul 22 17:04:11 2013 +0100 +++ b/Makefile.am Wed Jul 31 18:04:46 2013 +0100 @@ -282,42 +282,6 @@ SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130416/8009063.patch \ - patches/security/20130416/6657673.patch \ - patches/security/20130416/6657673-fixup.patch \ - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ - patches/security/20130416/6657673-factory_finder.patch \ - patches/openjdk/6669869-queries_per_appcontext.patch \ - patches/openjdk/5102804-memory_leak.patch \ - patches/openjdk/6963811-deadlock_fix.patch \ - patches/openjdk/7064279-resource_release.patch \ - patches/openjdk/7064279-fixup.patch \ - patches/security/20130416/7200507.patch \ - patches/security/20130416/8000724.patch \ - patches/security/20130416/8004986.patch \ - patches/openjdk/6501644-icu_sync.patch \ - patches/openjdk/6886358-layout_update.patch \ - patches/security/20130416/8001031.patch \ - patches/openjdk/7017324-kerning_crash.patch \ - patches/security/20130416/8001040.patch \ - patches/security/20130416/8001322.patch \ - patches/security/20130416/8001329.patch \ - patches/security/20130416/8003335.patch \ - patches/security/20130416/8003445.patch \ - patches/security/20130416/8003543.patch \ - patches/security/20130416/8004261.patch \ - patches/security/20130416/8005432.patch \ - patches/security/20130416/8005943.patch \ - patches/security/20130416/8006435.patch \ - patches/security/20130416/8006790.patch \ - patches/security/20130416/8006795.patch \ - patches/security/20130416/8007406.patch \ - patches/security/20130416/8007617.patch \ - patches/security/20130416/8007667.patch \ - patches/security/20130416/8007918.patch \ - patches/security/20130416/8009305.patch \ - patches/security/20130416/8009814.patch \ - patches/security/20130416/8009857.patch \ patches/openjdk/7195301-no_instanceof_node.patch \ patches/openjdk/6469266-xmlsec_1.4.2.patch \ patches/security/20130618/6741606-apache_santuario.patch \ @@ -405,9 +369,29 @@ SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch +if ENABLE_LCMS2 +LCMS_PATCHES = \ + patches/openjdk/lcms2/6523398-writing_tags.patch \ + patches/openjdk/lcms2/6988213-windows_build_failure.patch \ + patches/openjdk/lcms2/system_lcms2.patch \ + patches/openjdk/lcms2/7053526-lcms_2.4.patch \ + patches/openjdk/lcms2/8007929-improve_curvesalloc.patch \ + patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch \ + patches/openjdk/lcms2/8009654-cmsnamed_stability.patch \ + patches/openjdk/lcms2/7002766-parfait.patch \ + patches/openjdk/lcms2/7042594-tck_failure.patch \ + patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch +else +LCMS_PATCHES = \ + patches/lcms.patch +endif + ICEDTEA_PATCHES = \ $(DROP_PATCHES) \ $(SECURITY_PATCHES) \ + patches/openjdk/6733501-icedtea_lcms_test.patch \ + $(LCMS_PATCHES) \ + patches/openjdk/7002766-parfait-jpeg.patch \ patches/openjdk/4993545-nativeinlightfixer.patch \ patches/openjdk/6637796-set_bounds.patch \ patches/openjdk/6607660-treelock.patch \ @@ -437,7 +421,6 @@ patches/gcc-suffix.patch \ patches/libraries.patch \ $(SPECIAL_SECURITY_PATCH_2) \ - patches/lcms.patch \ patches/uname.patch \ patches/freetypeversion.patch \ patches/nomotif-6706121.patch \ @@ -532,7 +515,6 @@ patches/jtreg-FileMap.patch \ patches/jtreg-ChannelsWrite.patch \ patches/jtreg-bug7036148-test.patch \ - patches/jtreg-ReadWriteProfileTest.patch \ patches/openjdk/6818312-com.sun.awt.SecurityWarning.getSize.patch \ patches/jtreg-MappedByteBuffer-Basic.patch \ patches/openjdk/7008106-WindowOpacity.patch \ @@ -1321,21 +1303,25 @@ # Copy ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp +if !WITH_ALT_HSBUILD for target in $(abs_top_srcdir)/arm_port/hotspot/tools \ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \ cp -rv $(SRC_DIR_LINK) $$target $$link; \ chmod -R ug+rwX $$link; \ done +endif mkdir -p stamps touch stamps/ports.stamp clean-ports: +if !WITH_ALT_HSBUILD for target in $(abs_top_srcdir)/arm_port/hotspot/tools \ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \ rm -rf $$link; \ done +endif rm -f stamps/ports.stamp stamps/generated.stamp: stamps/ports.stamp diff -r 455071a8e0ec -r 73409100db47 NEWS --- a/NEWS Mon Jul 22 17:04:11 2013 +0100 +++ b/NEWS Wed Jul 31 18:04:46 2013 +0100 @@ -16,6 +16,7 @@ * New features - PR1317: Provide an option to build with a more up-to-date HotSpot - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional + - PR718: Backport LCMS2 support from IcedTea7 * Backports - S8009641: OpenJDK 6 build broken via 8007675 fix - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build diff -r 455071a8e0ec -r 73409100db47 acinclude.m4 --- a/acinclude.m4 Mon Jul 22 17:04:11 2013 +0100 +++ b/acinclude.m4 Wed Jul 31 18:04:46 2013 +0100 @@ -2054,3 +2054,20 @@ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN_ONCE([IT_ENABLE_LCMS2], +[ + AC_MSG_CHECKING([whether to enable the use of LCMS2]) + AC_ARG_ENABLE([lcms2], + [AS_HELP_STRING(--enable-lcms2,use LCMS 2 backport from OpenJDK 7 [[default=yes]])], + [ + ENABLE_LCMS2="${enableval}" + ], + [ + ENABLE_LCMS2=yes + ]) + + AC_MSG_RESULT(${ENABLE_LCMS2}) + AM_CONDITIONAL(ENABLE_LCMS2, test x"${ENABLE_LCMS2}" = "xyes") + AC_SUBST(ENABLE_LCMS2) +]) diff -r 455071a8e0ec -r 73409100db47 configure.ac --- a/configure.ac Mon Jul 22 17:04:11 2013 +0100 +++ b/configure.ac Wed Jul 31 18:04:46 2013 +0100 @@ -289,6 +289,8 @@ IT_WITH_PAX AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm]) +IT_ENABLE_LCMS2 + dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] ,[AC_MSG_ERROR("CUPS headers were not found - diff -r 455071a8e0ec -r 73409100db47 patches/ecj/jcp-importsources.patch --- a/patches/ecj/jcp-importsources.patch Mon Jul 22 17:04:11 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- openjdk-ecj/jdk/make/org/jcp/Makefile.orig 2013-07-10 10:02:13.715336690 +0100 -+++ openjdk-ecj/jdk/make/org/jcp/Makefile 2013-07-10 10:02:55.359996584 +0100 -@@ -31,6 +31,7 @@ - PACKAGE = org.jcp - PRODUCT = jcp - include $(BUILDDIR)/common/Defs.gmk -+SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java) - - # - # Files to compile diff -r 455071a8e0ec -r 73409100db47 patches/jtreg-ReadWriteProfileTest.patch --- a/patches/jtreg-ReadWriteProfileTest.patch Mon Jul 22 17:04:11 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -diff -r 9318628e8eee -r 467e4f25965c test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java Fri Mar 20 20:05:22 2009 +0300 -@@ -0,0 +1,120 @@ -+/* -+ * Copyright 2007-2008 Sun Microsystems, Inc. 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. -+ * -+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/** -+ * @test -+ * @bug 6476665 6523403 6733501 -+ * @summary Verifies reading and writing profiles and tags of the standard color -+ * spaces -+ * @run main ReadWriteProfileTest -+ */ -+import java.awt.color.ColorSpace; -+import java.awt.color.ICC_Profile; -+import java.util.*; -+import java.nio.*; -+import java.util.Hashtable; -+ -+public class ReadWriteProfileTest implements Runnable { -+ /* Location of the tag sig counter in 4-byte words */ -+ final static int TAG_COUNT_OFFSET = 32; -+ -+ /* Location of the tag sig table in 4-byte words */ -+ final static int TAG_ELEM_OFFSET = 33; -+ -+ static byte[][] profiles; -+ static int [][] tagSigs; -+ static Hashtable [] tags; -+ -+ static int [] cspaces = {ColorSpace.CS_sRGB, ColorSpace.CS_PYCC, -+ ColorSpace.CS_LINEAR_RGB, ColorSpace.CS_CIEXYZ, -+ ColorSpace.CS_GRAY}; -+ -+ static String [] csNames = {"sRGB", "PYCC", "LINEAR_RGB", "CIEXYZ", "GRAY"}; -+ -+ static void getProfileTags(byte [] data, Hashtable tags) { -+ ByteBuffer byteBuf = ByteBuffer.wrap(data); -+ IntBuffer intBuf = byteBuf.asIntBuffer(); -+ int tagCount = intBuf.get(TAG_COUNT_OFFSET); -+ intBuf.position(TAG_ELEM_OFFSET); -+ for (int i = 0; i < tagCount; i++) { -+ int tagSig = intBuf.get(); -+ int tagDataOff = intBuf.get(); -+ int tagSize = intBuf.get(); -+ -+ byte [] tagData = new byte[tagSize]; -+ byteBuf.position(tagDataOff); -+ byteBuf.get(tagData); -+ tags.put(tagSig, tagData); -+ } -+ } -+ -+ static { -+ profiles = new byte[cspaces.length][]; -+ tags = new Hashtable[cspaces.length]; -+ -+ for (int i = 0; i < cspaces.length; i++) { -+ ICC_Profile pf = ICC_Profile.getInstance(cspaces[i]); -+ profiles[i] = pf.getData(); -+ tags[i] = new Hashtable(); -+ getProfileTags(profiles[i], tags[i]); -+ } -+ } -+ -+ public void run() { -+ for (int i = 0; i < cspaces.length; i++) { -+ ICC_Profile pf = ICC_Profile.getInstance(cspaces[i]); -+ byte [] data = pf.getData(); -+ pf = ICC_Profile.getInstance(data); -+ if (!Arrays.equals(data, profiles[i])) { -+ System.err.println("Incorrect result of getData() " + "with " + -+ csNames[i] + " profile"); -+ throw new RuntimeException("Incorrect result of getData()"); -+ } -+ -+ for (int tagSig : tags[i].keySet()) { -+ byte [] tagData = pf.getData(tagSig); -+ byte [] empty = new byte[tagData.length]; -+ pf.setData(tagSig, empty); -+ pf.setData(tagSig, tagData); -+ -+ byte [] tagData1 = pf.getData(tagSig); -+ -+ if (!Arrays.equals(tagData1, tags[i].get(tagSig))) -+ { -+ System.err.println("Incorrect result of getData(int) with" + -+ " tag " + -+ Integer.toHexString(tagSig) + -+ " of " + csNames[i] + " profile"); -+ -+ throw new RuntimeException("Incorrect result of " + -+ "getData(int)"); -+ } -+ } -+ } -+ } -+ -+ public static void main(String [] args) { -+ ReadWriteProfileTest test = new ReadWriteProfileTest(); -+ test.run(); -+ } -+} diff -r 455071a8e0ec -r 73409100db47 patches/libraries.patch --- a/patches/libraries.patch Mon Jul 22 17:04:11 2013 +0100 +++ b/patches/libraries.patch Wed Jul 31 18:04:46 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-04-23 19:45:24.512100652 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-07-22 19:51:20.762208023 +0100 @@ -64,23 +64,21 @@ ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME) @@ -55,7 +55,7 @@ endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk --- openjdk.orig/jdk/make/common/Program.gmk 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/common/Program.gmk 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/common/Program.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -85,7 +85,7 @@ endif endif @@ -75,7 +75,7 @@ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile --- openjdk.orig/jdk/make/java/jli/Makefile 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/java/jli/Makefile 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/java/jli/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -44,8 +44,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -127,7 +127,7 @@ diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk --- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -30,15 +30,4 @@ Inflater.c \ ZipFile.c \ @@ -146,7 +146,7 @@ zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile --- openjdk.orig/jdk/make/java/zip/Makefile 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2013-04-23 19:45:24.528100909 +0100 ++++ openjdk/jdk/make/java/zip/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -30,8 +30,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -176,7 +176,7 @@ +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -25,51 +25,7 @@ FILES_c = \ @@ -232,7 +232,7 @@ FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -68,6 +68,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -244,7 +244,7 @@ # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk --- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2012-10-26 19:25:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 @@ -30,81 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -330,7 +330,7 @@ diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2012-10-26 19:25:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-04-23 19:45:24.532100974 +0100 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-07-22 19:51:20.774208212 +0100 @@ -59,12 +59,12 @@ # C Flags # @@ -362,8 +362,8 @@ ifeq ($(PLATFORM), linux) ifeq ($(ARCH_DATA_MODEL), 64) diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-04-23 18:50:35.139719857 +0100 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-04-23 19:46:32.885201759 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:49:54.900852754 +0100 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:51:20.774208212 +0100 @@ -89,11 +89,7 @@ // bytes and byte arrays @@ -378,7 +378,7 @@ typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c From m at mklein.co.at Mon Jul 22 10:31:57 2013 From: m at mklein.co.at (Markus Klein) Date: Mon, 22 Jul 2013 19:31:57 +0200 Subject: Running/Testing Cross Compiled OpenJDK Message-ID: <51ED6C8D.7080102@mklein.co.at> Hello, I?ve successfully compiled OpenJDK using the http://icedtea.classpath.org/wiki/CrossCompileOECoreTutorial, but I completely fail by testing/running it. I want to run it with qemu-arm. Can anyone give me a tutorial how to run it using qemu-arm? Best regards,