changeset 42873:8ddcd9d9fc48

Merge
author coleenp
date Mon, 19 Dec 2016 14:12:33 +0000
parents fde06567a6fb c89e1f0a084e
children bac62054c0b6
files hotspot/test/runtime/modules/JVMCanReadModule.java hotspot/test/runtime/modules/JVMIsExportedToModule.java hotspot/test/serviceability/jdwp/JdwpCanReadCmd.java hotspot/test/serviceability/jdwp/JdwpCanReadReply.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/COPYRIGHT.html jdk/src/java.base/share/classes/java/lang/module/Dependence.java jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java jdk/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleProviderSupport.java jdk/src/java.base/unix/native/libjli/ergo.c jdk/src/java.base/unix/native/libjli/ergo.h jdk/src/java.base/unix/native/libjli/ergo_i586.c jdk/src/java.httpclient/share/classes/java/net/http/AsyncConnection.java jdk/src/java.httpclient/share/classes/java/net/http/AsyncEvent.java jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLConnection.java jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java jdk/src/java.httpclient/share/classes/java/net/http/BufferHandler.java jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferConsumer.java jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferGenerator.java jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java jdk/src/java.httpclient/share/classes/java/net/http/ConnectionPool.java jdk/src/java.httpclient/share/classes/java/net/http/ContinuationFrame.java jdk/src/java.httpclient/share/classes/java/net/http/CookieFilter.java jdk/src/java.httpclient/share/classes/java/net/http/DataFrame.java jdk/src/java.httpclient/share/classes/java/net/http/ErrorFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Exchange.java jdk/src/java.httpclient/share/classes/java/net/http/ExchangeImpl.java jdk/src/java.httpclient/share/classes/java/net/http/ExecutorWrapper.java jdk/src/java.httpclient/share/classes/java/net/http/FilterFactory.java jdk/src/java.httpclient/share/classes/java/net/http/FrameReader.java jdk/src/java.httpclient/share/classes/java/net/http/GoAwayFrame.java jdk/src/java.httpclient/share/classes/java/net/http/HeaderFilter.java jdk/src/java.httpclient/share/classes/java/net/http/HeaderFrame.java jdk/src/java.httpclient/share/classes/java/net/http/HeaderParser.java jdk/src/java.httpclient/share/classes/java/net/http/HeadersFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Http1Exchange.java jdk/src/java.httpclient/share/classes/java/net/http/Http1Request.java jdk/src/java.httpclient/share/classes/java/net/http/Http1Response.java jdk/src/java.httpclient/share/classes/java/net/http/Http2ClientImpl.java jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java jdk/src/java.httpclient/share/classes/java/net/http/Http2Frame.java jdk/src/java.httpclient/share/classes/java/net/http/HttpClient.java jdk/src/java.httpclient/share/classes/java/net/http/HttpClientBuilderImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpConnection.java jdk/src/java.httpclient/share/classes/java/net/http/HttpHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/HttpHeadersImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpRedirectImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpRequest.java jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestBuilderImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpResponse.java jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpTimeoutException.java jdk/src/java.httpclient/share/classes/java/net/http/ImmutableHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/Log.java jdk/src/java.httpclient/share/classes/java/net/http/MultiExchange.java jdk/src/java.httpclient/share/classes/java/net/http/OutgoingHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/Pair.java jdk/src/java.httpclient/share/classes/java/net/http/PingFrame.java jdk/src/java.httpclient/share/classes/java/net/http/PlainHttpConnection.java jdk/src/java.httpclient/share/classes/java/net/http/PlainProxyConnection.java jdk/src/java.httpclient/share/classes/java/net/http/PlainTunnelingConnection.java jdk/src/java.httpclient/share/classes/java/net/http/PriorityFrame.java jdk/src/java.httpclient/share/classes/java/net/http/PushPromiseFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Queue.java jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java jdk/src/java.httpclient/share/classes/java/net/http/RawChannelImpl.java jdk/src/java.httpclient/share/classes/java/net/http/RedirectFilter.java jdk/src/java.httpclient/share/classes/java/net/http/ResetFrame.java jdk/src/java.httpclient/share/classes/java/net/http/ResponseContent.java jdk/src/java.httpclient/share/classes/java/net/http/ResponseHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/SSLConnection.java jdk/src/java.httpclient/share/classes/java/net/http/SSLDelegate.java jdk/src/java.httpclient/share/classes/java/net/http/SSLTunnelConnection.java jdk/src/java.httpclient/share/classes/java/net/http/SettingsFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Stream.java jdk/src/java.httpclient/share/classes/java/net/http/TimeoutEvent.java jdk/src/java.httpclient/share/classes/java/net/http/Utils.java jdk/src/java.httpclient/share/classes/java/net/http/WS.java jdk/src/java.httpclient/share/classes/java/net/http/WSBuilder.java jdk/src/java.httpclient/share/classes/java/net/http/WSCharsetToolkit.java jdk/src/java.httpclient/share/classes/java/net/http/WSDisposable.java jdk/src/java.httpclient/share/classes/java/net/http/WSFrame.java jdk/src/java.httpclient/share/classes/java/net/http/WSFrameConsumer.java jdk/src/java.httpclient/share/classes/java/net/http/WSMessageConsumer.java jdk/src/java.httpclient/share/classes/java/net/http/WSMessageSender.java jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java jdk/src/java.httpclient/share/classes/java/net/http/WSOutgoingMessage.java jdk/src/java.httpclient/share/classes/java/net/http/WSProtocolException.java jdk/src/java.httpclient/share/classes/java/net/http/WSReceiver.java jdk/src/java.httpclient/share/classes/java/net/http/WSShared.java jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java jdk/src/java.httpclient/share/classes/java/net/http/WSSignalHandler.java jdk/src/java.httpclient/share/classes/java/net/http/WSTransmitter.java jdk/src/java.httpclient/share/classes/java/net/http/WSUtils.java jdk/src/java.httpclient/share/classes/java/net/http/WSWriter.java jdk/src/java.httpclient/share/classes/java/net/http/WebSocket.java jdk/src/java.httpclient/share/classes/java/net/http/WebSocketHandshakeException.java jdk/src/java.httpclient/share/classes/java/net/http/WindowUpdateFrame.java jdk/src/java.httpclient/share/classes/java/net/http/package-info.java jdk/src/java.httpclient/share/classes/module-info.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/BinaryRepresentationWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/BulkSizeUpdateWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/Decoder.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/DecodingCallback.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/Encoder.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/HeaderTable.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/Huffman.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/ISO_8859_1.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/IndexNameValueWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/IndexedWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/IntegerReader.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/IntegerWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/LiteralNeverIndexedWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/LiteralWithIndexingWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/LiteralWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/SizeUpdateWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/StringReader.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/StringWriter.java jdk/src/java.httpclient/share/classes/sun/net/httpclient/hpack/package-info.java jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.c jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_GR.properties jdk/test/java/awt/Focus/DisposedWindow/DisposeDialogNotActivateOwnerTest/DisposeDialogNotActivateOwnerTest.html jdk/test/java/lang/Class/getResource/src/m3/module-info.java jdk/test/java/lang/Class/getResource/src/m3/p3/Main.java jdk/test/java/lang/ClassLoader/getResource/modules/src/m3/module-info.java jdk/test/java/lang/ClassLoader/getResource/modules/src/m3/p3/Main.java jdk/test/java/lang/reflect/Module/access/src/target/p/Exported.java jdk/test/java/lang/reflect/Module/access/src/target/p/Helper.java jdk/test/java/lang/reflect/Module/access/src/target/q/Internal.java jdk/test/java/net/Authenticator/B4933582.sh jdk/test/java/net/InetAddress/ptr/lookup.sh jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh jdk/test/java/net/httpclient/BasicWebSocketAPITest.java jdk/test/java/net/httpclient/HttpUtils.java jdk/test/java/net/httpclient/QuickResponses.java jdk/test/java/net/httpclient/TimeoutTest.java jdk/test/java/net/httpclient/http2/TEST.properties jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/BodyInputStream.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/BodyOutputStream.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/EchoHandler.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2Handler.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestExchange.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServer.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServerConnection.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/OutgoingPushPromise.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/PushHandler.java jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/TestUtil.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/BinaryPrimitivesTest.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/BuffersTestingKit.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/CircularBufferTest.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/DecoderTest.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/EncoderTest.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/HeaderTableTest.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/HuffmanTest.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/SpecHelper.java jdk/test/java/net/httpclient/http2/java.httpclient/sun/net/httpclient/hpack/TestHelper.java jdk/test/java/net/httpclient/whitebox/java.httpclient/java/net/http/SelectorTest.java jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java jdk/test/java/util/Locale/LocaleTestFmwk.java jdk/test/java/util/ServiceLoader/Basic.java jdk/test/java/util/ServiceLoader/FooProvider1.java jdk/test/java/util/ServiceLoader/FooProvider2.java jdk/test/java/util/ServiceLoader/FooProvider3.java jdk/test/java/util/ServiceLoader/FooService.java jdk/test/java/util/ServiceLoader/Load.java jdk/test/java/util/ServiceLoader/basic.sh jdk/test/java/util/ServiceLoader/modules/MiscTests.java jdk/test/java/util/ServiceLoader/modules/ServicesTest.java jdk/test/java/util/ServiceLoader/modules/src/bananascript/module-info.java jdk/test/java/util/ServiceLoader/modules/src/bananascript/org/banana/BananaScript.java jdk/test/java/util/ServiceLoader/modules/src/bananascript/org/banana/BananaScriptEngineFactory.java jdk/test/java/util/ServiceLoader/modules/src/test/module-info.java jdk/test/java/util/ServiceLoader/modules/src/test/test/Main.java jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastTest.java jdk/test/javax/net/ssl/templates/SSLSocketSample.java jdk/test/javax/net/ssl/templates/SSLTest.java jdk/test/sun/net/www/http/HttpClient/RetryPost.sh jdk/test/sun/security/tools/keytool/readjar.sh jdk/test/sun/tools/jps/JpsBase.java jdk/test/sun/tools/jps/TestJpsClass.java jdk/test/sun/tools/jps/TestJpsJar.java jdk/test/sun/tools/jps/TestJpsJarRelative.java langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/MainClass_attribute.java langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java langtools/test/jdk/javadoc/doclet/testOrdering/order/MethodOrder.java langtools/test/tools/javac/diags/examples/BadNameForOption.java langtools/test/tools/javac/diags/examples/DuplicateExports/exported/Class.java langtools/test/tools/javac/diags/examples/DuplicateExports/module-info.java langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/LeaksNotAccessibleNotRequiredPublic.java langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/api1/Api1.java langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/module-info.java langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/api2/Api2.java langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/module-info.java langtools/test/tools/javac/modules/RequiresPublicTest.java langtools/test/tools/jdeps/modules/src/m1/module-info.java langtools/test/tools/jdeps/modules/src/m1/p1/Goo.java langtools/test/tools/jdeps/modules/src/m1/p1/Lib.java langtools/test/tools/jdeps/modules/src/m1/p1/S.java langtools/test/tools/jdeps/modules/src/m1/p1/internal/Impl.java langtools/test/tools/jdeps/modules/src/m2/module-info.java langtools/test/tools/jdeps/modules/src/m2/p2/Bar.java langtools/test/tools/jdeps/modules/src/m2/p2/internal/T2.java langtools/test/tools/jdeps/modules/src/m3/module-info.java langtools/test/tools/jdeps/modules/src/m3/p3/Foo.java langtools/test/tools/jdeps/modules/src/m3/p3/Main.java langtools/test/tools/jdeps/modules/src/m6/module-info.java langtools/test/tools/jdeps/modules/src/m6/p6/indirect/UnsafeRef.java langtools/test/tools/jdeps/modules/src/m6/p6/safe/Lib.java langtools/test/tools/jdeps/modules/src/m7/module-info.java langtools/test/tools/jdeps/modules/src/m7/p7/Main.java make/CreateHgtipFiles.gmk make/common/CORE_PKGS.gmk make/common/NON_CORE_PKGS.gmk nashorn/test/script/currently-failing/JDK-8130127.js nashorn/test/script/currently-failing/JDK-8130127.js.EXPECTED
diffstat 5164 files changed, 482686 insertions(+), 61666 deletions(-) [+]