/hg/release/icedtea7-forest-2.4/jdk: 38 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 15 16:03:41 PDT 2013
changeset 752f90079bab in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=752f90079bab
author: okutsu
date: Fri Jul 19 15:32:01 2013 +0900
8006900: Add new date/time capability
Reviewed-by: mchung, hawtin
changeset 3bcfa217049f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3bcfa217049f
author: dsamersoff
date: Mon Jul 08 14:34:36 2013 +0400
8008589: Better MBean permission validation
Summary: Better MBean permission validation
Reviewed-by: skoivu, dfuchs, mchung, sjiang
changeset c07103437a0d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c07103437a0d
author: ascarpino
date: Wed Jul 03 15:12:19 2013 -0700
8011071: Better crypto provider handling
Reviewed-by: hawtin, valeriep
changeset 09fa1d30e3fd in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09fa1d30e3fd
author: jbachorik
date: Tue Apr 23 09:37:31 2013 +0200
8011081: Improve jhat
Summary: Properly escape HTML output
Reviewed-by: alanb, mschoene, sundar
changeset 0f0a513e2706 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0f0a513e2706
author: msheppar
date: Fri Jun 14 17:28:36 2013 +0100
8011157: Improve CORBA portablility
Summary: fix also reviewed by Alexander Fomin
Reviewed-by: alanb, coffeys, skoivu
changeset 1cdf150f14a0 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1cdf150f14a0
author: malenkov
date: Mon May 20 17:55:49 2013 +0400
8012071: Better Building of Beans
Reviewed-by: art, skoivu
changeset c50d396d7e58 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c50d396d7e58
author: erikj
date: Wed Oct 09 21:14:28 2013 +0100
8012147: Improve tool support
Summary: Adding libjli to jdk lib dir and removing now redundant rpath entries from executables
Reviewed-by: alanb, dholmes, ksrini, ahgross
changeset 77b362782617 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=77b362782617
author: malenkov
date: Fri May 31 20:43:32 2013 +0400
8012277: Improve AWT DataFlavor
Reviewed-by: art, skoivu
changeset 5c09a3e36b0b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5c09a3e36b0b
author: ksrini
date: Tue May 07 13:37:03 2013 -0700
8013506: Better Pack200 data handling
Reviewed-by: jrose, kizune, mschoene
changeset 1a39ad6278fc in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1a39ad6278fc
author: jchen
date: Thu May 09 11:23:18 2013 -0700
8013510: Augment image writing code
Reviewed-by: bae, prr
changeset c03122854276 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c03122854276
author: vadim
date: Mon May 13 13:24:30 2013 +0400
8013514: Improve stability of cmap class
Reviewed-by: mschoene, prr, bae
changeset 5946d358088f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5946d358088f
author: weijun
date: Thu Jun 13 10:21:06 2013 +0800
8013739: Better LDAP resource management
Reviewed-by: ahgross, mchung, xuelei
changeset 5cb795ba0360 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5cb795ba0360
author: alexsch
date: Wed Oct 09 21:35:30 2013 +0100
8013744: Better tabling for AWT
Reviewed-by: art, malenkov, skoivu
changeset 297b32c26c3b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=297b32c26c3b
author: jbachorik
date: Thu Jun 20 08:51:47 2013 +0200
8014085: Better serialization support in JMX classes
Reviewed-by: alanb, dfuchs, skoivu
changeset ca6f7b562a16 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ca6f7b562a16
author: bae
date: Fri May 17 16:47:51 2013 +0400
8014093: Improve parsing of images
Reviewed-by: prr
changeset 1fecf631a056 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1fecf631a056
author: jchen
date: Thu Jun 13 12:02:15 2013 -0700
8014098: Better profile validation
Reviewed-by: bae, prr
changeset 14baa8bbfcbc in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=14baa8bbfcbc
author: bae
date: Tue May 21 13:56:39 2013 +0400
8014102: Improve image conversion
Reviewed-by: prr
changeset 2165bf0627ee in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2165bf0627ee
author: weijun
date: Wed May 08 09:21:59 2013 +0800
8014341: Better service from Kerberos servers
Summary: read incoming data safely and take care of null return value
Reviewed-by: valeriep, ahgross
changeset be3468cc1e90 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=be3468cc1e90
author: jfranck
date: Mon Jul 15 18:41:54 2013 +0200
8014349: (cl) Class.getDeclaredClass problematic in some class loader configurations
Reviewed-by: mchung, ahgross, darcy
changeset 0d6dc0748fc6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0d6dc0748fc6
author: sjiang
date: Thu Jul 18 10:12:56 2013 +0200
8014534: Better profiling support
Summary: Validation of parameters
Reviewed-by: sspitsyn, skoivu, mchung
changeset 767ba3a7b3b2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=767ba3a7b3b2
author: smarks
date: Wed Jul 10 15:28:42 2013 -0700
8014987: Augment serialization handling
Reviewed-by: alanb, coffeys, skoivu
changeset 9fd9fac5f584 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9fd9fac5f584
author: erikj
date: Mon Aug 19 17:51:46 2013 +0200
8015614: Update build settings
Reviewed-by: tbell, dholmes, ahgross
changeset fd50e525c96e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fd50e525c96e
author: weijun
date: Thu Jun 13 10:31:21 2013 +0800
8015731: Subject java.security.auth.subject to improvements
Reviewed-by: skoivu, mullan
changeset b4ee00591860 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b4ee00591860
author: michaelm
date: Wed Jul 03 17:54:38 2013 +0100
8015743: Address internet addresses
Summary: moved Inet6Address fields to holder class
Reviewed-by: chegar, alanb, skoivu, khazra
changeset 1e9988e47afe in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1e9988e47afe
author: sgabdura
date: Tue Jul 23 10:01:25 2013 +0400
8016357: Update hotspot diagnostic class
Summary: Add security check to HotSpotDiagnostic.dumpHeap
Reviewed-by: fparain, sla, ahgross
changeset 0b74761339e6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0b74761339e6
author: mchung
date: Thu Jul 18 17:22:11 2013 -0700
8017196: Ensure Proxies are handled appropriately
Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar
changeset baabb0b8f417 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=baabb0b8f417
author: bae
date: Mon Jul 01 20:20:50 2013 +0400
8017287: Better resource disposal
Reviewed-by: vadim
changeset 34fb14f5ccae in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34fb14f5ccae
author: mchung
date: Mon Jul 15 03:40:16 2013 -0700
8017291: Cast Proxies Aside
Reviewed-by: alanb, ahgross
changeset 6f95d3f686e1 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6f95d3f686e1
author: sundar
date: Wed Oct 09 21:55:51 2013 +0100
8017300: Improve Interface Implementation
Reviewed-by: ahgross, jlaskey, mchung
changeset 39c79b1d3ec3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=39c79b1d3ec3
author: sjiang
date: Tue Aug 06 16:04:14 2013 +0200
8019292: Better Attribute Value Exceptions
Reviewed-by: dfuchs, dholmes, ahgross
changeset acbfbe7516d4 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=acbfbe7516d4
author: malenkov
date: Tue Jul 16 21:00:34 2013 +0400
8019617: Better view of objects
Reviewed-by: art, skoivu
changeset ee9b6bc011c3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee9b6bc011c3
author: jchen
date: Mon Jul 22 14:06:39 2013 -0700
8020293: JVM crash
Reviewed-by: prr, jgodinez
changeset f6f6cf073753 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f6f6cf073753
author: serb
date: Mon Aug 12 21:33:59 2013 +0400
8021275: Better screening for ScreenMenu
Reviewed-by: art
changeset 9f8b93511a40 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9f8b93511a40
author: serb
date: Sun Aug 04 16:32:14 2013 +0400
8021282: Better recycling of object instances
Reviewed-by: art
changeset 6a3f4f71b88d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6a3f4f71b88d
author: naoto
date: Thu Aug 01 14:15:27 2013 -0700
8021286: Improve MacOS resourcing
Reviewed-by: okutsu
changeset 9d21efd51b38 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9d21efd51b38
author: mullan
date: Tue Jul 30 17:20:22 2013 -0400
8021290: Better signature validation
Reviewed-by: xuelei, ahgross
changeset 0ee30041355e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0ee30041355e
author: weijun
date: Sat Aug 17 06:51:46 2013 +0800
8022931: Enhance Kerberos exceptions
Reviewed-by: xuelei, ahgross
changeset 69ccd383db92 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=69ccd383db92
author: andrew
date: Thu Oct 10 00:17:59 2013 +0100
Fix 8015743 to compile after 8020498.
diffstat:
make/bridge/Jabswitch/Makefile | 2 +-
make/com/sun/jmx/Makefile | 4 +-
make/common/Program.gmk | 3 -
make/common/Release.gmk | 7 +-
make/java/management/mapfile-vers | 2 +-
make/sun/awt/FILES_c_macosx.gmk | 28 -
make/sun/awt/FILES_export_macosx.gmk | 29 -
make/sun/awt/Makefile | 2 -
src/macosx/classes/com/apple/laf/AquaLookAndFeel.java | 4 +-
src/macosx/classes/com/apple/laf/AquaUtils.java | 193 ++-
src/macosx/classes/com/apple/laf/ScreenMenu.java | 144 +-
src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java | 110 --
src/macosx/native/com/apple/resources/MacOSXResourceBundle.m | 110 --
src/share/classes/com/sun/crypto/provider/DHPrivateKey.java | 18 +-
src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java | 26 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 5 +
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 4 +-
src/share/classes/com/sun/jndi/ldap/VersionHelper12.java | 17 +-
src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java | 5 +
src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java | 15 +-
src/share/classes/com/sun/script/util/InterfaceImplementor.java | 29 +-
src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java | 2 +-
src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java | 10 +-
src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java | 10 +-
src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java | 4 +-
src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java | 5 +-
src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java | 15 +-
src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java | 17 +-
src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java | 6 +-
src/share/classes/java/awt/datatransfer/DataFlavor.java | 50 +-
src/share/classes/java/beans/Beans.java | 6 +
src/share/classes/java/beans/DefaultPersistenceDelegate.java | 3 +
src/share/classes/java/beans/MetaData.java | 19 +-
src/share/classes/java/io/ObjectInputStream.java | 15 +-
src/share/classes/java/io/ObjectOutputStream.java | 20 +-
src/share/classes/java/lang/Class.java | 12 +-
src/share/classes/java/lang/ClassLoader.java | 8 +
src/share/classes/java/lang/System.java | 4 +
src/share/classes/java/lang/Thread.java | 24 +-
src/share/classes/java/lang/invoke/MethodHandleNatives.java | 2 +
src/share/classes/java/lang/invoke/MethodHandles.java | 15 +-
src/share/classes/java/lang/reflect/Proxy.java | 16 +-
src/share/classes/java/net/Inet6Address.java | 463 ++++++---
src/share/classes/java/net/InetAddress.java | 7 +
src/share/classes/java/util/TimeZone.java | 61 +-
src/share/classes/javax/management/BadAttributeValueExpException.java | 26 +-
src/share/classes/javax/management/MBeanNotificationInfo.java | 22 +-
src/share/classes/javax/management/MBeanTrustPermission.java | 31 +-
src/share/classes/javax/management/modelmbean/RequiredModelMBean.java | 10 +-
src/share/classes/javax/management/remote/JMXPrincipal.java | 23 +-
src/share/classes/javax/management/remote/JMXServiceURL.java | 99 +-
src/share/classes/javax/management/remote/NotificationResult.java | 53 +-
src/share/classes/javax/management/remote/TargetedNotification.java | 34 +-
src/share/classes/javax/management/remote/rmi/RMIConnector.java | 29 +-
src/share/classes/javax/security/auth/Subject.java | 8 +-
src/share/classes/javax/security/auth/kerberos/KeyTab.java | 15 +-
src/share/classes/javax/swing/JTable.java | 18 +-
src/share/classes/javax/swing/UIDefaults.java | 12 +-
src/share/classes/javax/swing/text/DefaultFormatter.java | 8 +-
src/share/classes/javax/swing/text/NumberFormatter.java | 6 +-
src/share/classes/javax/swing/text/html/ObjectView.java | 28 +-
src/share/classes/sun/font/FileFont.java | 4 +-
src/share/classes/sun/font/GlyphLayout.java | 7 +-
src/share/classes/sun/font/StandardGlyphVector.java | 5 +-
src/share/classes/sun/font/TrueTypeFont.java | 3 +
src/share/classes/sun/java2d/Disposer.java | 7 +-
src/share/classes/sun/management/HotSpotDiagnostic.java | 12 +-
src/share/classes/sun/misc/JavaLangAccess.java | 7 +
src/share/classes/sun/reflect/misc/ReflectUtil.java | 48 +
src/share/classes/sun/security/ec/ECPrivateKeyImpl.java | 10 +-
src/share/classes/sun/security/jgss/GSSCredentialImpl.java | 4 +-
src/share/classes/sun/security/krb5/KdcComm.java | 12 +-
src/share/classes/sun/security/krb5/internal/NetClient.java | 10 +-
src/share/classes/sun/security/pkcs/PKCS8Key.java | 13 +-
src/share/classes/sun/security/pkcs11/P11Key.java | 48 +-
src/share/classes/sun/security/provider/DSAPrivateKey.java | 7 +-
src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java | 27 +-
src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java | 9 +-
src/share/classes/sun/swing/SwingLazyValue.java | 3 +-
src/share/classes/sun/swing/SwingUtilities2.java | 13 +
src/share/demo/jvmti/hprof/hprof_class.c | 14 +-
src/share/demo/jvmti/hprof/hprof_event.c | 27 +-
src/share/lib/security/java.security-linux | 2 +
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/zip.cpp | 8 +-
src/share/native/java/lang/Class.c | 2 +-
src/share/native/java/net/Inet6Address.c | 17 +-
src/share/native/java/net/net_util.c | 124 ++-
src/share/native/java/net/net_util.h | 17 +
src/share/native/sun/awt/image/awt_parseImage.c | 455 +++------
src/share/native/sun/awt/image/awt_parseImage.h | 11 +-
src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 9 +
src/share/native/sun/awt/medialib/awt_ImagingLib.c | 250 +---
src/share/native/sun/font/layout/SunLayoutEngine.cpp | 4 +
src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 26 +-
src/share/native/sun/management/HotSpotDiagnostic.c | 2 +-
src/solaris/native/java/net/Inet6AddressImpl.c | 18 +-
src/solaris/native/java/net/NetworkInterface.c | 18 +-
src/solaris/native/java/net/PlainDatagramSocketImpl.c | 3 +-
src/solaris/native/java/net/net_util_md.c | 8 +-
src/windows/native/java/net/Inet6AddressImpl.c | 16 +-
src/windows/native/java/net/NetworkInterface.c | 16 +-
src/windows/native/java/net/NetworkInterface_winXP.c | 12 +-
src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 7 +-
test/Makefile | 2 +-
test/java/lang/SecurityManager/CheckPackageAccess.java | 1 +
108 files changed, 1733 insertions(+), 1564 deletions(-)
diffs (truncated from 6171 to 500 lines):
diff -r e4ea4c3db76c -r 69ccd383db92 make/bridge/Jabswitch/Makefile
--- a/make/bridge/Jabswitch/Makefile Tue Oct 08 16:37:50 2013 +0100
+++ b/make/bridge/Jabswitch/Makefile Thu Oct 10 00:17:59 2013 +0100
@@ -53,7 +53,7 @@
buildexe :
$(CD) $(TEMPDIR)
$(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE)
- $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE)
+ $(CC) $(CPPFLAGS) $(JAB_SRC) $(VERSIONRES) /link $(LDDFLAGS) -out:$(JAB_EXE)
$(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)
copyfilejab :
diff -r e4ea4c3db76c -r 69ccd383db92 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile Tue Oct 08 16:37:50 2013 +0100
+++ b/make/com/sun/jmx/Makefile Thu Oct 10 00:17:59 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
@@ -130,11 +130,13 @@
$(RMIC) -classpath "$(CLASSDESTDIR)" \
-d $(CLASSDESTDIR) \
-iiop -v1.2 \
+ -emitPermissionCheck \
$(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)" \
-d $(CLASSDESTDIR) \
-iiop -v1.2 \
-standardPackage \
+ -emitPermissionCheck \
$(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
@$(java-vm-cleanup)
diff -r e4ea4c3db76c -r 69ccd383db92 make/common/Program.gmk
--- a/make/common/Program.gmk Tue Oct 08 16:37:50 2013 +0100
+++ b/make/common/Program.gmk Thu Oct 10 00:17:59 2013 +0100
@@ -103,17 +103,14 @@
ifeq ($(PLATFORM), solaris)
ifeq ($(ARCH_DATA_MODEL), 32)
LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
else # ! ARCH_DATA_MODEL 64-bit
LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
endif # ARCH_DATA_MODEL
endif # PLATFORM SOLARIS
ifeq ($(PLATFORM), linux)
LDFLAGS += $(LDFLAG_Z_ORIGIN)
LDFLAGS += -Wl,--allow-shlib-undefined
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
endif # PLATFORM LINUX
endif # PLATFORM linux solaris
diff -r e4ea4c3db76c -r 69ccd383db92 make/common/Release.gmk
--- a/make/common/Release.gmk Tue Oct 08 16:37:50 2013 +0100
+++ b/make/common/Release.gmk Thu Oct 10 00:17:59 2013 +0100
@@ -982,6 +982,11 @@
endif
$(RM) -rf $(JDK_IMAGE_DIR)/jre/man
$(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
+ ifneq (,$(findstring $(PLATFORM), linux solaris)) # If linux or solaris
+ ($(CD) $(LIBDIR)/.. && $(TAR) cf - \
+ `$(FIND) lib -name $(LIB_PREFIX)jli.$(LIB_SUFFIX) -print `) | \
+ ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
+ endif # PLATFORM
initial-image-jdk64-bindemos:
for dir in bin demo ; do \
@@ -1030,7 +1035,7 @@
initial-image-jdk-db \
$(JDK_DOCFILES) \
$(JDK_DEMOS_AND_SAMPLES_DOCFILES)
- $(MKDIR) $(JDK_IMAGE_DIR)/lib
+ $(MKDIR) -p $(JDK_IMAGE_DIR)/lib
@#
@# Copy in the jars in lib that only belong in the JDK
@#
diff -r e4ea4c3db76c -r 69ccd383db92 make/java/management/mapfile-vers
--- a/make/java/management/mapfile-vers Tue Oct 08 16:37:50 2013 +0100
+++ b/make/java/management/mapfile-vers Thu Oct 10 00:17:59 2013 +0100
@@ -53,7 +53,7 @@
Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
Java_sun_management_GcInfoBuilder_getLastGcInfo0;
Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
- Java_sun_management_HotSpotDiagnostic_dumpHeap;
+ Java_sun_management_HotSpotDiagnostic_dumpHeap0;
Java_sun_management_HotspotThread_getInternalThreadCount;
Java_sun_management_HotspotThread_getInternalThreadTimes0;
Java_sun_management_MemoryImpl_getMemoryManagers0;
diff -r e4ea4c3db76c -r 69ccd383db92 make/sun/awt/FILES_c_macosx.gmk
--- a/make/sun/awt/FILES_c_macosx.gmk Tue Oct 08 16:37:50 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 1995, 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.
-#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
-
diff -r e4ea4c3db76c -r 69ccd383db92 make/sun/awt/FILES_export_macosx.gmk
--- a/make/sun/awt/FILES_export_macosx.gmk Tue Oct 08 16:37:50 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 1995, 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.
-#
-
-# FILES_export definitions for Mac OS X
-
-FILES_export += \
- com/apple/resources/MacOSXResourceBundle.java
diff -r e4ea4c3db76c -r 69ccd383db92 make/sun/awt/Makefile
--- a/make/sun/awt/Makefile Tue Oct 08 16:37:50 2013 +0100
+++ b/make/sun/awt/Makefile Thu Oct 10 00:17:59 2013 +0100
@@ -145,8 +145,6 @@
#
# Files
#
-include FILES_c_macosx.gmk
-include FILES_export_macosx.gmk
FILES_objc = $(FILES_AWT_objc)
OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
diff -r e4ea4c3db76c -r 69ccd383db92 src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
--- a/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Tue Oct 08 16:37:50 2013 +0100
+++ b/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Thu Oct 10 00:17:59 2013 +0100
@@ -37,8 +37,6 @@
import sun.swing.*;
import apple.laf.*;
-import com.apple.resources.MacOSXResourceBundle;
-
public class AquaLookAndFeel extends BasicLookAndFeel {
static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
@@ -246,7 +244,7 @@
table.setDefaultLocale(Locale.getDefault());
table.addResourceBundle(PKG_PREFIX + "resources.aqua");
try {
- final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
+ final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
final Enumeration<String> propertyKeys = aquaProperties.getKeys();
while (propertyKeys.hasMoreElements()) {
diff -r e4ea4c3db76c -r 69ccd383db92 src/macosx/classes/com/apple/laf/AquaUtils.java
--- a/src/macosx/classes/com/apple/laf/AquaUtils.java Tue Oct 08 16:37:50 2013 +0100
+++ b/src/macosx/classes/com/apple/laf/AquaUtils.java Thu Oct 10 00:17:59 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -29,6 +29,7 @@
import java.awt.image.*;
import java.lang.ref.SoftReference;
import java.lang.reflect.Method;
+import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
@@ -41,56 +42,68 @@
import sun.lwawt.macosx.CImage;
import sun.lwawt.macosx.CImage.Creator;
import sun.lwawt.macosx.CPlatformWindow;
+import sun.misc.Launcher;
+import sun.reflect.misc.ReflectUtil;
+import sun.security.action.GetPropertyAction;
import sun.swing.SwingUtilities2;
import com.apple.laf.AquaImageFactory.SlicedImageControl;
-public class AquaUtils {
- final static String ANIMATIONS_SYSTEM_PROPERTY = "swing.enableAnimations";
+final class AquaUtils {
- /*
+ private static final String ANIMATIONS_PROPERTY = "swing.enableAnimations";
+
+ /**
+ * Suppresses default constructor, ensuring non-instantiability.
+ */
+ private AquaUtils() {
+ }
+
+ /**
* Convenience function for determining ComponentOrientation. Helps us
* avoid having Munge directives throughout the code.
*/
- public static boolean isLeftToRight(final Component c) {
+ static boolean isLeftToRight(final Component c) {
return c.getComponentOrientation().isLeftToRight();
}
- public static void enforceComponentOrientation(Component c, ComponentOrientation orientation) {
+ static void enforceComponentOrientation(final Component c, final ComponentOrientation orientation) {
c.setComponentOrientation(orientation);
if (c instanceof Container) {
- for (Component child : ((Container)c).getComponents()) {
+ for (final Component child : ((Container)c).getComponents()) {
enforceComponentOrientation(child, orientation);
}
}
}
- private static CImage.Creator getCImageCreatorInternal() {
- return java.security.AccessController.doPrivileged(new PrivilegedAction<CImage.Creator>() {
+ private static Creator getCImageCreatorInternal() {
+ return AccessController.doPrivileged(new PrivilegedAction<Creator>() {
+ @Override
public Creator run() {
try {
final Method getCreatorMethod = CImage.class.getDeclaredMethod("getCreator", new Class[] {});
getCreatorMethod.setAccessible(true);
- return (CImage.Creator)getCreatorMethod.invoke(null, new Object[] {});
- } catch (final Exception e) {
+ return (Creator)getCreatorMethod.invoke(null, new Object[] {});
+ } catch (final Exception ignored) {
return null;
}
}
});
}
- private static final RecyclableSingleton<CImage.Creator> cImageCreator = new RecyclableSingleton<CImage.Creator>() {
+ private static final RecyclableSingleton<Creator> cImageCreator = new RecyclableSingleton<Creator>() {
@Override
protected Creator getInstance() {
return getCImageCreatorInternal();
}
};
- static CImage.Creator getCImageCreator() {
+ static Creator getCImageCreator() {
return cImageCreator.get();
}
- protected static Image generateSelectedDarkImage(final Image image) {
+ static Image generateSelectedDarkImage(final Image image) {
final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+ @Override
int getGreyFor(final int gray) {
return gray * 75 / 100;
}
@@ -98,8 +111,9 @@
return Toolkit.getDefaultToolkit().createImage(prod);
}
- protected static Image generateDisabledImage(final Image image) {
+ static Image generateDisabledImage(final Image image) {
final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+ @Override
int getGreyFor(final int gray) {
return 255 - ((255 - gray) * 65 / 100);
}
@@ -107,19 +121,20 @@
return Toolkit.getDefaultToolkit().createImage(prod);
}
- protected static Image generateLightenedImage(final Image image, final int percent) {
+ static Image generateLightenedImage(final Image image, final int percent) {
final GrayFilter filter = new GrayFilter(true, percent);
final ImageProducer prod = new FilteredImageSource(image.getSource(), filter);
return Toolkit.getDefaultToolkit().createImage(prod);
}
- static abstract class IconImageFilter extends RGBImageFilter {
- public IconImageFilter() {
+ private abstract static class IconImageFilter extends RGBImageFilter {
+ IconImageFilter() {
super();
canFilterIndexColorModel = true;
}
- public int filterRGB(final int x, final int y, final int rgb) {
+ @Override
+ public final int filterRGB(final int x, final int y, final int rgb) {
final int red = (rgb >> 16) & 0xff;
final int green = (rgb >> 8) & 0xff;
final int blue = rgb & 0xff;
@@ -135,14 +150,14 @@
return result;
}
- abstract int getGreyFor(final int gray);
+ abstract int getGreyFor(int gray);
}
- public abstract static class RecyclableObject<T> {
- protected SoftReference<T> objectRef = null;
+ abstract static class RecyclableObject<T> {
+ private SoftReference<T> objectRef;
- public T get() {
- T referent = null;
+ T get() {
+ T referent;
if (objectRef != null && (referent = objectRef.get()) != null) return referent;
referent = create();
objectRef = new SoftReference<T>(referent);
@@ -152,8 +167,8 @@
protected abstract T create();
}
- public abstract static class RecyclableSingleton<T> {
- public T get() {
+ abstract static class RecyclableSingleton<T> {
+ final T get() {
final AppContext appContext = AppContext.getAppContext();
SoftReference<T> ref = (SoftReference<T>) appContext.get(this);
if (ref != null) {
@@ -166,38 +181,36 @@
return object;
}
- public void reset() {
- AppContext appContext = AppContext.getAppContext();
- appContext.remove(this);
+ void reset() {
+ AppContext.getAppContext().remove(this);
}
- protected abstract T getInstance();
+ abstract T getInstance();
}
- public static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
- protected final Class<T> clazz;
+ static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
+ private final Class<T> clazz;
- public RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
+ RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
this.clazz = clazz;
}
- protected T getInstance() {
+ @Override
+ T getInstance() {
try {
+ ReflectUtil.checkPackageAccess(clazz);
return clazz.newInstance();
- } catch (final InstantiationException e) {
- e.printStackTrace();
- } catch (final IllegalAccessException e) {
- e.printStackTrace();
+ } catch (InstantiationException | IllegalAccessException ignored) {
}
return null;
}
}
- public abstract static class LazyKeyedSingleton<K, V> {
- protected Map<K, V> refs;
+ abstract static class LazyKeyedSingleton<K, V> {
+ private Map<K, V> refs;
- public V get(final K key) {
- if (refs == null) refs = new HashMap<K, V>();
+ V get(final K key) {
+ if (refs == null) refs = new HashMap<>();
final V cachedValue = refs.get(key);
if (cachedValue != null) return cachedValue;
@@ -207,44 +220,45 @@
return value;
}
- protected abstract V getInstance(final K key);
+ protected abstract V getInstance(K key);
}
- static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
+ private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
@Override
protected Boolean getInstance() {
- final String sizeProperty = (String)java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.GetPropertyAction(ANIMATIONS_SYSTEM_PROPERTY));
- return new Boolean(!"false".equals(sizeProperty)); // should be true by default
+ final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
+ ANIMATIONS_PROPERTY));
+ return !"false".equals(sizeProperty); // should be true by default
}
};
- static boolean animationsEnabled() {
+ private static boolean animationsEnabled() {
return enableAnimations.get();
}
- static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
- protected static void blinkMenu(final Selectable selectable) {
+ private static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
+ static void blinkMenu(final Selectable selectable) {
if (!animationsEnabled()) return;
try {
selectable.paintSelected(false);
Thread.sleep(MENU_BLINK_DELAY);
selectable.paintSelected(true);
Thread.sleep(MENU_BLINK_DELAY);
- } catch (final InterruptedException e) { }
+ } catch (final InterruptedException ignored) { }
}
interface Selectable {
- void paintSelected(final boolean selected);
+ void paintSelected(boolean selected);
}
interface JComponentPainter {
- public void paint(JComponent c, Graphics g, int x, int y, int w, int h);
+ void paint(JComponent c, Graphics g, int x, int y, int w, int h);
}
interface Painter {
- public void paint(final Graphics g, int x, int y, int w, int h);
+ void paint(Graphics g, int x, int y, int w, int h);
}
- public static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
+ static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
g.setFont(font);
g.setColor(shadowColor);
SwingUtilities2.drawString(c, g, text, x + offsetX, y + offsetY + metrics.getAscent());
@@ -252,22 +266,22 @@
SwingUtilities2.drawString(c, g, text, x, y + metrics.getAscent());
}
- public static class ShadowBorder implements Border {
- final Painter prePainter;
- final Painter postPainter;
+ static class ShadowBorder implements Border {
+ private final Painter prePainter;
+ private final Painter postPainter;
- final int offsetX;
- final int offsetY;
- final float distance;
- final int blur;
- final Insets insets;
- final ConvolveOp blurOp;
+ private final int offsetX;
+ private final int offsetY;
+ private final float distance;
+ private final int blur;
+ private final Insets insets;
+ private final ConvolveOp blurOp;
- public ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
+ ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
this.prePainter = prePainter; this.postPainter = postPainter;
this.offsetX = offsetX; this.offsetY = offsetY; this.distance = distance; this.blur = blur;
final int halfBlur = blur / 2;
- this.insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
+ insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
More information about the distro-pkg-dev
mailing list