hg: jdk9/dev/jdk: 2 new changesets

alan.bateman at oracle.com alan.bateman at oracle.com
Tue May 3 11:33:55 UTC 2016


Changeset: 5c412978857d
Author:    alanb
Date:      2016-05-03 09:09 +0100
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/5c412978857d

8154956: Module system implementation refresh (4/2016)
Reviewed-by: alanb, mchung, chegar, redestad
Contributed-by: alan.bateman at oracle.com, mandy.chung at oracle.com, erik.joelsson at oracle.com, chris.hegarty at oracle.com, peter.levart at gmail.com, sundararajan.athijegannathan at oracle.com

! make/Tools.gmk
! make/gendata/GendataBreakIterator.gmk
! make/launcher/Launcher-java.desktop.gmk
! make/launcher/Launcher-java.scripting.gmk
! make/launcher/Launcher-jdk.compiler.gmk
! make/launcher/Launcher-jdk.javadoc.gmk
! make/launcher/Launcher-jdk.jlink.gmk
! make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
! src/java.base/share/classes/java/lang/ClassLoader.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/module/Configuration.java
! src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
! src/java.base/share/classes/java/lang/module/ModuleFinder.java
! src/java.base/share/classes/java/lang/module/ModuleInfo.java
! src/java.base/share/classes/java/lang/module/ModulePath.java
! src/java.base/share/classes/java/lang/module/ModuleReader.java
! src/java.base/share/classes/java/lang/module/ModuleReference.java
! src/java.base/share/classes/java/lang/module/ModuleReferences.java
! src/java.base/share/classes/java/lang/module/Resolver.java
! src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
! src/java.base/share/classes/java/lang/reflect/Layer.java
! src/java.base/share/classes/java/lang/reflect/Module.java
+ src/java.base/share/classes/java/lang/reflect/WeakPairMap.java
! src/java.base/share/classes/java/util/ServiceLoader.java
! src/java.base/share/classes/jdk/internal/loader/BootLoader.java
! src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java
! src/java.base/share/classes/jdk/internal/module/Builder.java
! src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java
- src/java.base/share/classes/jdk/internal/module/Hasher.java
! src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+ src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
! src/java.base/share/classes/jdk/internal/module/ModulePatcher.java
! src/java.base/share/classes/jdk/internal/module/Modules.java
! src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java
! src/java.base/share/classes/jdk/internal/module/SystemModules.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/classes/sun/launcher/resources/launcher.properties
! src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java
! src/jdk.jartool/share/classes/sun/tools/jar/Main.java
! src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
! src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
+ src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OptimizationPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
! src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties
! test/TEST.ROOT
! test/com/sun/corba/5036554/TestCorbaBug.sh
! test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java
! test/com/sun/corba/se/impl/io/HookPutFieldsTest.java
! test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java
! test/com/sun/net/httpserver/bugs/B6373555.java
! test/java/lang/invoke/VarargsArrayTest.java
! test/java/lang/module/ModuleFinderTest.java
+ test/java/lang/reflect/WeakPairMap/Driver.java
+ test/java/lang/reflect/WeakPairMap/java.base/java/lang/reflect/WeakPairMapTest.java
! test/java/util/ResourceBundle/Bug6299235Test.sh
! test/javax/crypto/Cipher/CipherStreamClose.java
! test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java
! test/javax/smartcardio/CommandAPDUTest.java
! test/javax/smartcardio/HistoricalBytes.java
! test/javax/smartcardio/ResponseAPDUTest.java
! test/javax/smartcardio/Serialize.java
! test/javax/smartcardio/TerminalFactorySpiTest.java
! test/javax/smartcardio/TestCardPermission.java
! test/javax/smartcardio/TestCommandAPDU.java
+ test/javax/transaction/testng/Driver.java
- test/javax/transaction/testng/TEST.properties
! test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java
! test/javax/xml/jaxp/common/8035437/run.sh
! test/javax/xml/soap/XmlTest.java
! test/javax/xml/soap/spi/SAAJFactoryTest.java
! test/javax/xml/ws/8043129/MailTest.java
! test/javax/xml/ws/clientjar/TestWsImport.java
! test/javax/xml/ws/publish/WSTest.java
! test/javax/xml/ws/xsanymixed/Test.java
! test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java
! test/sun/security/provider/PolicyFile/Modules.java
! test/tools/jar/modularJar/Basic.java
! test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java
! test/tools/jlink/ImageFileCreatorTest.java
! test/tools/jlink/IntegrationTest.java
! test/tools/jlink/JLink2Test.java
! test/tools/jlink/JLinkTest.java
- test/tools/jlink/hashes/HashesTest.java
- test/tools/jlink/hashes/newsrc/m2/module-info.java
- test/tools/jlink/hashes/newsrc/m2/org/m2/Util.java
- test/tools/jlink/hashes/newsrc/not_matched/module-info.java
- test/tools/jlink/hashes/newsrc/not_matched/org/not_matched/Name.java
- test/tools/jlink/hashes/src/m1/module-info.java
- test/tools/jlink/hashes/src/m1/org/m1/Main.java
- test/tools/jlink/hashes/src/m2/module-info.java
- test/tools/jlink/hashes/src/m2/org/m2/Util.java
- test/tools/jlink/hashes/src/not_matched/module-info.java
- test/tools/jlink/hashes/src/not_matched/org/not_matched/Name.java
! test/tools/jlink/plugins/FileCopierPluginTest.java
! test/tools/jmod/JmodNegativeTest.java
+ test/tools/jmod/hashes/HashesTest.java
+ test/tools/jmod/hashes/src/m1/module-info.java
+ test/tools/jmod/hashes/src/m1/org/m1/Main.java
+ test/tools/jmod/hashes/src/m2/module-info.java
+ test/tools/jmod/hashes/src/m2/org/m2/Util.java
+ test/tools/jmod/hashes/src/m3/module-info.java
+ test/tools/jmod/hashes/src/m3/org/m3/Name.java
+ test/tools/jmod/hashes/src/org.bar/module-info.java
+ test/tools/jmod/hashes/src/org.foo/module-info.java
! test/tools/launcher/ToolsOpts.java
! test/tools/launcher/modules/addmods/AddModsTest.java
- test/tools/launcher/modules/addmods/src/app/Main.java
- test/tools/launcher/modules/addmods/src/lib/jdk/lib/Util.java
- test/tools/launcher/modules/addmods/src/lib/module-info.java
+ test/tools/launcher/modules/addmods/src/logger/logger/Logger.java
+ test/tools/launcher/modules/addmods/src/logger/module-info.java
+ test/tools/launcher/modules/addmods/src/test/module-info.java
+ test/tools/launcher/modules/addmods/src/test/test/Main.java
! test/tools/launcher/modules/addreads/AddReadsTest.java
! test/tools/launcher/modules/patch/PatchTest.java
! test/tools/lib/tests/JImageGenerator.java

