hg: jigsaw/jake/jdk: Move Module and Layer to java.lang

alan.bateman at oracle.com alan.bateman at oracle.com
Tue Mar 28 12:28:27 UTC 2017


Changeset: 1251fd9753f0
Author:    alanb
Date:      2017-03-28 13:27 +0100
URL:       http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/1251fd9753f0

Move Module and Layer to java.lang

! make/mapfiles/libjava/mapfile-vers
! src/java.base/share/classes/java/io/ObjectInputFilter.java
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/ClassLoader.java
+ src/java.base/share/classes/java/lang/LayerInstantiationException.java
+ src/java.base/share/classes/java/lang/Module.java
+ src/java.base/share/classes/java/lang/ModuleLayer.java
! src/java.base/share/classes/java/lang/NamedPackage.java
! src/java.base/share/classes/java/lang/Package.java
! src/java.base/share/classes/java/lang/SecurityManager.java
! src/java.base/share/classes/java/lang/StackTraceElement.java
! src/java.base/share/classes/java/lang/System.java
+ src/java.base/share/classes/java/lang/WeakPairMap.java
! src/java.base/share/classes/java/lang/invoke/MemberName.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.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/Resolver.java
! src/java.base/share/classes/java/lang/module/package-info.java
- src/java.base/share/classes/java/lang/reflect/Layer.java
- src/java.base/share/classes/java/lang/reflect/LayerInstantiationException.java
- src/java.base/share/classes/java/lang/reflect/Module.java
! src/java.base/share/classes/java/lang/reflect/Proxy.java
- src/java.base/share/classes/java/lang/reflect/WeakPairMap.java
! src/java.base/share/classes/java/lang/reflect/package-info.java
! src/java.base/share/classes/java/util/ResourceBundle.java
! src/java.base/share/classes/java/util/ServiceLoader.java
! src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java
! src/java.base/share/classes/javax/crypto/JceSecurityManager.java
! src/java.base/share/classes/jdk/internal/loader/BootLoader.java
! src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
! src/java.base/share/classes/jdk/internal/loader/Loader.java
! src/java.base/share/classes/jdk/internal/loader/LoaderPool.java
! src/java.base/share/classes/jdk/internal/logger/DefaultLoggerFinder.java
! src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java
! src/java.base/share/classes/jdk/internal/misc/JavaUtilResourceBundleAccess.java
! src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
! src/java.base/share/classes/jdk/internal/module/IllegalAccessLogger.java
! src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.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/sun/invoke/util/VerifyAccess.java
! src/java.base/share/classes/sun/launcher/LauncherHelper.java
! src/java.base/share/classes/sun/reflect/misc/MethodUtil.java
! src/java.base/share/native/libjava/Module.c
! src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
! src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
! src/java.desktop/share/classes/javax/swing/text/PlainView.java
! src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
! src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
! src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
! src/java.instrument/share/classes/sun/instrument/TransformerManager.java
! src/java.instrument/share/native/libinstrument/JPLISAgent.h
! src/java.logging/share/classes/java/util/logging/Level.java
! src/java.logging/share/classes/java/util/logging/LogManager.java
! src/java.logging/share/classes/java/util/logging/Logger.java
! src/java.logging/share/classes/sun/util/logging/internal/LoggingProviderImpl.java
! src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
! src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
! src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
! src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java
! src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java
! src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java
! src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java
! src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
! src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java
! src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginRepository.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java
! test/java/awt/TrayIcon/SystemTrayIconHelper.java
! test/java/awt/patchlib/java.desktop/java/awt/Helper.java
! test/java/awt/regtesthelpers/Util.java
! test/java/lang/Class/GetModuleTest.java
! test/java/lang/Class/forName/modules/TestLayer.java
! test/java/lang/Class/forName/modules/TestMain.java
! test/java/lang/Class/forName/modules/src/m2/p2/test/Main.java
! test/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java
! test/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java
! test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
! test/java/lang/Class/getResource/Main.java
! test/java/lang/ClassLoader/getResource/automaticmodules/Main.java
! test/java/lang/ClassLoader/getResource/modules/Main.java
+ test/java/lang/ModuleLayer/BasicLayerTest.java
+ test/java/lang/ModuleLayer/LayerAndLoadersTest.java
+ test/java/lang/ModuleLayer/LayerControllerTest.java
+ test/java/lang/ModuleLayer/layertest/Test.java
+ test/java/lang/ModuleLayer/src/m1/module-info.java
+ test/java/lang/ModuleLayer/src/m1/p/Main.java
+ test/java/lang/ModuleLayer/src/m1/p/Service.java
+ test/java/lang/ModuleLayer/src/m2/module-info.java
+ test/java/lang/ModuleLayer/src/m2/q/Hello.java
+ test/java/lang/ModuleLayer/src/m3/module-info.java
+ test/java/lang/ModuleLayer/src/m3/w/Hello.java
+ test/java/lang/ModuleLayer/src/m4/impl/ServiceImpl.java
+ test/java/lang/ModuleLayer/src/m4/module-info.java
+ test/java/lang/ModuleTests/AddExportsTest.java
+ test/java/lang/ModuleTests/AnnotationsTest.java
+ test/java/lang/ModuleTests/BasicModuleTest.java
+ test/java/lang/ModuleTests/WithSecurityManager.java
+ test/java/lang/ModuleTests/access/AccessTest.java
+ test/java/lang/ModuleTests/access/src/target/module-info.java
+ test/java/lang/ModuleTests/access/src/target/p1/Helper.java
+ test/java/lang/ModuleTests/access/src/target/p1/Public.java
+ test/java/lang/ModuleTests/access/src/target/p2/NonPublic.java
+ test/java/lang/ModuleTests/access/src/target/q1/Public.java
+ test/java/lang/ModuleTests/access/src/target/q2/NonPublic.java
+ test/java/lang/ModuleTests/access/src/test/module-info.java
+ test/java/lang/ModuleTests/access/src/test/test/Main.java
+ test/java/lang/ModuleTests/addXXX/Driver.java
+ test/java/lang/ModuleTests/addXXX/m1/module-info.java
+ test/java/lang/ModuleTests/addXXX/m1/p1/C.java
+ test/java/lang/ModuleTests/addXXX/m2/module-info.java
+ test/java/lang/ModuleTests/addXXX/m2/p2/C.java
+ test/java/lang/ModuleTests/addXXX/m2/p2/internal/C.java
+ test/java/lang/ModuleTests/addXXX/m3/module-info.java
+ test/java/lang/ModuleTests/addXXX/m3/p3/C.java
+ test/java/lang/ModuleTests/addXXX/m4/module-info.java
+ test/java/lang/ModuleTests/addXXX/m4/p4/C.java
+ test/java/lang/ModuleTests/addXXX/test/module-info.java
+ test/java/lang/ModuleTests/addXXX/test/test/C.java
+ test/java/lang/ModuleTests/addXXX/test/test/Main.java
+ test/java/lang/ModuleTests/addXXX/test/test/Service.java
+ test/java/lang/ModuleTests/allow.policy
+ test/java/lang/ModuleTests/annotation/Basic.java
+ test/java/lang/ModuleTests/annotation/src/m/module-info.java
+ test/java/lang/ModuleTests/annotation/src/m/p/annotation/Bar.java
+ test/java/lang/ModuleTests/annotation/src/m/p/annotation/Baz.java
+ test/java/lang/ModuleTests/annotation/src/m/p/annotation/Foo.java
! test/java/lang/SecurityManager/CheckPackageAccess.java
! test/java/lang/SecurityManager/CheckSecurityProvider.java
! test/java/lang/SecurityManager/modules/Test.java
! test/java/lang/StackTraceElement/PublicConstructor.java
! test/java/lang/StackTraceElement/lib/m1/com/app/Utils.java
! test/java/lang/System/Logger/custom/CustomLoggerTest.java
! test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinder.java
! test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/TestLoggerFinder.java
! test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java
! test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java
! test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java
! test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java
! test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
! test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java
! test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
! test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java
! test/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java
! test/java/lang/System/LoggerFinder/internal/backend/LoggerFinderBackendTest.java
! test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
+ test/java/lang/WeakPairMap/Driver.java
+ test/java/lang/WeakPairMap/java.base/java/lang/WeakPairMapTest.java
! test/java/lang/instrument/ATransformerManagementTestCase.java
! test/java/lang/instrument/BootstrapClassPathAgent.java
! test/java/lang/instrument/BootstrapClassPathTest.java
! test/java/lang/instrument/RedefineClassWithNativeMethodAgent.java
! test/java/lang/instrument/RedefineModuleAgent.java
! test/java/lang/instrument/RedefineModuleTest.java
! test/java/lang/instrument/RetransformAgent.java
! test/java/lang/instrument/SimpleIdentityTransformer.java
! test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java
! test/java/lang/invoke/modules/m1/p1/Main.java
! test/java/lang/module/AutomaticModulesTest.java
! test/java/lang/module/ConfigurationTest.java
! test/java/lang/module/ModuleDescriptorTest.java
! test/java/lang/module/ModuleReader/ModuleReaderTest.java
! test/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
- test/java/lang/reflect/Layer/BasicLayerTest.java
- test/java/lang/reflect/Layer/LayerAndLoadersTest.java
- test/java/lang/reflect/Layer/LayerControllerTest.java
- test/java/lang/reflect/Layer/layertest/Test.java
- test/java/lang/reflect/Layer/src/m1/module-info.java
- test/java/lang/reflect/Layer/src/m1/p/Main.java
- test/java/lang/reflect/Layer/src/m1/p/Service.java
- test/java/lang/reflect/Layer/src/m2/module-info.java
- test/java/lang/reflect/Layer/src/m2/q/Hello.java
- test/java/lang/reflect/Layer/src/m3/module-info.java
- test/java/lang/reflect/Layer/src/m3/w/Hello.java
- test/java/lang/reflect/Layer/src/m4/impl/ServiceImpl.java
- test/java/lang/reflect/Layer/src/m4/module-info.java
- test/java/lang/reflect/Module/AddExportsTest.java
- test/java/lang/reflect/Module/AnnotationsTest.java
- test/java/lang/reflect/Module/BasicModuleTest.java
- test/java/lang/reflect/Module/WithSecurityManager.java
- test/java/lang/reflect/Module/access/AccessTest.java
- test/java/lang/reflect/Module/access/src/target/module-info.java
- test/java/lang/reflect/Module/access/src/target/p1/Helper.java
- test/java/lang/reflect/Module/access/src/target/p1/Public.java
- test/java/lang/reflect/Module/access/src/target/p2/NonPublic.java
- test/java/lang/reflect/Module/access/src/target/q1/Public.java
- test/java/lang/reflect/Module/access/src/target/q2/NonPublic.java
- test/java/lang/reflect/Module/access/src/test/module-info.java
- test/java/lang/reflect/Module/access/src/test/test/Main.java
- test/java/lang/reflect/Module/addXXX/Driver.java
- test/java/lang/reflect/Module/addXXX/m1/module-info.java
- test/java/lang/reflect/Module/addXXX/m1/p1/C.java
- test/java/lang/reflect/Module/addXXX/m2/module-info.java
- test/java/lang/reflect/Module/addXXX/m2/p2/C.java
- test/java/lang/reflect/Module/addXXX/m2/p2/internal/C.java
- test/java/lang/reflect/Module/addXXX/m3/module-info.java
- test/java/lang/reflect/Module/addXXX/m3/p3/C.java
- test/java/lang/reflect/Module/addXXX/m4/module-info.java
- test/java/lang/reflect/Module/addXXX/m4/p4/C.java
- test/java/lang/reflect/Module/addXXX/test/module-info.java
- test/java/lang/reflect/Module/addXXX/test/test/C.java
- test/java/lang/reflect/Module/addXXX/test/test/Main.java
- test/java/lang/reflect/Module/addXXX/test/test/Service.java
- test/java/lang/reflect/Module/allow.policy
- test/java/lang/reflect/Module/annotation/Basic.java
- test/java/lang/reflect/Module/annotation/src/m/module-info.java
- test/java/lang/reflect/Module/annotation/src/m/p/annotation/Bar.java
- test/java/lang/reflect/Module/annotation/src/m/p/annotation/Baz.java
- test/java/lang/reflect/Module/annotation/src/m/p/annotation/Foo.java
! test/java/lang/reflect/Proxy/ProxyClassAccessTest.java
! test/java/lang/reflect/Proxy/ProxyForMethodHandle.java
! test/java/lang/reflect/Proxy/ProxyLayerTest.java
! test/java/lang/reflect/Proxy/ProxyModuleMapping.java
! test/java/lang/reflect/Proxy/src/test/jdk/test/Main.java
! test/java/lang/reflect/Proxy/src/test/jdk/test/ProxyTest.java
- test/java/lang/reflect/WeakPairMap/Driver.java
- test/java/lang/reflect/WeakPairMap/java.base/java/lang/reflect/WeakPairMapTest.java
! test/java/security/Provider/DefaultProviderList.java
! test/java/util/ResourceBundle/modules/cache/src/test/jdk/test/Main.java
! test/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java
! test/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithNoModuleArg.java
! test/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithUnnamedModuleArg.java
! test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/test/Main.java
! test/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithNoModuleArg.java
! test/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithUnnamedModuleArg.java
! test/java/util/ServiceLoader/modules/BadProvidersTest.java
! test/java/util/ServiceLoader/modules/Basic.java
! test/java/util/logging/LocalizedLevelName.java
! test/java/util/logging/modules/pkgs/p3/test/ResourceBundleTest.java
! test/java/util/spi/ResourceBundleControlProvider/test/jdk/test/ResourceBundleDelegate.java
! test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java
! test/jdk/internal/jimage/JImageOpenTest.java
! test/jdk/modules/etc/JdkQualifiedExportTest.java
! test/jdk/modules/etc/VerifyModuleDelegation.java
! test/jdk/modules/incubator/src/cp/listmods/ListModules.java
! test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java
! test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java
! test/jdk/modules/open/Basic.java
! test/jdk/modules/scenarios/automaticmodules/src/basictest/test/Main.java
! test/jdk/modules/scenarios/automaticmodules/src/sptest/test/Main.java
! test/jdk/modules/scenarios/container/src/container/container/Main.java
! test/sun/management/LoggingTest/test.loggerfinder/test/loggerfinder/TestLoggerFinder.java
! test/sun/tools/jconsole/ResourceCheckTest.java
! test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java
! test/tools/jlink/JLink2Test.java
! test/tools/jlink/JLinkTest.java
! test/tools/jlink/basic/src/test/jdk/test/Test.java
! test/tools/jlink/plugins/PluginsNegativeTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Main.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/m5/p5/Main.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java
! test/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java
! test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java



More information about the jigsaw-dev mailing list