/hg/release/icedtea7-forest-2.2/jdk: 82 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Wed May 2 13:56:12 PDT 2012
changeset 09f612bac047 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=09f612bac047
author: katleman
date: Thu Feb 23 15:14:37 2012 -0800
Added tag jdk7u4-b13 for changeset c929e96aa059
changeset 00f0f18379ec in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=00f0f18379ec
author: katleman
date: Thu Mar 01 13:45:02 2012 -0800
Added tag jdk7u4-b14 for changeset 09f612bac047
changeset 585c02351350 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=585c02351350
author: katleman
date: Thu Mar 08 11:19:41 2012 -0800
Added tag jdk7u4-b15 for changeset 00f0f18379ec
changeset 05e342dd44de in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=05e342dd44de
author: anthony
date: Tue Feb 28 16:39:46 2012 +0400
7132692: [macosx] Class com.apple.eawt not functioning
Summary: Postpone setting an application delegate until an app is fully initialized
Reviewed-by: art
changeset 50a6f9870b3e in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=50a6f9870b3e
author: dsamersoff
date: Wed Feb 29 16:19:10 2012 +0400
7110104: It should be possible to stop and start JMX Agent at runtime
Summary: Added a capability to start and stop JMX Agent by jcmd
Reviewed-by: acorn, mchung
changeset 4ab378286f66 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4ab378286f66
author: rupashka
date: Mon Mar 05 15:27:15 2012 +0200
7107099: JScrollBar does not show up even if there are enough lebgth of textstring in textField
Reviewed-by: alexp, art
changeset 2b9fbd5a6ec0 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2b9fbd5a6ec0
author: anthony
date: Mon Mar 05 18:58:51 2012 +0400
7150516: [macosx] appletviewer shouldn't link against libX11 on the Mac
Summary: Don't link against libX11 on the Mac
Reviewed-by: swingler
changeset 9bc378ddbc27 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=9bc378ddbc27
author: alexp
date: Mon Mar 05 23:41:10 2012 +0400
7132793: [macosx] setWheelScrollEnabled action reversed
Reviewed-by: serb, art
changeset fd9fe385f63c in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=fd9fe385f63c
author: alexp
date: Mon Mar 05 23:51:33 2012 +0400
7146131: [macosx] When click the show optionpane button,it display partly of dialog and hung until timeout
Reviewed-by: anthony
changeset 4bf554db8ed9 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4bf554db8ed9
author: alexp
date: Mon Mar 05 23:59:58 2012 +0400
7147078: [macosx] Echo char set in TextField doesn't prevent word jumping
Reviewed-by: art
changeset 5a50422d53d8 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=5a50422d53d8
author: dcherepanov
date: Tue Mar 06 15:14:33 2012 +0400
7147066: [macosx] FileDialog.getDirectory() returns incorrect directory
Reviewed-by: anthony, swingler
changeset d87f0d9134a9 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=d87f0d9134a9
author: kizune
date: Tue Mar 06 19:41:39 2012 +0300
7124262: [macosx] Drag events go to a wrong child.
Reviewed-by: alexp, serb
changeset 588ca1d04a7f in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=588ca1d04a7f
author: bagiras
date: Tue Mar 06 22:12:19 2012 +0400
7145980: Dispose method of window.java takes long
Reviewed-by: anthony
changeset 3ddf17681087 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3ddf17681087
author: alexsch
date: Wed Mar 07 15:50:02 2012 +0300
7148281: [macosx] JTabbedPane tabs with HTML text do not render correctly
Reviewed-by: kizune
changeset e84d607e9b13 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e84d607e9b13
author: mullan
date: Wed Mar 07 09:16:20 2012 -0500
7146431: java.security files out-of-sync
Reviewed-by: vinnie, xuelei, wetmore
changeset ffdd6fa55445 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ffdd6fa55445
author: mullan
date: Wed Mar 07 09:18:46 2012 -0500
Merge
changeset ef3503a5a3b9 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ef3503a5a3b9
author: lana
date: Wed Mar 07 17:23:03 2012 -0800
Merge
changeset 67e66dee832b in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=67e66dee832b
author: lana
date: Mon Mar 12 14:55:53 2012 -0700
Merge
changeset ced385dce903 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ced385dce903
author: mfang
date: Mon Mar 12 15:48:03 2012 -0700
7146099: NLS: [de,es,it,ko,pt_BR]launcher_**.properties, double backslash issue.
Reviewed-by: psun
changeset df20c60949f8 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=df20c60949f8
author: mfang
date: Mon Mar 12 16:42:36 2012 -0700
Merge
changeset b4401b362fd8 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b4401b362fd8
author: katleman
date: Fri Mar 16 07:29:53 2012 -0700
Added tag jdk7u4-b16 for changeset df20c60949f8
changeset 0dc35287a84e in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0dc35287a84e
author: katleman
date: Thu Mar 22 14:11:17 2012 -0700
Added tag jdk7u4-b17 for changeset b4401b362fd8
changeset ecbd4c9fc9c1 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ecbd4c9fc9c1
author: bae
date: Sun Mar 11 10:51:45 2012 +0400
7124219: [macosx] Unable to draw images to fullscreen
Reviewed-by: serb
changeset a2fe76236162 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a2fe76236162
author: lana
date: Mon Mar 12 16:02:37 2012 -0700
Merge
changeset 93eda4253911 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=93eda4253911
author: anthony
date: Wed Mar 14 07:03:51 2012 +0400
7148275: [macosx] setIconImages() not working correctly (distorted icon when minimized)
Summary: Choose the largest icon from a list of icons provided by user
Reviewed-by: swingler
changeset 4c592e287e7d in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4c592e287e7d
author: serb
date: Wed Mar 14 12:27:00 2012 +0400
7124523: [macosx] b216: Mising part of applet UI
Reviewed-by: anthony
changeset c1a0898b5fc3 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=c1a0898b5fc3
author: serb
date: Wed Mar 14 12:29:32 2012 +0400
7124537: [macosx] Menu shortcuts for all menu items should be disabled if a menu itself is disabled
Reviewed-by: anthony
changeset 91ede930328c in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=91ede930328c
author: serb
date: Wed Mar 14 12:31:25 2012 +0400
7149913: [macosx] Deadlock in LWTextComponentPeer
Reviewed-by: alexp
changeset e00e98bc0c0e in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e00e98bc0c0e
author: ant
date: Wed Mar 14 16:49:50 2012 +0300
7125044: [macosx] Test failure because Component.transferFocus() works differently in applet and application
Reviewed-by: art
changeset 54b91467ed95 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=54b91467ed95
author: leonidr
date: Thu Mar 15 20:55:45 2012 +0400
7124321: [macosx] TrayIcon MouseListener is never triggered
Reviewed-by: anthony
changeset 55126bbf3cc9 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=55126bbf3cc9
author: bae
date: Fri Mar 16 11:39:31 2012 +0400
7152608: [macosx] Crash in liblwawt.dylib in AccelGlyphCache_RemoveCellInfo
Reviewed-by: kizune
changeset df49f9ddd89f in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=df49f9ddd89f
author: ant
date: Fri Mar 16 13:58:43 2012 +0300
7145827: [macosx] JCK failure in b11: FocusableWindow3
Reviewed-by: art
changeset e1074508e049 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e1074508e049
author: mrkam
date: Fri Mar 02 12:24:35 2012 +0200
7130241: [macosx] TransparentRuler demo can not run due to lacking of perpixel transparency support
Reviewed-by: art
changeset 8ce5bf8bfc5b in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8ce5bf8bfc5b
author: bpatel
date: Fri Mar 16 15:20:53 2012 -0700
7153977: Generate English man pages for JDK 7u4
Reviewed-by: skannan
changeset 3470e0ad6cc0 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3470e0ad6cc0
author: kizune
date: Wed Mar 21 17:14:41 2012 +0400
7144063: [macosx] Swing JMenu mnemonic doesn't work; hint misleading; cross symbol typed
Reviewed-by: leonidr, skovatch, swingler
changeset 875951474ebd in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=875951474ebd
author: alexp
date: Wed Mar 21 19:26:48 2012 +0400
7149005: [macosx] Orphaned Choice popup window
Reviewed-by: ant
changeset 28cf821cd6a1 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=28cf821cd6a1
author: anthony
date: Wed Mar 21 20:10:14 2012 +0400
7154177: [macosx] An invisible owner frame becomes visible upon clicking a child window
Summary: Only visible frames must participate in the parent-child relationship on the native level
Reviewed-by: serb
changeset 0b7acd016f8c in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0b7acd016f8c
author: anthony
date: Wed Mar 21 20:17:07 2012 +0400
7124428: [macosx] Frame.setExtendedState() doesn't work for undecorated windows
Summary: Emulate -zoom request for undecorated windows
Reviewed-by: swingler
changeset fdd008c3ef5a in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=fdd008c3ef5a
author: anthony
date: Wed Mar 21 20:22:03 2012 +0400
7149085: [macosx] Quit with QuitStrategy CLOSE_ALL_WINDOWS does terminate application
Summary: Don't terminate the event loop. System.exit() will take care of it.
Reviewed-by: art, kizune
changeset ec390d13b0b3 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ec390d13b0b3
author: ant
date: Wed Mar 21 20:31:28 2012 +0300
7145768: [macosx] Regression: failure in b11 of ModalDialogInFocusEventTest
Reviewed-by: art
changeset 6572dc1873ab in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=6572dc1873ab
author: leonidr
date: Wed Mar 21 20:46:36 2012 +0400
7124286: [macosx] Option modifier should work like AltGr as in Apple jdk 6
Summary: Refactored printable character check out of the performAction method
Reviewed-by: swingler, alexp
changeset 9b195bfce3eb in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=9b195bfce3eb
author: alexp
date: Wed Mar 21 22:02:01 2012 +0400
7152952: [macosx] List rows overlap with enlarged font
Reviewed-by: serb
changeset 25285b7883d4 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=25285b7883d4
author: dcherepanov
date: Thu Mar 22 01:03:42 2012 +0400
7154516: [macosx] Popup menus have no visible borders
Reviewed-by: serb
changeset af118cc1bef7 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=af118cc1bef7
author: ant
date: Thu Mar 22 02:44:01 2012 +0300
7154072: [macosx] swallowing key events
Reviewed-by: anthony
changeset 214f68c9b1a9 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=214f68c9b1a9
author: alexp
date: Thu Mar 22 02:52:20 2012 +0300
7149005: [macosx] Java Control Panel's UI controls are distorted when draging scroll bar.
Reviewed-by: anthony, dcherepanov
changeset 58b19dcdb7fc in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=58b19dcdb7fc
author: bpatel
date: Wed Mar 21 15:34:06 2012 -0700
7155419: Remove reference to JRockit and commercial features from java man page
Reviewed-by: wetmore, ksrini
changeset aef6d319f066 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=aef6d319f066
author: bpatel
date: Wed Mar 21 15:56:41 2012 -0700
Merge
changeset 413f9c1e20c9 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=413f9c1e20c9
author: lana
date: Wed Mar 21 17:33:35 2012 -0700
Merge
changeset 084825fc677e in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=084825fc677e
author: lana
date: Sun Mar 25 22:10:29 2012 -0700
Merge
changeset d37f475a6aa0 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=d37f475a6aa0
author: cl
date: Thu Mar 29 15:42:39 2012 -0700
Added tag jdk7u4-b18 for changeset 084825fc677e
changeset eb5638c97409 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=eb5638c97409
author: fparain
date: Wed Mar 28 01:43:22 2012 -0700
7156831: The jcmd man page is not included in generated bundles
Reviewed-by: dholmes, sla, dsamersoff
changeset d55642417017 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=d55642417017
author: kizune
date: Wed Mar 28 16:36:03 2012 +0400
7153735: [macosx] Text with diacritics is pasted with broken encoding
Reviewed-by: bae, art
changeset 5c703dacb076 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=5c703dacb076
author: bae
date: Wed Mar 28 17:04:01 2012 +0400
7154047: [macosx] When we choose print one page in the print dialog,it still prints all the pages.
Reviewed-by: anthony
changeset e5dacb9278b5 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e5dacb9278b5
author: nloodin
date: Fri Mar 23 11:02:11 2012 +0100
7156000: Change makefile to reflect refactored classes
Reviewed-by: dholmes, sla
changeset e80c166c37b0 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e80c166c37b0
author: nloodin
date: Wed Mar 28 09:09:52 2012 -0400
Merge
changeset 8a3c4f03855b in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8a3c4f03855b
author: nloodin
date: Wed Mar 28 09:12:00 2012 -0400
Merge
changeset 1dff65eca846 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=1dff65eca846
author: leonidr
date: Wed Mar 28 19:04:15 2012 +0400
7150089: [macosx] Default for a custom cursor created from non-existent image is not transparent
Reviewed-by: swingler
changeset 2e90db16f9af in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2e90db16f9af
author: leonidr
date: Wed Mar 28 19:08:32 2012 +0400
7154480: [macosx] Not all popup menu items are visible
Reviewed-by: swingler, anthony
changeset ad6710b8b7c1 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ad6710b8b7c1
author: lana
date: Wed Mar 28 13:04:22 2012 -0700
Merge
changeset 043ff369ad32 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=043ff369ad32
author: lana
date: Mon Apr 02 14:57:51 2012 -0700
Merge
changeset 0ca36a938b14 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0ca36a938b14
author: mfang
date: Mon Apr 02 10:08:53 2012 -0700
7090832: Some locale info are not localized for some languages.
Reviewed-by: psun, naoto
changeset 3da1e601ecf3 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3da1e601ecf3
author: mfang
date: Mon Apr 02 11:55:10 2012 -0700
Merge
changeset 94ba195ce8a1 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=94ba195ce8a1
author: mfang
date: Mon Apr 02 10:15:54 2012 -0700
7154770: NLS: 7u4 man page update
Reviewed-by: yhuang
changeset 3dd51e801d02 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3dd51e801d02
author: mfang
date: Mon Apr 02 14:15:38 2012 -0700
Merge
changeset df5bcdff3def in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=df5bcdff3def
author: mfang
date: Mon Apr 02 16:08:09 2012 -0700
Merge
changeset 0f9aacb27534 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0f9aacb27534
author: mbankal
date: Thu Mar 15 11:11:04 2012 -0700
7129872: test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failing on non-Solaris platforms on 7u4
Reviewed-by: weijun
changeset 8cc3139f5e61 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8cc3139f5e61
author: katleman
date: Thu Apr 05 15:10:53 2012 -0700
Added tag jdk7u4-b19 for changeset 0f9aacb27534
changeset 54524889bf8b in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=54524889bf8b
author: wetmore
date: Mon Apr 02 11:29:36 2012 -0700
7142172: Custom TrustManagers that return null for getAcceptedIssuers will NPE
Reviewed-by: xuelei
changeset 065fdd98fe75 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=065fdd98fe75
author: peytoia
date: Tue Apr 03 18:21:28 2012 +0900
7158483: (tz) Support tzdata2012c
Reviewed-by: okutsu
changeset 413dbfa67967 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=413dbfa67967
author: lana
date: Tue Apr 03 10:11:41 2012 -0700
Merge
changeset ea266cd69e40 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ea266cd69e40
author: lana
date: Tue Apr 03 17:14:02 2012 -0700
Merge
changeset 68961e0a6ea4 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=68961e0a6ea4
author: jmelvin
date: Wed Apr 04 12:45:03 2012 -0400
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
Summary: On Mac OS X, align system property "os.arch" with Apple legacy JDKs. Also, improve os.name string matching by using .contains() method instead of .startsWith(). This fix spans multiple repositories.
Reviewed-by: dcubed, phh, ohair, katleman
changeset 6bc860cd5ccf in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=6bc860cd5ccf
author: michaelm
date: Wed Apr 04 23:15:58 2012 +0100
7134701: [macosx] Support legacy native library names
Reviewed-by: alanb, skovatch, jmelvin
changeset 40084a75a36f in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=40084a75a36f
author: bae
date: Sat Apr 07 12:46:32 2012 +0400
7154505: [macosx] NetBeans sometimes starts with no text rendered
Reviewed-by: prr, kizune
changeset 24a9125a2c96 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=24a9125a2c96
author: anthony
date: Mon Apr 09 16:21:33 2012 +0400
7159266: [macosx] ApplicationDelegate should not be set in the headless mode
Summary: Don't install an application delegate in headless mode
Reviewed-by: swingler, snorthov, skovatch
changeset 1a495432b42a in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=1a495432b42a
author: lana
date: Mon Apr 09 08:59:28 2012 -0700
Merge
changeset 81a0f71a895e in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=81a0f71a895e
author: katleman
date: Thu Apr 12 14:16:00 2012 -0700
Added tag jdk7u4-b20 for changeset 1a495432b42a
changeset fdcaddec3b9d in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=fdcaddec3b9d
author: katleman
date: Mon Apr 16 15:03:55 2012 -0700
Added tag jdk7u4-b30 for changeset 81a0f71a895e
changeset 71f3de57c188 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=71f3de57c188
author: skovatch
date: Thu Apr 19 18:44:25 2012 -0700
7162440: Fix typo in BUNDLE_ID variable so it can be overridden
Reviewed-by: lana
changeset 0573d282ca24 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0573d282ca24
author: lana
date: Thu Apr 19 18:53:28 2012 -0700
Merge
changeset 42ca70fcb2ce in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=42ca70fcb2ce
author: katleman
date: Fri Apr 20 11:09:37 2012 -0700
Added tag jdk7u4-b21 for changeset 0573d282ca24
changeset a0d124b90763 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a0d124b90763
author: Deepak Bhole <dbhole at redhat.com>
date: Wed May 02 13:15:49 2012 -0400
Merge
diffstat:
.hgtags | 16 +
jdk/test/sun/management/jmxremote/bootstrap/LocalOnlyTest.java | 97 +
make/com/sun/java/pack/Makefile | 22 +-
make/common/Defs-linux.gmk | 28 +-
make/common/Defs-macosx.gmk | 17 +-
make/common/Defs-solaris.gmk | 5 +
make/common/Defs-windows.gmk | 5 +
make/common/Program.gmk | 10 +-
make/common/Release-macosx.gmk | 4 +-
make/common/Release.gmk | 27 +-
make/common/shared/Compiler-gcc.gmk | 78 +-
make/common/shared/Defs-java.gmk | 20 +-
make/common/shared/Defs-versions.gmk | 2 +-
make/common/shared/Defs.gmk | 2 +-
make/common/shared/Platform.gmk | 13 +-
make/common/shared/Sanity.gmk | 8 +
make/java/awt/Makefile | 2 +-
make/java/java/FILES_java.gmk | 1 +
make/java/jli/Makefile | 38 +-
make/java/net/FILES_c.gmk | 7 +
make/java/net/Makefile | 26 +-
make/java/nio/Makefile | 218 +-
make/java/version/Makefile | 5 +
make/java/zip/FILES_c.gmk | 2 +-
make/java/zip/Makefile | 6 +-
make/javax/crypto/Makefile | 3 +-
make/javax/sound/SoundDefs.gmk | 48 +
make/javax/sound/jsoundalsa/Makefile | 2 +-
make/jdk_generic_profile.sh | 81 +-
make/launchers/Makefile.launcher | 6 +-
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/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/africa | 36 +-
make/sun/javazic/tzdata/antarctica | 21 +-
make/sun/javazic/tzdata/asia | 72 +-
make/sun/javazic/tzdata/australasia | 44 +-
make/sun/javazic/tzdata/backward | 2 +-
make/sun/javazic/tzdata/europe | 83 +-
make/sun/javazic/tzdata/leapseconds | 42 +-
make/sun/javazic/tzdata/northamerica | 153 +-
make/sun/javazic/tzdata/southamerica | 72 +-
make/sun/javazic/tzdata/zone.tab | 5 +-
make/sun/jpeg/FILES_c.gmk | 6 +-
make/sun/jpeg/Makefile | 11 +-
make/sun/net/FILES_java.gmk | 1 +
make/sun/splashscreen/FILES_c.gmk | 78 +-
make/sun/splashscreen/Makefile | 42 +-
make/sun/xawt/FILES_c_unix.gmk | 20 +
make/sun/xawt/Makefile | 62 +-
make/tools/Makefile | 2 +
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/linux/doc/man/appletviewer.1 | 7 +-
src/linux/doc/man/apt.1 | 4 +-
src/linux/doc/man/extcheck.1 | 2 +-
src/linux/doc/man/idlj.1 | 10 +-
src/linux/doc/man/ja/appletviewer.1 | 23 +-
src/linux/doc/man/ja/apt.1 | 62 +-
src/linux/doc/man/ja/extcheck.1 | 18 +-
src/linux/doc/man/ja/idlj.1 | 160 +-
src/linux/doc/man/ja/jar.1 | 182 +-
src/linux/doc/man/ja/jarsigner.1 | 677 +-
src/linux/doc/man/ja/java.1 | 465 +-
src/linux/doc/man/ja/javac.1 | 448 +-
src/linux/doc/man/ja/javadoc.1 | 1869 ++++-----
src/linux/doc/man/ja/javah.1 | 43 +-
src/linux/doc/man/ja/javap.1 | 48 +-
src/linux/doc/man/ja/javaws.1 | 62 +-
src/linux/doc/man/ja/jcmd.1 | 124 +
src/linux/doc/man/ja/jconsole.1 | 47 +-
src/linux/doc/man/ja/jdb.1 | 146 +-
src/linux/doc/man/ja/jhat.1 | 42 +-
src/linux/doc/man/ja/jinfo.1 | 34 +-
src/linux/doc/man/ja/jmap.1 | 40 +-
src/linux/doc/man/ja/jps.1 | 72 +-
src/linux/doc/man/ja/jrunscript.1 | 50 +-
src/linux/doc/man/ja/jsadebugd.1 | 41 +-
src/linux/doc/man/ja/jstack.1 | 34 +-
src/linux/doc/man/ja/jstat.1 | 638 +-
src/linux/doc/man/ja/jstatd.1 | 81 +-
src/linux/doc/man/ja/jvisualvm.1 | 30 +-
src/linux/doc/man/ja/keytool.1 | 590 +-
src/linux/doc/man/ja/native2ascii.1 | 20 +-
src/linux/doc/man/ja/orbd.1 | 120 +-
src/linux/doc/man/ja/pack200.1 | 104 +-
src/linux/doc/man/ja/policytool.1 | 105 +-
src/linux/doc/man/ja/rmic.1 | 98 +-
src/linux/doc/man/ja/rmid.1 | 106 +-
src/linux/doc/man/ja/rmiregistry.1 | 24 +-
src/linux/doc/man/ja/schemagen.1 | 52 +-
src/linux/doc/man/ja/serialver.1 | 26 +-
src/linux/doc/man/ja/servertool.1 | 44 +-
src/linux/doc/man/ja/tnameserv.1 | 147 +-
src/linux/doc/man/ja/unpack200.1 | 52 +-
src/linux/doc/man/ja/wsgen.1 | 40 +-
src/linux/doc/man/ja/wsimport.1 | 60 +-
src/linux/doc/man/ja/xjc.1 | 111 +-
src/linux/doc/man/jar.1 | 18 +-
src/linux/doc/man/jarsigner.1 | 18 +-
src/linux/doc/man/java.1 | 198 +-
src/linux/doc/man/javac.1 | 34 +-
src/linux/doc/man/javadoc.1 | 64 +-
src/linux/doc/man/javah.1 | 2 +-
src/linux/doc/man/javap.1 | 2 +-
src/linux/doc/man/javaws.1 | 6 +-
src/linux/doc/man/jcmd.1 | 104 +-
src/linux/doc/man/jconsole.1 | 14 +-
src/linux/doc/man/jdb.1 | 8 +-
src/linux/doc/man/jhat.1 | 4 +-
src/linux/doc/man/jinfo.1 | 2 +-
src/linux/doc/man/jmap.1 | 2 +-
src/linux/doc/man/jps.1 | 2 +-
src/linux/doc/man/jrunscript.1 | 4 +-
src/linux/doc/man/jsadebugd.1 | 6 +-
src/linux/doc/man/jstack.1 | 4 +-
src/linux/doc/man/jstat.1 | 28 +-
src/linux/doc/man/jstatd.1 | 6 +-
src/linux/doc/man/jvisualvm.1 | 4 +-
src/linux/doc/man/keytool.1 | 20 +-
src/linux/doc/man/native2ascii.1 | 4 +-
src/linux/doc/man/orbd.1 | 16 +-
src/linux/doc/man/pack200.1 | 6 +-
src/linux/doc/man/policytool.1 | 63 +-
src/linux/doc/man/rmic.1 | 6 +-
src/linux/doc/man/rmid.1 | 8 +-
src/linux/doc/man/rmiregistry.1 | 6 +-
src/linux/doc/man/schemagen.1 | 4 +-
src/linux/doc/man/serialver.1 | 4 +-
src/linux/doc/man/servertool.1 | 2 +-
src/linux/doc/man/tnameserv.1 | 16 +-
src/linux/doc/man/unpack200.1 | 6 +-
src/linux/doc/man/wsgen.1 | 4 +-
src/linux/doc/man/wsimport.1 | 6 +-
src/linux/doc/man/xjc.1 | 4 +-
src/macosx/bin/x86_64/jvm.cfg | 39 +
src/macosx/classes/com/apple/eawt/_AppEventHandler.java | 5 +-
src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java | 8 +-
src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java | 2 +-
src/macosx/classes/com/apple/laf/AquaKeyBindings.java | 15 +
src/macosx/classes/com/apple/laf/AquaLookAndFeel.java | 5 +-
src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java | 2 +-
src/macosx/classes/java/lang/ClassLoaderHelper.java | 47 +
src/macosx/classes/sun/font/CStrike.java | 10 +-
src/macosx/classes/sun/font/CStrikeDisposer.java | 2 +
src/macosx/classes/sun/lwawt/LWChoicePeer.java | 33 +-
src/macosx/classes/sun/lwawt/LWComponentPeer.java | 108 +-
src/macosx/classes/sun/lwawt/LWListPeer.java | 9 +
src/macosx/classes/sun/lwawt/LWScrollPanePeer.java | 16 +
src/macosx/classes/sun/lwawt/LWTextFieldPeer.java | 23 +-
src/macosx/classes/sun/lwawt/LWWindowPeer.java | 77 +-
src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java | 66 +-
src/macosx/classes/sun/lwawt/macosx/CMenu.java | 16 +
src/macosx/classes/sun/lwawt/macosx/CMenuItem.java | 17 +-
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 128 +-
src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java | 12 +
src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java | 86 +-
src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 23 +-
src/macosx/lib/content-types.properties | 276 +
src/macosx/lib/flavormap.properties | 78 +
src/macosx/native/sun/awt/AWTView.m | 11 +-
src/macosx/native/sun/awt/CDropTarget.m | 4 +
src/macosx/native/sun/awt/CFileDialog.m | 23 +-
src/macosx/native/sun/awt/CTrayIcon.h | 2 +
src/macosx/native/sun/awt/CTrayIcon.m | 118 +-
src/macosx/native/sun/awt/OSVersion.m | 42 +-
src/macosx/native/sun/awt/awt.m | 18 +-
src/macosx/native/sun/font/AWTStrike.m | 18 +
src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m | 5 +-
src/share/bin/java.c | 8 +-
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/GTKStyle.java | 5 +-
src/share/classes/com/sun/java/util/jar/pack/Attribute.java | 14 +-
src/share/classes/com/sun/java/util/jar/pack/BandStructure.java | 6 +-
src/share/classes/com/sun/java/util/jar/pack/ClassReader.java | 12 +-
src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java | 8 +-
src/share/classes/com/sun/java/util/jar/pack/Code.java | 4 +-
src/share/classes/com/sun/java/util/jar/pack/Coding.java | 7 +-
src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java | 34 +-
src/share/classes/com/sun/java/util/jar/pack/Constants.java | 12 +-
src/share/classes/com/sun/java/util/jar/pack/Fixups.java | 41 +-
src/share/classes/com/sun/java/util/jar/pack/Instruction.java | 4 +-
src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java | 2 +-
src/share/classes/com/sun/java/util/jar/pack/Package.java | 58 +-
src/share/classes/com/sun/java/util/jar/pack/PackageReader.java | 29 +-
src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java | 38 +-
src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java | 11 +-
src/share/classes/com/sun/java/util/jar/pack/PropMap.java | 61 +-
src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java | 4 +-
src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java | 3 +-
src/share/classes/com/sun/java/util/jar/pack/Utils.java | 4 +-
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/script/javascript/RhinoScriptEngine.java | 6 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +-
src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 3 +-
src/share/classes/java/awt/Component.java | 5 +-
src/share/classes/java/awt/Dialog.java | 4 +-
src/share/classes/java/awt/Frame.java | 2 +-
src/share/classes/java/awt/Window.java | 70 +-
src/share/classes/java/awt/color/ICC_Profile.java | 4 +-
src/share/classes/java/io/InputStream.java | 2 +-
src/share/classes/java/lang/ClassLoader.java | 11 +
src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | 4 +-
src/share/classes/java/net/SocksSocketImpl.java | 4 +-
src/share/classes/java/nio/Bits.java | 4 +-
src/share/classes/java/security/Policy.java | 1 -
src/share/classes/java/util/prefs/Preferences.java | 4 +-
src/share/classes/javax/crypto/Cipher.java | 172 +-
src/share/classes/javax/crypto/JarVerifier.java | 157 -
src/share/classes/javax/crypto/JceSecurity.java | 251 +-
src/share/classes/javax/crypto/JceSecurityManager.java | 252 -
src/share/classes/javax/script/ScriptEngineManager.java | 6 +-
src/share/classes/javax/swing/JApplet.java | 2 +-
src/share/classes/javax/swing/JComponent.java | 13 +-
src/share/classes/javax/swing/JDialog.java | 5 +-
src/share/classes/javax/swing/JEditorPane.java | 11 +-
src/share/classes/javax/swing/JFrame.java | 12 +-
src/share/classes/javax/swing/JInternalFrame.java | 8 +-
src/share/classes/javax/swing/JPopupMenu.java | 31 +-
src/share/classes/javax/swing/JViewport.java | 16 +-
src/share/classes/javax/swing/JWindow.java | 2 +-
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/UIManager.java | 34 +-
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 | 10 +-
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/DefaultEditorKit.java | 19 +-
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/awt/OSInfo.java | 4 +-
src/share/classes/sun/awt/SunToolkit.java | 77 +-
src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +-
src/share/classes/sun/font/FontUtilities.java | 4 +-
src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +-
src/share/classes/sun/java2d/loops/Blit.java | 10 +-
src/share/classes/sun/launcher/LauncherHelper.java | 4 +-
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 | 4 +-
src/share/classes/sun/launcher/resources/launcher_ko.properties | 4 +-
src/share/classes/sun/launcher/resources/launcher_pt_BR.properties | 4 +-
src/share/classes/sun/management/Agent.java | 198 +-
src/share/classes/sun/management/AgentConfigurationError.java | 6 +-
src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java | 155 +-
src/share/classes/sun/management/resources/agent.properties | 15 +-
src/share/classes/sun/misc/SharedSecrets.java | 7 +-
src/share/classes/sun/misc/Version.java.template | 58 +-
src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java | 4 +-
src/share/classes/sun/print/PSPrinterJob.java | 4 +-
src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 +
src/share/classes/sun/rmi/server/LoaderHandler.java | 2 +-
src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +-
src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java | 4 +-
src/share/classes/sun/security/krb5/Config.java | 4 +-
src/share/classes/sun/security/krb5/Credentials.java | 6 +-
src/share/classes/sun/security/provider/ByteArrayAccess.java | 5 +-
src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +-
src/share/classes/sun/security/ssl/SSLContextImpl.java | 13 +-
src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 +
src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +-
src/share/classes/sun/swing/DefaultLookup.java | 3 +-
src/share/classes/sun/swing/SwingUtilities2.java | 17 +-
src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +-
src/share/classes/sun/util/resources/LocaleNames_de.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_es.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_fr.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_it.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_ja.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_ko.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_sv.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_zh.properties | 8 +
src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties | 8 +
src/share/classes/sun/util/resources/TimeZoneNames.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_de.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_es.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_it.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 9 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 9 +-
src/share/demo/applets/CardTest/example1.html | 2 +-
src/share/demo/applets/DitherTest/example1.html | 2 +-
src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java | 87 +-
src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt | 2 +-
src/share/demo/jvmti/gctest/sample.makefile.txt | 8 +-
src/share/demo/jvmti/heapTracker/sample.makefile.txt | 21 +-
src/share/demo/jvmti/heapViewer/sample.makefile.txt | 7 +-
src/share/demo/jvmti/hprof/sample.makefile.txt | 8 +-
src/share/demo/jvmti/index.html | 6 +-
src/share/demo/jvmti/java_crw_demo/sample.makefile.txt | 2 +-
src/share/demo/jvmti/minst/sample.makefile.txt | 21 +-
src/share/demo/jvmti/mtrace/sample.makefile.txt | 22 +-
src/share/demo/jvmti/versionCheck/sample.makefile.txt | 8 +-
src/share/demo/jvmti/waiters/sample.makefile.txt | 10 +-
src/share/lib/security/java.security | 14 +-
src/share/lib/security/java.security-macosx | 2 +-
src/share/lib/security/java.security-solaris | 2 +-
src/share/lib/security/java.security-windows | 2 +-
src/share/native/com/sun/java/util/jar/pack/defines.h | 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/Adler32.c | 2 +-
src/share/native/java/util/zip/CRC32.c | 2 +-
src/share/native/java/util/zip/Deflater.c | 48 +-
src/share/native/java/util/zip/Inflater.c | 8 +-
src/share/native/java/util/zip/zip_util.c | 2 +-
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 | 2 +-
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +-
src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +-
src/share/native/sun/java2d/loops/TransformHelper.c | 11 +-
src/solaris/classes/java/lang/ClassLoaderHelper.java | 42 +
src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 3 +-
src/solaris/classes/sun/awt/X11/XWM.java | 21 +-
src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 +
src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 4 +-
src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 4 +-
src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 4 +-
src/solaris/doc/sun/man/man1/appletviewer.1 | 7 +-
src/solaris/doc/sun/man/man1/apt.1 | 4 +-
src/solaris/doc/sun/man/man1/extcheck.1 | 2 +-
src/solaris/doc/sun/man/man1/idlj.1 | 10 +-
src/solaris/doc/sun/man/man1/ja/appletviewer.1 | 23 +-
src/solaris/doc/sun/man/man1/ja/apt.1 | 62 +-
src/solaris/doc/sun/man/man1/ja/extcheck.1 | 18 +-
src/solaris/doc/sun/man/man1/ja/idlj.1 | 160 +-
src/solaris/doc/sun/man/man1/ja/jar.1 | 182 +-
src/solaris/doc/sun/man/man1/ja/jarsigner.1 | 677 +-
src/solaris/doc/sun/man/man1/ja/java.1 | 465 +-
src/solaris/doc/sun/man/man1/ja/javac.1 | 448 +-
src/solaris/doc/sun/man/man1/ja/javadoc.1 | 1869 ++++-----
src/solaris/doc/sun/man/man1/ja/javah.1 | 43 +-
src/solaris/doc/sun/man/man1/ja/javap.1 | 48 +-
src/solaris/doc/sun/man/man1/ja/javaws.1 | 62 +-
src/solaris/doc/sun/man/man1/ja/jcmd.1 | 124 +
src/solaris/doc/sun/man/man1/ja/jconsole.1 | 47 +-
src/solaris/doc/sun/man/man1/ja/jdb.1 | 146 +-
src/solaris/doc/sun/man/man1/ja/jhat.1 | 42 +-
src/solaris/doc/sun/man/man1/ja/jinfo.1 | 34 +-
src/solaris/doc/sun/man/man1/ja/jmap.1 | 40 +-
src/solaris/doc/sun/man/man1/ja/jps.1 | 72 +-
src/solaris/doc/sun/man/man1/ja/jrunscript.1 | 50 +-
src/solaris/doc/sun/man/man1/ja/jsadebugd.1 | 41 +-
src/solaris/doc/sun/man/man1/ja/jstack.1 | 34 +-
src/solaris/doc/sun/man/man1/ja/jstat.1 | 638 +-
src/solaris/doc/sun/man/man1/ja/jstatd.1 | 81 +-
src/solaris/doc/sun/man/man1/ja/jvisualvm.1 | 30 +-
src/solaris/doc/sun/man/man1/ja/keytool.1 | 590 +-
src/solaris/doc/sun/man/man1/ja/native2ascii.1 | 20 +-
src/solaris/doc/sun/man/man1/ja/orbd.1 | 120 +-
src/solaris/doc/sun/man/man1/ja/pack200.1 | 104 +-
src/solaris/doc/sun/man/man1/ja/policytool.1 | 105 +-
src/solaris/doc/sun/man/man1/ja/rmic.1 | 98 +-
src/solaris/doc/sun/man/man1/ja/rmid.1 | 106 +-
src/solaris/doc/sun/man/man1/ja/rmiregistry.1 | 24 +-
src/solaris/doc/sun/man/man1/ja/schemagen.1 | 52 +-
src/solaris/doc/sun/man/man1/ja/serialver.1 | 26 +-
src/solaris/doc/sun/man/man1/ja/servertool.1 | 44 +-
src/solaris/doc/sun/man/man1/ja/tnameserv.1 | 147 +-
src/solaris/doc/sun/man/man1/ja/unpack200.1 | 52 +-
src/solaris/doc/sun/man/man1/ja/wsgen.1 | 40 +-
src/solaris/doc/sun/man/man1/ja/wsimport.1 | 60 +-
src/solaris/doc/sun/man/man1/ja/xjc.1 | 111 +-
src/solaris/doc/sun/man/man1/jar.1 | 18 +-
src/solaris/doc/sun/man/man1/jarsigner.1 | 16 +-
src/solaris/doc/sun/man/man1/java.1 | 198 +-
src/solaris/doc/sun/man/man1/javac.1 | 34 +-
src/solaris/doc/sun/man/man1/javadoc.1 | 56 +-
src/solaris/doc/sun/man/man1/javah.1 | 2 +-
src/solaris/doc/sun/man/man1/javap.1 | 2 +-
src/solaris/doc/sun/man/man1/javaws.1 | 6 +-
src/solaris/doc/sun/man/man1/jcmd.1 | 104 +-
src/solaris/doc/sun/man/man1/jconsole.1 | 14 +-
src/solaris/doc/sun/man/man1/jdb.1 | 8 +-
src/solaris/doc/sun/man/man1/jhat.1 | 4 +-
src/solaris/doc/sun/man/man1/jinfo.1 | 2 +-
src/solaris/doc/sun/man/man1/jmap.1 | 2 +-
src/solaris/doc/sun/man/man1/jps.1 | 2 +-
src/solaris/doc/sun/man/man1/jrunscript.1 | 4 +-
src/solaris/doc/sun/man/man1/jsadebugd.1 | 6 +-
src/solaris/doc/sun/man/man1/jstack.1 | 4 +-
src/solaris/doc/sun/man/man1/jstat.1 | 2 +-
src/solaris/doc/sun/man/man1/jstatd.1 | 6 +-
src/solaris/doc/sun/man/man1/jvisualvm.1 | 4 +-
src/solaris/doc/sun/man/man1/keytool.1 | 18 +-
src/solaris/doc/sun/man/man1/native2ascii.1 | 4 +-
src/solaris/doc/sun/man/man1/orbd.1 | 16 +-
src/solaris/doc/sun/man/man1/pack200.1 | 6 +-
src/solaris/doc/sun/man/man1/policytool.1 | 63 +-
src/solaris/doc/sun/man/man1/rmic.1 | 6 +-
src/solaris/doc/sun/man/man1/rmid.1 | 8 +-
src/solaris/doc/sun/man/man1/rmiregistry.1 | 6 +-
src/solaris/doc/sun/man/man1/schemagen.1 | 4 +-
src/solaris/doc/sun/man/man1/serialver.1 | 4 +-
src/solaris/doc/sun/man/man1/servertool.1 | 2 +-
src/solaris/doc/sun/man/man1/tnameserv.1 | 16 +-
src/solaris/doc/sun/man/man1/unpack200.1 | 6 +-
src/solaris/doc/sun/man/man1/wsgen.1 | 2 +-
src/solaris/doc/sun/man/man1/wsimport.1 | 2 +-
src/solaris/doc/sun/man/man1/xjc.1 | 4 +-
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 | 164 +
src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 42 +
src/solaris/native/common/deps/gconf2/gconf_fp.c | 74 +
src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 +
src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 67 +
src/solaris/native/common/deps/glib2/gio_fp.c | 109 +
src/solaris/native/common/deps/glib2/gio_fp.h | 63 +
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 | 138 +
src/solaris/native/common/deps/syscalls_fp.h | 124 +
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 | 404 +-
src/solaris/native/sun/awt/gtk2_interface.c | 979 +----
src/solaris/native/sun/awt/gtk2_interface.h | 577 +---
src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +-
src/solaris/native/sun/awt/swing_GTKEngine.c | 80 +-
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 | 62 +-
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/awt_Desktop.c | 103 +-
src/windows/classes/java/lang/ClassLoaderHelper.java | 42 +
test/ProblemList.txt | 3 +
test/TEST.ROOT | 6 +
test/com/oracle/security/ucrypto/TestAES.java | 111 +-
test/com/oracle/security/ucrypto/TestDigest.java | 24 +-
test/com/oracle/security/ucrypto/TestRSA.java | 278 +-
test/com/oracle/security/ucrypto/UcryptoTest.java | 30 +-
test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +-
test/demo/jvmti/DemoRun.java | 4 +-
test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 +
test/java/awt/Focus/FocusTraversalPolicy/InitialFTP.java | 26 +
test/java/awt/Focus/FocusTraversalPolicy/InitialFTP_AWT.java | 50 +
test/java/awt/Focus/FocusTraversalPolicy/InitialFTP_Swing.java | 46 +
test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java | 121 +
test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java | 161 +
test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java | 100 +
test/java/awt/regtesthelpers/Util.java | 16 +-
test/java/io/File/GetXSpace.java | 4 +-
test/java/lang/ProcessBuilder/Basic.java | 4 +-
test/java/lang/ProcessBuilder/Zombies.java | 4 +-
test/java/lang/SecurityManager/CheckPackageAccess.java | 47 +
test/java/lang/invoke/InvokeGenericTest.java | 4 +-
test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java | 6 +-
test/java/net/URL/TestHttps.java | 34 +
test/java/nio/MappedByteBuffer/Basic.java | 91 +-
test/java/nio/channels/FileChannel/Size.java | 4 +-
test/java/nio/channels/FileChannel/Transfer.java | 4 +-
test/java/nio/channels/SocketChannel/LocalAddress.java | 2 +-
test/java/nio/channels/TestUtil.java | 6 +-
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/FileSystem/Basic.java | 4 +-
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/javax/swing/JViewport/7107099/bug7107099.java | 104 +
test/sun/java2d/loops/Bug7049339.java | 77 +
test/sun/management/AgentCheckTest.java | 10 +-
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/jmxremote/startstop/JMXStartStopDoSomething.java | 52 +
test/sun/management/jmxremote/startstop/JMXStartStopTest.java | 181 +
test/sun/management/jmxremote/startstop/JMXStartStopTest.sh | 603 +++
test/sun/management/jmxremote/startstop/REMOTE_TESTING.txt | 11 +
test/sun/management/jmxremote/startstop/management_cl.properties | 2 +
test/sun/management/jmxremote/startstop/management_jcmd.properties | 3 +
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/nio/ch/SelProvider.java | 4 +-
test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh | 3 +-
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java | 2 +-
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/NullGetAcceptedIssuers.java | 66 +
test/sun/tools/native2ascii/NativeErrors.java | 4 +-
test/tools/launcher/TestHelper.java | 2 +-
test/tools/pack200/MemoryAllocatorTest.java | 369 +
662 files changed, 42493 insertions(+), 39540 deletions(-)
diffs (truncated from 116832 to 500 lines):
diff -r c929e96aa059 -r a0d124b90763 .hgtags
--- a/.hgtags Sun Feb 19 22:03:12 2012 -0800
+++ b/.hgtags Wed May 02 13:15:49 2012 -0400
@@ -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,3 +162,14 @@
6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10
d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11
16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12
+907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint
+c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13
+09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14
+00f0f18379ecb927a515d1540682a922bd0227ec jdk7u4-b15
+df20c60949f8cef09be1e89d754cff366eaf7aa4 jdk7u4-b16
+b4401b362fd8076d705aa57acb9967b5962a795d jdk7u4-b17
+084825fc677ef6adecab9400a2625eb0e5579509 jdk7u4-b18
+0f9aacb27534e7bba7ba30a2700a9c828416929d jdk7u4-b19
+1a495432b42a496bde0ddfa16c6462742d7a8cf1 jdk7u4-b20
+81a0f71a895e7f386efdd481eb53fb3ca0597438 jdk7u4-b30
+0573d282ca247a2848c26fe2800c7f3aa8d2e882 jdk7u4-b21
\ No newline at end of file
diff -r c929e96aa059 -r a0d124b90763 jdk/test/sun/management/jmxremote/bootstrap/LocalOnlyTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalOnlyTest.java Wed May 02 13:15:49 2012 -0400
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2007 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 6685178
+ * @summary Sanity check for local only option. In order to fully test this
+ * new local only option two different machines would be required.
+ * @author Luis-Miguel Alventosa
+ * @run main/othervm LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote.local.only=true LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote.local.only=false LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=true LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=true LocalOnlyTest
+ * @run main/othervm -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false LocalOnlyTest
+ */
+
+import java.io.*;
+import java.lang.management.*;
+import java.util.*;
+import javax.management.*;
+import javax.management.remote.*;
+import com.sun.tools.attach.*;
+
+public class LocalOnlyTest {
+
+ public static void main(String args[]) throws Exception {
+ RuntimeMXBean rt = ManagementFactory.getRuntimeMXBean();
+ String name = rt.getName();
+ System.out.println("name = " + name);
+ String vmid = name.substring(0, name.indexOf("@"));
+ System.out.println("vmid = " + vmid);
+ VirtualMachine vm = VirtualMachine.attach(vmid);
+ String addr = vm.getAgentProperties().getProperty(
+ "com.sun.management.jmxremote.localConnectorAddress");
+ System.out.println("connectorAddress = " + addr);
+ if (addr == null) {
+ // Normally in ${java.home}/jre/lib/management-agent.jar
+ // but might be in ${java.home}/lib in build environments.
+ String javaHome = System.getProperty("java.home");
+ String agent = javaHome + File.separator + "jre" + File.separator +
+ "lib" + File.separator + "management-agent.jar";
+ File f = new File(agent);
+ if (!f.exists()) {
+ agent = javaHome + File.separator + "lib" + File.separator +
+ "management-agent.jar";
+ f = new File(agent);
+ if (!f.exists()) {
+ throw new IOException("Management agent not found");
+ }
+ }
+ agent = f.getCanonicalPath();
+ try {
+ vm.loadAgent(agent, "com.sun.management.jmxremote");
+ } catch (AgentLoadException x) {
+ IOException ioe = new IOException(x.getMessage());
+ ioe.initCause(x);
+ throw ioe;
+ } catch (AgentInitializationException x) {
+ IOException ioe = new IOException(x.getMessage());
+ ioe.initCause(x);
+ throw ioe;
+ }
+ addr = vm.getAgentProperties().getProperty(
+ "com.sun.management.jmxremote.localConnectorAddress");
+ System.out.println("connectorAddress (after loading agent) = " + addr);
+ }
+ vm.detach();
+ JMXServiceURL url = new JMXServiceURL(addr);
+ JMXConnector c = JMXConnectorFactory.connect(url);
+ System.out.println("connectionId = " + c.getConnectionId());
+ System.out.println("Bye! Bye!");
+ }
+}
diff -r c929e96aa059 -r a0d124b90763 make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile Sun Feb 19 22:03:12 2012 -0800
+++ b/make/com/sun/java/pack/Makefile Wed May 02 13:15:49 2012 -0400
@@ -32,6 +32,7 @@
LIBRARY = unpack
PRODUCT = sun
PGRM = unpack200
+JAVAC_MAX_WARNINGS=true
include $(BUILDDIR)/common/Defs.gmk
CPLUSPLUSLIBRARY=true
@@ -57,7 +58,6 @@
vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
ifeq ($(STANDALONE),true)
- ifneq ($(SYSTEM_ZLIB),true)
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
@@ -71,13 +71,14 @@
$(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
$(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
- OTHER_CXXFLAGS += $(ZINCLUDE)
- LDDFLAGS += $(ZIPOBJS)
- else
- LDDFLAGS += -lz
- OTHER_CXXFLAGS += -DSYSTEM_ZLIB
- endif
+ ifdef USE_SYSTEM_ZLIB
+ OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DUSE_SYSTEM_ZLIB=1
+ OTHER_LDLIBS += $(ZLIB_LIBS)
+ else
+ ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ OTHER_CXXFLAGS += $(ZINCLUDE)
+ LDDFLAGS += $(ZIPOBJS)
+ endif
else
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
OTHER_LDLIBS += $(JVMLIB)
@@ -99,8 +100,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 +157,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 c929e96aa059 -r a0d124b90763 make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Defs-linux.gmk Wed May 02 13:15:49 2012 -0400
@@ -53,6 +53,11 @@
PLATFORM_SRC = $(BUILDDIR)/../src/solaris
endif # PLATFORM_SRC
+# Location of the various .properties files specific to Linux platform
+ifndef PLATFORM_PROPERTIES
+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
+endif # PLATFORM_SRC
+
# Platform specific closed sources
ifndef OPENJDK
ifndef CLOSED_PLATFORM_SRC
@@ -151,15 +156,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)
@@ -238,11 +254,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 c929e96aa059 -r a0d124b90763 make/common/Defs-macosx.gmk
--- a/make/common/Defs-macosx.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Defs-macosx.gmk Wed May 02 13:15:49 2012 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -53,6 +53,11 @@
PLATFORM_SRC = $(BUILDDIR)/../src/solaris
endif # PLATFORM_SRC
+# Location of the various .properties files specific to MacOS X platform
+ifndef PLATFORM_PROPERTIES
+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/macosx/lib
+endif # PLATFORM_SRC
+
PLATFORM_SRC_MACOS = $(BUILDDIR)/../src/macosx
# BSD build pulls its platform sources from the solaris tree.
@@ -106,10 +111,10 @@
# For all platforms, do not omit the frame pointer register usage.
# 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_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-LDFLAGS_COMMON_amd64 += -m64
+# This should be the default on X86, but ia64, and x86_64
+# may not have this as the default.
+CFLAGS_REQUIRED_x86_64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_x86_64 += -m64
CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
LDFLAGS_COMMON_i586 += -m32
CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
@@ -163,7 +168,7 @@
PIC_CODE_SMALL = -fpic
GLOBAL_KPIC = $(PIC_CODE_LARGE)
CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
-ifeq ($(ARCH), amd64)
+ifeq ($(ARCH), x86_64)
CFLAGS_COMMON += -pipe
endif
diff -r c929e96aa059 -r a0d124b90763 make/common/Defs-solaris.gmk
--- a/make/common/Defs-solaris.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Defs-solaris.gmk Wed May 02 13:15:49 2012 -0400
@@ -51,6 +51,11 @@
PLATFORM_SRC = $(BUILDDIR)/../src/solaris
endif # PLATFORM_SRC
+# Location of the various .properties files specific to Solaris platform
+ifndef PLATFORM_PROPERTIES
+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
+endif # PLATFORM_SRC
+
# Platform specific closed sources
ifndef OPENJDK
ifndef CLOSED_PLATFORM_SRC
diff -r c929e96aa059 -r a0d124b90763 make/common/Defs-windows.gmk
--- a/make/common/Defs-windows.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Defs-windows.gmk Wed May 02 13:15:49 2012 -0400
@@ -53,6 +53,11 @@
PLATFORM_SRC = $(BUILDDIR)/../src/windows
endif # PLATFORM_SRC
+# Location of the various .properties files specific to Windows platform
+ifndef PLATFORM_PROPERTIES
+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/windows/lib
+endif # PLATFORM_SRC
+
# Platform specific closed sources
ifndef OPENJDK
ifndef CLOSED_PLATFORM_SRC
diff -r c929e96aa059 -r a0d124b90763 make/common/Program.gmk
--- a/make/common/Program.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Program.gmk Wed May 02 13:15:49 2012 -0400
@@ -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
@@ -108,6 +110,9 @@
endif # ARCH_DATA_MODEL
endif # PLATFORM SOLARIS
ifeq ($(PLATFORM), linux)
+ ifdef USE_SYSTEM_ZLIB
+ OTHER_LDLIBS += $(ZLIB_LIBS)
+ endif
LDFLAGS += $(LDFLAG_Z_ORIGIN)
LDFLAGS += -Wl,--allow-shlib-undefined
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
@@ -280,13 +285,16 @@
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
+
ifeq ($(PLATFORM), macosx)
OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
ifneq ($(SYSTEM_ZLIB), true)
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
+ ifndef USE_SYSTEM_ZLIB
+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ endif
endif
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
diff -r c929e96aa059 -r a0d124b90763 make/common/Release-macosx.gmk
--- a/make/common/Release-macosx.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Release-macosx.gmk Wed May 02 13:15:49 2012 -0400
@@ -35,8 +35,8 @@
MACOSX_SRC = $(JDK_TOPDIR)/src/macosx
BUNDLE_ID ?= net.java.openjdk
-BUNLDE_ID_JRE ?= $(BUNDLE_ID).jre
-BUNLDE_ID_JDK ?= $(BUNDLE_ID).jdk
+BUNDLE_ID_JRE ?= $(BUNDLE_ID).jre
+BUNDLE_ID_JDK ?= $(BUNDLE_ID).jdk
BUNDLE_NAME ?= OpenJDK $(JDK_MINOR_VERSION)
BUNDLE_NAME_JRE ?= $(BUNDLE_NAME)
diff -r c929e96aa059 -r a0d124b90763 make/common/Release.gmk
--- a/make/common/Release.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/Release.gmk Wed May 02 13:15:49 2012 -0400
@@ -146,6 +146,7 @@
javadoc.1 \
javah.1 \
javap.1 \
+ jcmd.1 \
jconsole.1 \
jdb.1 \
jhat.1 \
@@ -615,10 +616,6 @@
$(ECHO) "oracle/jrockit/jfr/parser/" >> $@
$(ECHO) "oracle/jrockit/jfr/settings/" >> $@
$(ECHO) "oracle/jrockit/jfr/tools/" >> $@
- $(ECHO) "oracle/jrockit/jfr/util/" >> $@
- $(ECHO) "oracle/jrockit/jfr/util/log/" >> $@
- $(ECHO) "oracle/jrockit/jfr/util/os/" >> $@
- $(ECHO) "oracle/jrockit/jfr/util/text/" >> $@
endif
endif
@@ -645,7 +642,7 @@
$(MV) $@.temp $@
@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
-# Create the jfr.jar containing Java Flight Recorder implementation
+# Create jfr.jar
JFR_JAR=
ifndef OPENJDK
ifndef JAVASE_EMBEDDED
@@ -1074,13 +1071,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 ) \
@@ -1091,13 +1084,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 c929e96aa059 -r a0d124b90763 make/common/shared/Compiler-gcc.gmk
--- a/make/common/shared/Compiler-gcc.gmk Sun Feb 19 22:03:12 2012 -0800
+++ b/make/common/shared/Compiler-gcc.gmk Wed May 02 13:15:49 2012 -0400
@@ -53,21 +53,87 @@
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
More information about the distro-pkg-dev
mailing list