Changeset: a8818f3e8c52
Author:    alanb
Date:      2016-05-03 11:45 +0100
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/a8818f3e8c52

Merge

! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/module/ModuleFinder.java
- src/java.base/share/classes/jdk/internal/module/Hasher.java
! src/java.base/share/classes/module-info.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java
- test/javax/transaction/testng/TEST.properties
- test/tools/jlink/hashes/HashesTest.java
- test/tools/jlink/hashes/newsrc/m2/module-info.java
- test/tools/jlink/hashes/newsrc/m2/org/m2/Util.java
- test/tools/jlink/hashes/newsrc/not_matched/module-info.java
- test/tools/jlink/hashes/newsrc/not_matched/org/not_matched/Name.java
- test/tools/jlink/hashes/src/m1/module-info.java
- test/tools/jlink/hashes/src/m1/org/m1/Main.java
- test/tools/jlink/hashes/src/m2/module-info.java
- test/tools/jlink/hashes/src/m2/org/m2/Util.java
- test/tools/jlink/hashes/src/not_matched/module-info.java
- test/tools/jlink/hashes/src/not_matched/org/not_matched/Name.java
- test/tools/launcher/modules/addmods/src/app/Main.java
- test/tools/launcher/modules/addmods/src/lib/jdk/lib/Util.java
- test/tools/launcher/modules/addmods/src/lib/module-info.java



More information about the jdk9-dev-changes mailing list