hg: jdk9/sandbox/jdk: Merge

magnus.ihse.bursie at oracle.com magnus.ihse.bursie at oracle.com
Fri Mar 20 10:32:52 UTC 2015


Changeset: 624fb4f02d44
Author:    ihse
Date:      2015-03-20 11:31 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/624fb4f02d44

Merge

- make/launcher/Launcher-jdk.runtime.gmk
! make/lib/Awt2dLibraries.gmk
! make/lib/CoreLibraries.gmk
- make/lib/Lib-jdk.runtime.gmk
- src/java.base/share/classes/sun/security/acl/AclEntryImpl.java
- src/java.base/share/classes/sun/security/acl/AclImpl.java
- src/java.base/share/classes/sun/security/acl/AllPermissionsImpl.java
- src/java.base/share/classes/sun/security/acl/GroupImpl.java
- src/java.base/share/classes/sun/security/acl/OwnerImpl.java
- src/java.base/share/classes/sun/security/acl/PermissionImpl.java
- src/java.base/share/classes/sun/security/acl/PrincipalImpl.java
- src/java.base/share/classes/sun/security/acl/WorldGroupImpl.java
- src/java.desktop/share/conf/images/cursors/invalid32x32.gif
- src/java.desktop/share/conf/images/cursors/motif_CopyDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/motif_CopyNoDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/motif_LinkDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/motif_LinkNoDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/motif_MoveDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/motif_MoveNoDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/win32_CopyDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/win32_CopyNoDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/win32_LinkDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/win32_LinkNoDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/win32_MoveDrop32x32.gif
- src/java.desktop/share/conf/images/cursors/win32_MoveNoDrop32x32.gif
- src/java.desktop/unix/conf/images/cursors/cursors.properties
- src/java.desktop/windows/conf/images/cursors/cursors.properties
- src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java
- src/jdk.dev/share/classes/com/sun/jarsigner/ContentSigner.java
- src/jdk.dev/share/classes/com/sun/jarsigner/ContentSignerParameters.java
- src/jdk.dev/share/classes/com/sun/jarsigner/package-info.java
- src/jdk.dev/share/classes/sun/security/tools/jarsigner/Main.java
- src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources.java
- src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_ja.java
- src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
- src/jdk.dev/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/PolicyTool.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_de.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_es.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_fr.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_it.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_ja.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_ko.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_sv.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
- src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
- src/jdk.dev/share/classes/sun/tools/jar/CommandLine.java
- src/jdk.dev/share/classes/sun/tools/jar/JarException.java
- src/jdk.dev/share/classes/sun/tools/jar/Main.java
- src/jdk.dev/share/classes/sun/tools/jar/Manifest.java
- src/jdk.dev/share/classes/sun/tools/jar/SignatureFile.java
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_de.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_es.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_fr.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_it.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ja.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ko.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_sv.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
- src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
- src/jdk.runtime/share/native/common-unpack/bands.cpp
- src/jdk.runtime/share/native/common-unpack/bands.h
- src/jdk.runtime/share/native/common-unpack/bytes.cpp
- src/jdk.runtime/share/native/common-unpack/bytes.h
- src/jdk.runtime/share/native/common-unpack/coding.cpp
- src/jdk.runtime/share/native/common-unpack/coding.h
- src/jdk.runtime/share/native/common-unpack/constants.h
- src/jdk.runtime/share/native/common-unpack/defines.h
- src/jdk.runtime/share/native/common-unpack/unpack.cpp
- src/jdk.runtime/share/native/common-unpack/unpack.h
- src/jdk.runtime/share/native/common-unpack/utils.cpp
- src/jdk.runtime/share/native/common-unpack/utils.h
- src/jdk.runtime/share/native/common-unpack/zip.cpp
- src/jdk.runtime/share/native/common-unpack/zip.h
- src/jdk.runtime/share/native/libunpack/jni.cpp
- src/jdk.runtime/share/native/unpack200/main.cpp
- src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest
- test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java
- test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh
- test/java/util/stream/test/org/openjdk/tests/java/util/stream/TabulatorsTest.java
- test/sun/security/acl/PermissionImpl/PermissionEqualsHashCode.java



More information about the jdk9-sandbox-changes mailing list