hg: jdk9/sandbox/jdk: Merge
michael.x.mcmahon at oracle.com
michael.x.mcmahon at oracle.com
Mon Apr 4 14:55:27 UTC 2016
Changeset: 89bdca0cd1bf
Author: michaelm
Date: 2016-04-04 15:55 +0100
URL: http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/89bdca0cd1bf
Merge
- make/gendata/Gendata-jdk.jdeps.gmk
- make/gensrc/Gensrc-jdk.dev.gmk
- make/gensrc/Gensrc-jdk.jvmstat.gmk
- make/launcher/Launcher-jdk.dev.gmk
- make/scripts/localelist.sh
- make/src/classes/build/tools/module/GenJdepsModulesXml.java
- make/src/classes/build/tools/module/GenModulesList.java
- make/src/classes/build/tools/module/ImageBuilder.java
- make/src/classes/build/tools/module/Module.java
- make/src/classes/build/tools/module/ModuleArchive.java
- make/src/classes/build/tools/module/ModulesXmlReader.java
- make/src/classes/build/tools/module/ModulesXmlWriter.java
- make/src/classes/build/tools/module/boot.modules
- make/src/classes/build/tools/module/ext.modules
- make/src/native/genconstants/ch/genSocketOptionRegistry.c
- make/src/native/genconstants/fs/genSolarisConstants.c
- make/src/native/genconstants/fs/genUnixConstants.c
- src/java.base/share/classes/jdk/internal/jimage/Archive.java
- src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ExternalFilesWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java
- src/java.base/share/classes/jdk/internal/jimage/ImageJavaSubstrate.java
- src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java
- src/java.base/share/classes/jdk/internal/jimage/ImageLocationWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java
- src/java.base/share/classes/jdk/internal/jimage/ImageModuleDataWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java
- src/java.base/share/classes/jdk/internal/jimage/ImageResourcesTree.java
- src/java.base/share/classes/jdk/internal/jimage/ImageStringsWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageSubstrate.java
- src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java
- src/java.base/share/classes/jdk/internal/jimage/ResourcePool.java
- src/java.base/share/classes/jdk/internal/jimage/ResourcePoolImpl.java
- src/java.base/share/classes/jdk/internal/jimage/StringTable.java
- src/java.base/share/classes/jdk/internal/jimage/UTF8String.java
! src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
- src/java.base/share/classes/sun/misc/InvalidJarIndexException.java
- src/java.base/share/classes/sun/misc/JarIndex.java
- src/java.base/share/classes/sun/misc/Launcher.java
- src/java.base/share/classes/sun/misc/Resource.java
- src/java.base/share/classes/sun/misc/URLClassPath.java
- src/java.base/share/classes/sun/misc/VMSupport.java
- src/java.base/share/classes/sun/misc/resources/Messages.java
- src/java.base/share/classes/sun/misc/resources/Messages_de.java
- src/java.base/share/classes/sun/misc/resources/Messages_es.java
- src/java.base/share/classes/sun/misc/resources/Messages_fr.java
- src/java.base/share/classes/sun/misc/resources/Messages_it.java
- src/java.base/share/classes/sun/misc/resources/Messages_ja.java
- src/java.base/share/classes/sun/misc/resources/Messages_ko.java
- src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java
- src/java.base/share/classes/sun/misc/resources/Messages_sv.java
- src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java
- src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java
- src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
- src/java.base/share/native/libjava/Package.c
- src/java.base/share/native/libjava/Proxy.c
- src/java.base/share/native/libjimage/ImageNativeSubstrate.cpp
- src/java.base/unix/classes/sun/misc/FileURLMapper.java
- src/java.base/windows/classes/sun/misc/FileURLMapper.java
- src/java.desktop/share/classes/META-INF/services/java.net.ContentHandlerFactory
- src/java.desktop/share/classes/META-INF/services/javax.print.PrintServiceLookup
- src/java.desktop/share/classes/META-INF/services/javax.print.StreamPrintServiceFactory
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileReader
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileWriter
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.SoundbankReader
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileReader
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileWriter
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
- src/java.desktop/share/classes/META-INF/services/sun.datatransfer.DesktopDatatransferService
! src/java.httpclient/share/classes/java/net/http/Log.java
- src/java.logging/share/classes/META-INF/services/jdk.internal.logger.DefaultLoggerFinder
- src/java.security.jgss/share/classes/META-INF/services/sun.security.ssl.ClientKeyExchangeService
- src/jdk.accessibility/windows/classes/META-INF/services/javax.accessibility.AccessibilityProvider
- src/jdk.attach/share/classes/META-INF/services/com.sun.tools.attach.spi.AttachProvider
- src/jdk.charsets/share/classes/META-INF/services/java.nio.charset.spi.CharsetProvider
- src/jdk.dev/share/classes/jdk/tools/jimage/ExtractedImage.java
- src/jdk.dev/share/classes/jdk/tools/jimage/JImageTask.java
- src/jdk.dev/share/classes/jdk/tools/jimage/Main.java
- src/jdk.dev/share/classes/jdk/tools/jimage/TaskHelper.java
- src/jdk.dev/share/classes/jdk/tools/jimage/resources/jimage.properties
- src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.Connector
- src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.spi.TransportService
- src/jdk.jvmstat.rmi/share/classes/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
- src/jdk.jvmstat/share/classes/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
- src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
- src/jdk.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider
- src/jdk.naming.dns/share/classes/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- src/jdk.zipfs/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider
- test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
- test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java/net/MyDatagramSocketImplFactory.java
+ test/java/net/httpclient/EchoHandler.java
! test/java/net/httpclient/LightWeightHttpServer.java
! test/java/net/httpclient/ManyRequests.java
! test/java/net/httpclient/RequestBodyTest.java
! test/java/net/httpclient/SmokeTest.java
+ test/java/net/httpclient/http2/BasicTest.java
+ test/java/net/httpclient/http2/ServerPush.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/BodyInputStream.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/BodyOutputStream.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/EchoHandler.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2Handler.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestExchange.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServer.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServerConnection.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/OutgoingPushPromise.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/PushHandler.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/Queue.java
+ test/java/net/httpclient/http2/java.httpclient/java/net/http/TestUtil.java
- test/java/net/httpclient/http2/java/net/http/BasicTest.java
- test/java/net/httpclient/http2/java/net/http/ServerPush.java
- test/java/net/httpclient/whitebox/TEST.properties
- test/java/net/httpclient/whitebox/java/net/http/SelectorTest.java
- test/java/util/stream/bootlib/TEST.properties
- test/javax/swing/JScrollPane/8033000/bug8033000.java
- test/jdk/internal/jimage/ExecutableTest.java
- test/jdk/internal/jimage/JImageTest.java
- test/jdk/internal/jimage/VerifyJimage.java
- test/sun/security/krb5/config/NamingManager.java
- test/sun/security/krb5/config/dns.sh
- test/sun/security/mscapi/IsSunMSCAPIAvailable.sh
- test/sun/security/ssl/StatusStapling/BogusStatusRequest.java
- test/sun/security/ssl/StatusStapling/CertStatusReqExtensionTests.java
- test/sun/security/ssl/StatusStapling/CertStatusReqItemV2Tests.java
- test/sun/security/ssl/StatusStapling/CertStatusReqListV2ExtensionTests.java
- test/sun/security/ssl/StatusStapling/OCSPStatusRequestTests.java
- test/sun/security/ssl/StatusStapling/StatusResponseManagerTests.java
- test/sun/security/ssl/StatusStapling/TestCase.java
- test/sun/security/ssl/StatusStapling/TestUtils.java
More information about the jdk9-sandbox-changes
mailing list