hg: jdk9/sandbox/jdk: Merge

magnus.ihse.bursie at oracle.com magnus.ihse.bursie at oracle.com
Wed Jan 13 12:04:45 UTC 2016


Changeset: 34bbc7188fcd
Author:    ihse
Date:      2016-01-13 13:03 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/34bbc7188fcd

Merge

! make/CompileDemos.gmk
! make/gensrc/Gensrc-java.base.gmk
! make/gensrc/Gensrc-java.desktop.gmk
! make/gensrc/Gensrc-java.logging.gmk
! make/gensrc/Gensrc-java.management.gmk
! make/gensrc/Gensrc-jdk.dev.gmk
! make/gensrc/Gensrc-jdk.jartool.gmk
! make/gensrc/Gensrc-jdk.jdi.gmk
! make/gensrc/Gensrc-jdk.localedata.gmk
! make/gensrc/GensrcProperties.gmk
! make/launcher/Launcher-java.base.gmk
! make/launcher/Launcher-jdk.jcmd.gmk
! make/launcher/Launcher-jdk.jconsole.gmk
! make/launcher/Launcher-jdk.jdi.gmk
= make/launcher/Launcher-jdk.jvmstat.rmi.gmk < make/launcher/Launcher-jdk.jvmstat.gmk
! make/launcher/Launcher-jdk.pack200.gmk
! make/launcher/LauncherCommon.gmk
- src/java.base/share/classes/jdk/Exported.java
- src/java.base/share/classes/sun/misc/BASE64Decoder.java
- src/java.base/share/classes/sun/misc/BASE64Encoder.java
- src/java.base/share/classes/sun/misc/CharacterDecoder.java
- src/java.base/share/classes/sun/misc/CharacterEncoder.java
- src/java.base/share/classes/sun/misc/CompoundEnumeration.java
- src/java.base/share/classes/sun/misc/Contended.java
- src/java.base/share/classes/sun/misc/DoubleConsts.java
- src/java.base/share/classes/sun/misc/FDBigInteger.java
- src/java.base/share/classes/sun/misc/FloatConsts.java
- src/java.base/share/classes/sun/misc/FloatingDecimal.java
- src/java.base/share/classes/sun/misc/FormattedFloatingDecimal.java
- src/java.base/share/classes/sun/misc/HexDumpEncoder.java
- src/java.base/share/classes/sun/misc/MessageUtils.java
- src/java.base/share/classes/sun/misc/ProxyGenerator.java
- src/java.base/share/classes/sun/misc/Queue.java
- src/java.base/share/classes/sun/misc/Request.java
- src/java.base/share/classes/sun/misc/RequestProcessor.java
- src/java.base/share/classes/sun/misc/UCDecoder.java
- src/java.base/share/classes/sun/misc/UCEncoder.java
- src/java.base/share/classes/sun/misc/UUDecoder.java
- src/java.base/share/classes/sun/misc/UUEncoder.java
- src/java.base/share/classes/sun/misc/VM.java
- src/java.base/share/classes/sun/misc/VMNotification.java
- src/java.base/share/classes/sun/util/logging/LoggingProxy.java
- src/java.base/share/classes/sun/util/logging/LoggingSupport.java
- src/java.base/share/native/libjava/MessageUtils.c
- src/java.base/share/native/libzip/ZipFile.c
- src/java.base/unix/classes/sun/misc/OSEnvironment.java
- src/java.base/unix/classes/sun/nio/ch/DefaultSelectorProvider.java
- src/java.base/windows/classes/sun/misc/OSEnvironment.java
- src/java.desktop/share/classes/sun/swing/plaf/synth/SynthIcon.java
- src/java.logging/share/classes/java/util/logging/LoggingProxyImpl.java
- src/java.scripting/share/classes/javax/script/package.html
- src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngine.java
- src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngineFactory.java
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptEngine.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.m
- src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/package.html
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
- src/jdk.jvmstat/share/classes/sun/tools/jstatd/Jstatd.java
- src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteHostImpl.java
- src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteVmImpl.java
- test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html
- test/java/lang/ProcessHandle/TEST.properties
- test/java/util/stream/bootlib/java/util/stream/CollectorOps.java
- test/java/util/stream/bootlib/java/util/stream/DefaultMethodStreams.java
- test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestDataProvider.java
- test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestScenario.java
- test/java/util/stream/bootlib/java/util/stream/FlagDeclaringOp.java
- test/java/util/stream/bootlib/java/util/stream/IntStreamTestDataProvider.java
- test/java/util/stream/bootlib/java/util/stream/IntStreamTestScenario.java
- test/java/util/stream/bootlib/java/util/stream/IntermediateTestOp.java
- test/java/util/stream/bootlib/java/util/stream/LambdaTestHelpers.java
- test/java/util/stream/bootlib/java/util/stream/LambdaTestMode.java
- test/java/util/stream/bootlib/java/util/stream/LoggingTestCase.java
- test/java/util/stream/bootlib/java/util/stream/LongStreamTestDataProvider.java
- test/java/util/stream/bootlib/java/util/stream/LongStreamTestScenario.java
- test/java/util/stream/bootlib/java/util/stream/OpTestCase.java
- test/java/util/stream/bootlib/java/util/stream/SpliteratorTestHelper.java
- test/java/util/stream/bootlib/java/util/stream/StatefulTestOp.java
- test/java/util/stream/bootlib/java/util/stream/StatelessTestOp.java
- test/java/util/stream/bootlib/java/util/stream/StreamOpFlagTestHelper.java
- test/java/util/stream/bootlib/java/util/stream/StreamTestDataProvider.java
- test/java/util/stream/bootlib/java/util/stream/StreamTestScenario.java
- test/java/util/stream/bootlib/java/util/stream/TestData.java
- test/java/util/stream/bootlib/java/util/stream/TestFlagExpectedOp.java
- test/java/util/stream/bootlib/java/util/stream/ThowableHelper.java
- test/java/util/stream/boottest/java/util/stream/DoubleNodeTest.java
- test/java/util/stream/boottest/java/util/stream/FlagOpTest.java
- test/java/util/stream/boottest/java/util/stream/IntNodeTest.java
- test/java/util/stream/boottest/java/util/stream/LongNodeTest.java
- test/java/util/stream/boottest/java/util/stream/NodeBuilderTest.java
- test/java/util/stream/boottest/java/util/stream/NodeTest.java
- test/java/util/stream/boottest/java/util/stream/SliceSpliteratorTest.java
- test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java
- test/java/util/stream/boottest/java/util/stream/StreamFlagsTest.java
- test/java/util/stream/boottest/java/util/stream/StreamOpFlagsTest.java
- test/java/util/stream/boottest/java/util/stream/StreamReuseTest.java
- test/javax/sound/midi/MidiDeviceProvider/FakeInfo.java
- test/javax/sound/midi/MidiDeviceProvider/NullInfo.java
- test/javax/sound/midi/MidiDeviceProvider/UnsupportedInfo.java
- test/javax/sound/sampled/FileReader/AudioFileClose.java
- test/javax/sound/sampled/FileReader/ReadersExceptions.java
- test/javax/sound/sampled/FileReader/RepeatedFormatReader.java
- test/javax/sound/sampled/FileWriter/AlawEncoderSync.java
- test/javax/sound/sampled/FileWriter/WriterCloseInput.java
- test/lib/testlibrary/jdk/testlibrary/InputArguments.java
- test/sun/misc/Encode/DecodeBuffer.java
- test/sun/misc/Encode/Encode.java
- test/sun/misc/Encode/GetBytes.java
- test/sun/misc/FloatingDecimal/OldFDBigIntForTest.java
- test/sun/misc/FloatingDecimal/OldFloatingDecimalForTest.java
- test/sun/misc/FloatingDecimal/TestFDBigInteger.java
- test/sun/misc/FloatingDecimal/TestFloatingDecimal.java
- test/sun/misc/VM/GetNanoTimeAdjustment.java
- test/sun/security/tools/jarsigner/warning.sh



More information about the jdk9-sandbox-changes mailing list