hg: jdk9/sandbox/jdk: Merge

tobias.hartmann at oracle.com tobias.hartmann at oracle.com
Thu Mar 19 11:47:41 UTC 2015 

Changeset: 701b0ed9ba42
Author:    thartmann
Date:      2015-03-19 12:46 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/701b0ed9ba42

Merge

- make/data/charsetmapping/dbcs
- make/data/charsetmapping/extsbcs
- make/data/charsetmapping/sbcs
- make/data/charsetmapping/standard-charsets
- make/data/checkdeps/refs.allowed
- make/gensrc/Gensrc-jdk.jconsole.gmk
- make/launcher/Launcher-jdk.runtime.gmk
- make/lib/Lib-jdk.runtime.gmk
! make/mapfiles/libjava/mapfile-vers
- make/src/classes/build/tools/deps/CheckDeps.java
- src/java.base/aix/native/libnet/java/net/aix_close.c
! src/java.base/share/classes/java/lang/AbstractStringBuilder.java
! src/java.base/share/classes/java/lang/String.java
- src/java.base/unix/classes/java/lang/UNIXProcess.java
- src/java.base/unix/native/libjava/UNIXProcess_md.c
- src/java.base/unix/native/libjava/java_props_macosx.c
- src/java.base/unix/native/libjava/java_props_macosx.h
- src/java.base/unix/native/libnet/bsd_close.c
- src/java.base/unix/native/libnet/linux_close.c
- src/java.base/unix/native/libnet/solaris_close.c
- src/java.desktop/macosx/classes/sun/datatransfer/resources/flavormap.properties
- src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java
- src/java.desktop/share/classes/java/awt/datatransfer/ClipboardOwner.java
- src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java
- src/java.desktop/share/classes/java/awt/datatransfer/FlavorEvent.java
- src/java.desktop/share/classes/java/awt/datatransfer/FlavorListener.java
- src/java.desktop/share/classes/java/awt/datatransfer/FlavorMap.java
- src/java.desktop/share/classes/java/awt/datatransfer/FlavorTable.java
- src/java.desktop/share/classes/java/awt/datatransfer/MimeType.java
- src/java.desktop/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
- src/java.desktop/share/classes/java/awt/datatransfer/MimeTypeParseException.java
- src/java.desktop/share/classes/java/awt/datatransfer/StringSelection.java
- src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java
- src/java.desktop/share/classes/java/awt/datatransfer/Transferable.java
- src/java.desktop/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
- src/java.desktop/share/classes/java/awt/datatransfer/package.html
- src/java.desktop/share/classes/sun/datatransfer/DataFlavorUtil.java
- src/java.desktop/share/classes/sun/datatransfer/DesktopDatatransferService.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/classes/sun/awt/X11/XAWTFormatter.java
- src/java.desktop/unix/classes/sun/datatransfer/resources/flavormap.properties
- src/java.desktop/unix/conf/images/cursors/cursors.properties
- src/java.desktop/windows/classes/sun/datatransfer/resources/flavormap.properties
- src/java.desktop/windows/conf/images/cursors/cursors.properties
- src/java.management/share/classes/java/lang/management/PlatformComponent.java
- src/java.management/share/classes/sun/management/ExtendedPlatformComponent.java
- src/java.security.acl/share/classes/java/security/acl/Acl.java
- src/java.security.acl/share/classes/java/security/acl/AclEntry.java
- src/java.security.acl/share/classes/java/security/acl/AclNotFoundException.java
- src/java.security.acl/share/classes/java/security/acl/Group.java
- src/java.security.acl/share/classes/java/security/acl/LastOwnerException.java
- src/java.security.acl/share/classes/java/security/acl/NotOwnerException.java
- src/java.security.acl/share/classes/java/security/acl/Owner.java
- src/java.security.acl/share/classes/java/security/acl/Permission.java
- src/java.security.acl/share/classes/java/security/acl/package-info.java
- src/java.security.acl/share/classes/sun/security/acl/AclEntryImpl.java
- src/java.security.acl/share/classes/sun/security/acl/AclImpl.java
- src/java.security.acl/share/classes/sun/security/acl/AllPermissionsImpl.java
- src/java.security.acl/share/classes/sun/security/acl/GroupImpl.java
- src/java.security.acl/share/classes/sun/security/acl/OwnerImpl.java
- src/java.security.acl/share/classes/sun/security/acl/PermissionImpl.java
- src/java.security.acl/share/classes/sun/security/acl/PrincipalImpl.java
- src/java.security.acl/share/classes/sun/security/acl/WorldGroupImpl.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/DelegatableDecoder.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/DoubleByte.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/HKSCS.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.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/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.jconsole/share/classes/sun/tools/jconsole/Version.java.template
- src/jdk.runtime/share/classes/com/sun/tracing/Probe.java
- src/jdk.runtime/share/classes/com/sun/tracing/ProbeName.java
- src/jdk.runtime/share/classes/com/sun/tracing/Provider.java
- src/jdk.runtime/share/classes/com/sun/tracing/ProviderFactory.java
- src/jdk.runtime/share/classes/com/sun/tracing/ProviderName.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/Attributes.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/DependencyClass.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/FunctionName.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ModuleName.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/NameAttributes.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/StabilityLevel.java
- src/jdk.runtime/share/classes/com/sun/tracing/dtrace/package-info.java
- src/jdk.runtime/share/classes/com/sun/tracing/package-info.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/PolicyTool.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_de.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_es.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_fr.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_it.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_ja.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_ko.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_sv.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
- src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
- src/jdk.runtime/share/classes/sun/tracing/MultiplexProviderFactory.java
- src/jdk.runtime/share/classes/sun/tracing/NullProviderFactory.java
- src/jdk.runtime/share/classes/sun/tracing/PrintStreamProviderFactory.java
- src/jdk.runtime/share/classes/sun/tracing/ProbeSkeleton.java
- src/jdk.runtime/share/classes/sun/tracing/ProviderSkeleton.java
- src/jdk.runtime/share/classes/sun/tracing/dtrace/Activation.java
- src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProbe.java
- src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProvider.java
- src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java
- src/jdk.runtime/share/classes/sun/tracing/dtrace/JVM.java
- src/jdk.runtime/share/classes/sun/tracing/package-info.java
- 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/libjsdt/JVM.c
- src/jdk.runtime/share/native/libjsdt/jvm_symbols.h
- src/jdk.runtime/share/native/libunpack/jni.cpp
- src/jdk.runtime/share/native/unpack200/main.cpp
- src/jdk.runtime/unix/native/libjsdt/jvm_symbols_md.c
- src/jdk.runtime/windows/native/libjsdt/jvm_symbols_md.c
- src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest
- src/jdk.security.auth/unix/native/libjaas/Solaris.c
- test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java
- test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh
- test/com/sun/tracing/BasicFunctionality.java
- test/com/sun/tracing/BasicWithSecurityMgr.java
- test/java/awt/color/LoadProfileWithSM.java
- test/java/awt/color/LoadStandardProfilesTest.java
- test/java/lang/CharSequence/DefaultTest.java
- test/java/util/ResourceBundle/Bug6287579.java
- 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