changeset 42844:e2c5db29719a

Merge
author duke
date Wed, 05 Jul 2017 22:37:06 +0200
parents a8d83044a192 56b2ee1d97ee
children 17469f16fbb4
files THIRD_PARTY_README hotspot/make/BuildHotspot.gmk hotspot/src/share/vm/code/codeCacheExtensions.hpp hotspot/src/share/vm/code/codeCacheExtensions_ext.hpp hotspot/src/share/vm/gc/g1/bufferingOopClosure.cpp hotspot/src/share/vm/runtime/semaphore.cpp jaxp/THIRD_PARTY_README jaxws/THIRD_PARTY_README jdk/THIRD_PARTY_README jdk/make/copy/Copy-jdk.crypto.pkcs11.gmk jdk/make/launcher/Launcher-jdk.pack200.gmk jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk jdk/make/lib/Lib-jdk.pack200.gmk jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java jdk/src/java.base/share/classes/java/lang/module/ModulePath.java jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java jdk/src/java.compact1/share/classes/module-info.java jdk/src/java.compact2/share/classes/module-info.java jdk/src/java.compact3/share/classes/module-info.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/module-info.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/KeyCache.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DHKeyFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Digest.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECKeyFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyAgreement.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyGenerator.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Mac.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecureRandom.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Util.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Session.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SessionManager.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/TemplateManager.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Token.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Constants.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Functions.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h jdk/src/jdk.crypto.pkcs11/solaris/conf/security/sunpkcs11-solaris.cfg jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java jdk/src/jdk.pack200/share/classes/module-info.java jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp jdk/src/jdk.pack200/share/native/common-unpack/bands.h jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp jdk/src/jdk.pack200/share/native/common-unpack/bytes.h jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp jdk/src/jdk.pack200/share/native/common-unpack/coding.h jdk/src/jdk.pack200/share/native/common-unpack/constants.h jdk/src/jdk.pack200/share/native/common-unpack/defines.h jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp jdk/src/jdk.pack200/share/native/common-unpack/unpack.h jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp jdk/src/jdk.pack200/share/native/common-unpack/utils.h jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp jdk/src/jdk.pack200/share/native/common-unpack/zip.h jdk/src/jdk.pack200/share/native/libunpack/jni.cpp jdk/src/jdk.pack200/share/native/unpack200/main.cpp jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest jdk/test/java/rmi/testlibrary/RegistryRunner_Stub.java jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/Makefile jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/UserControlProvider.java jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/UserXMLControl.java jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/java.util.spi.ResourceBundleControlProvider jdk/test/java/util/spi/ResourceBundleControlProvider/rbcontrolprovider.jar jdk/test/tools/jlink/plugins/FileCopierPluginTest.java nashorn/THIRD_PARTY_README
diffstat 4027 files changed, 529462 insertions(+), 83670 deletions(-) [+]