hg: jdk9/dev/jdk: 2 new changesets

chris.hegarty at oracle.com chris.hegarty at oracle.com
Wed Dec 3 19:41:08 UTC 2014 

Changeset: e336cbd8b15e
Author:    chegar
Date:      2014-12-03 14:22 +0000
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/e336cbd8b15e

8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman at oracle.com, alex.buckley at oracle.com, bradford.wetmore at oracle.com, chris.hegarty at oracle.com, erik.joelsson at oracle.com, james.laskey at oracle.com, jonathan.gibbons at oracle.com, karen.kinnear at oracle.com, magnus.ihse.bursie at oracle.com, mandy.chung at oracle.com, mark.reinhold at oracle.com, paul.sandoz at oracle.com, sundararajan.athijegannathan at oracle.com

- make/Bundles.gmk
! make/CompileDemos.gmk
! make/CompileInterimRmic.gmk
! make/CopySamples.gmk
- make/CreateJars.gmk
- make/CreatePolicyJars.gmk
- make/CreateSecurityJars.gmk
- make/Images.gmk
! make/Import.gmk
- make/ProfileNames.gmk
- make/Profiles.gmk
! make/Tools.gmk
! make/UnpackSecurity.gmk
! make/copy/Copy-java.base.gmk
! make/copy/Copy-java.desktop.gmk
! make/copy/Copy-java.logging.gmk
! make/copy/Copy-java.management.gmk
! make/copy/Copy-jdk.crypto.pkcs11.gmk
! make/copy/Copy-jdk.crypto.ucrypto.gmk
! make/copy/Copy-jdk.hprof.agent.gmk
! make/copy/Copy-jdk.jdwp.agent.gmk
! make/copy/CopyCommon.gmk
! make/gendata/Gendata-java.base.gmk
! make/gendata/Gendata-java.desktop.gmk
! make/gendata/Gendata-jdk.dev.gmk
! make/gendata/GendataBlacklistedCerts.gmk
! make/gendata/GendataBreakIterator.gmk
! make/gendata/GendataCommon.gmk
! make/gendata/GendataFontConfig.gmk
! make/gendata/GendataHtml32dtd.gmk
+ make/gendata/GendataPolicyJars.gmk
! make/gendata/GendataTZDB.gmk
! make/gensrc/Gensrc-jdk.charsets.gmk
! make/gensrc/Gensrc-jdk.dev.gmk
! make/gensrc/Gensrc-jdk.jconsole.gmk
! make/gensrc/Gensrc-jdk.jdi.gmk
! make/gensrc/GensrcBuffer.gmk
! make/gensrc/GensrcCLDR.gmk
! make/gensrc/GensrcCharacterData.gmk
! make/gensrc/GensrcCharsetCoder.gmk
! make/gensrc/GensrcCharsetMapping.gmk
! make/gensrc/GensrcExceptions.gmk
! make/gensrc/GensrcIcons.gmk
! make/gensrc/GensrcLocaleData.gmk
! make/gensrc/GensrcMisc.gmk
! make/gensrc/GensrcProperties.gmk
! make/gensrc/GensrcSwing.gmk
! make/gensrc/GensrcX11Wrappers.gmk
! make/launcher/Launcher-java.base.gmk
! make/launcher/Launcher-java.corba.gmk
! make/launcher/Launcher-java.desktop.gmk
! make/launcher/Launcher-java.rmi.gmk
! make/launcher/Launcher-java.scripting.gmk
! make/launcher/Launcher-java.security.jgss.gmk
! make/launcher/Launcher-jdk.compiler.gmk
! make/launcher/Launcher-jdk.dev.gmk
! make/launcher/Launcher-jdk.hotspot.agent.gmk
! make/launcher/Launcher-jdk.javadoc.gmk
! make/launcher/Launcher-jdk.jcmd.gmk
! make/launcher/Launcher-jdk.jconsole.gmk
! make/launcher/Launcher-jdk.jdi.gmk
! make/launcher/Launcher-jdk.jvmstat.gmk
! make/launcher/Launcher-jdk.rmic.gmk
! make/launcher/Launcher-jdk.runtime.gmk
! make/launcher/Launcher-jdk.scripting.nashorn.gmk
! make/launcher/Launcher-jdk.xml.bind.gmk
! make/launcher/Launcher-jdk.xml.ws.gmk
! make/launcher/LauncherCommon.gmk
! make/lib/Awt2dLibraries.gmk
! make/lib/CoreLibraries.gmk
! make/lib/Lib-java.base.gmk
! make/lib/Lib-java.desktop.gmk
! make/lib/Lib-java.instrument.gmk
! make/lib/Lib-java.management.gmk
! make/lib/Lib-java.prefs.gmk
! make/lib/Lib-java.security.jgss.gmk
! make/lib/Lib-java.smartcardio.gmk
! make/lib/Lib-jdk.attach.gmk
! make/lib/Lib-jdk.crypto.ec.gmk
! make/lib/Lib-jdk.crypto.mscapi.gmk
! make/lib/Lib-jdk.crypto.pkcs11.gmk
! make/lib/Lib-jdk.crypto.ucrypto.gmk
! make/lib/Lib-jdk.deploy.osx.gmk
! make/lib/Lib-jdk.hprof.agent.gmk
! make/lib/Lib-jdk.jdi.gmk
! make/lib/Lib-jdk.jdwp.agent.gmk
! make/lib/Lib-jdk.runtime.gmk
! make/lib/Lib-jdk.sctp.gmk
! make/lib/Lib-jdk.security.auth.gmk
! make/lib/LibCommon.gmk
! make/lib/NetworkingLibraries.gmk
! make/lib/NioLibraries.gmk
! make/lib/PlatformLibraries.gmk
! make/lib/SoundLibraries.gmk
! make/mapfiles/libjava/mapfile-vers
! make/mapfiles/libzip/mapfile-vers
- make/profile-includes.txt
- make/profile-rtjar-includes.txt
! make/rmic/Rmic-java.management.gmk
! make/rmic/RmicCommon.gmk
+ make/src/classes/build/tools/module/ImageBuilder.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
! src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java
+ src/java.base/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider
! src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/net/URL.java
! src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
! src/java.base/share/classes/java/nio/file/FileSystems.java
! src/java.base/share/classes/java/nio/file/Files.java
! src/java.base/share/classes/java/security/Security.java
! src/java.base/share/classes/java/util/Currency.java
! src/java.base/share/classes/java/util/ServiceLoader.java
! src/java.base/share/classes/java/util/jar/Attributes.java
! src/java.base/share/classes/java/util/jar/JarFile.java
! src/java.base/share/classes/javax/crypto/JceSecurityManager.java
! src/java.base/share/classes/javax/crypto/ProviderVerifier.java
+ src/java.base/share/classes/jdk/internal/jimage/Archive.java
+ src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
+ src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageFile.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageLocation.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageModules.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageStream.java
+ src/java.base/share/classes/jdk/internal/jimage/ImageStrings.java
+ src/java.base/share/classes/jdk/internal/jimage/PReader.java
+ src/java.base/share/classes/jdk/internal/jimage/PackageModuleMap.java
+ src/java.base/share/classes/jdk/internal/jimage/Resource.java
+ src/java.base/share/classes/jdk/internal/jimage/UTF8String.java
+ src/java.base/share/classes/jdk/internal/jimage/concurrent/ConcurrentPReader.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtDirectoryStream.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributeView.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java
+ src/java.base/share/classes/jdk/internal/jrtfs/JrtUtils.java
+ src/java.base/share/classes/jdk/internal/jrtfs/SystemImages.java
+ src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js
+ src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js
! src/java.base/share/classes/sun/misc/ExtensionDependency.java
! src/java.base/share/classes/sun/misc/ExtensionInfo.java
! src/java.base/share/classes/sun/misc/ExtensionInstallationException.java
! src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java
! src/java.base/share/classes/sun/misc/JarFilter.java
! src/java.base/share/classes/sun/misc/Launcher.java
! src/java.base/share/classes/sun/misc/URLClassPath.java
! src/java.base/share/classes/sun/misc/Version.java.template
! src/java.base/share/classes/sun/net/NetProperties.java
+ src/java.base/share/classes/sun/net/www/protocol/jrt/Handler.java
+ src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java
! src/java.base/share/classes/sun/security/jca/ProviderConfig.java
! src/java.base/share/classes/sun/security/provider/PolicyFile.java
! src/java.base/share/classes/sun/security/provider/PolicyParser.java
! src/java.base/share/classes/sun/util/logging/PlatformLogger.java
! src/java.base/share/conf/security/java.policy
! src/java.base/share/conf/security/java.security
! src/java.base/share/native/libjava/System.c
! src/java.base/share/native/libzip/zip_util.c
! src/java.base/share/native/libzip/zip_util.h
+ src/java.base/unix/native/libjava/ConcurrentPReader_md.c
! src/java.base/windows/conf/security/java.policy
+ src/java.base/windows/native/libjava/ConcurrentPReader_md.c
! src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
! src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
! src/java.desktop/share/classes/java/awt/Toolkit.java
! src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
! src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
! src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
! src/java.desktop/share/classes/javax/swing/UIManager.java
! src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
! src/java.logging/share/classes/java/util/logging/LogManager.java
! src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
! src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
! src/java.management/share/classes/sun/management/Agent.java
! src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
! src/java.management/share/conf/jmxremote.access
! src/java.management/share/conf/jmxremote.password.template
! src/java.management/share/conf/management.properties
! src/java.management/share/conf/snmp.acl.template
! src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java
! src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java
! src/java.naming/share/classes/javax/naming/Context.java
+ src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java
+ src/java.scripting/share/classes/com/sun/tools/script/shell/init.js
+ src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties
! src/java.scripting/share/classes/javax/script/ScriptEngineManager.java
! src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java
! src/java.security.jgss/share/classes/sun/security/krb5/Config.java
! src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
! src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/Config.java
- src/jdk.dev/share/classes/com/sun/tools/script/shell/Main.java
- src/jdk.dev/share/classes/com/sun/tools/script/shell/init.js
- src/jdk.dev/share/classes/com/sun/tools/script/shell/messages.properties
+ 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/resources/jimage.properties
- src/jdk.localedata/META-INF/cldrdata-services/sun.util.locale.provider.LocaleDataMetaInfo
- src/jdk.localedata/META-INF/localedata-services/sun.util.locale.provider.LocaleDataMetaInfo
+ src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
! src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java
! src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
! src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java
! src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties
! src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java
! src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java
+ src/jdk.rmic/share/classes/sun/tools/java/FileClassFile.java
+ src/jdk.rmic/share/classes/sun/tools/java/PathClassFile.java
+ src/jdk.rmic/share/classes/sun/tools/java/ZipClassFile.java
! src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java
! src/jdk.rmic/share/classes/sun/tools/javac/Main.java
! src/sample/share/jmx/jmx-scandir/index.html
! src/sample/share/jmx/jmx-scandir/src/etc/access.properties
! src/sample/share/jmx/jmx-scandir/src/etc/management.properties
! src/sample/share/jmx/jmx-scandir/src/etc/password.properties
! test/ProblemList.txt
! test/TEST.groups
+ test/java/lang/ClassLoader/EndorsedDirs.java
+ test/java/lang/ClassLoader/ExtDirs.java
! test/java/lang/ClassLoader/getdotresource.sh
! test/java/lang/SecurityManager/CheckPackageAccess.java
! test/java/lang/invoke/lambda/LUtils.java
! test/java/net/NetworkInterface/IPv4Only.java
! test/java/nio/charset/spi/basic.sh
! test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
! test/java/util/Properties/LoadAndStoreXML.java
! test/java/util/ServiceLoader/basic.sh
! test/java/util/prefs/PrefsSpi.sh
- test/javax/crypto/sanity/CheckManifestForRelease.java
+ test/jdk/internal/jimage/VerifyJimage.java
+ test/jdk/internal/jrtfs/Basic.java
+ test/jdk/internal/jrtfs/PathOps.java
+ test/jdk/internal/jrtfs/WithSecurityManager.java
+ test/jdk/internal/jrtfs/java.policy
! test/jdk/nio/zipfs/Basic.java
! test/jdk/nio/zipfs/PathOps.java
+ test/jdk/nio/zipfs/Utils.java
! test/jdk/nio/zipfs/ZipFSTester.java
- test/lib/security/java.policy/Ext_AllPolicy.java
- test/lib/security/java.policy/Ext_AllPolicy.sh
- test/lib/security/java.policy/test.policy
! test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
! test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java
! test/sun/management/jmxremote/bootstrap/rmiregistry.properties
! test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
! test/sun/net/www/protocol/jar/getcontenttype.sh
+ test/sun/net/www/protocol/jrt/Basic.java
+ test/sun/net/www/protocol/jrt/WithSecurityManager.java
+ test/sun/net/www/protocol/jrt/java.policy
! test/sun/rmi/rmic/RMIGenerator/RmicDefault.java
! test/sun/rmi/rmic/classpath/RMICClassPathTest.java
! test/sun/rmi/rmic/manifestClassPath/run.sh
! test/sun/tools/java/CFCTest.java
! test/sun/tools/jconsole/ResourceCheckTest.java
- test/sun/tools/jconsole/ResourceCheckTest.sh
! test/sun/tools/native2ascii/resources/ImmutableResourceTest.java
- test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
! test/tools/jar/LeadingGarbage.java
! test/tools/launcher/VersionCheck.java
! test/tools/pack200/CommandLineTests.java
! test/tools/pack200/Pack200Props.java
! test/tools/pack200/Pack200Test.java
! test/tools/pack200/PackageVersionTest.java
! test/tools/pack200/T7007157.java
! test/tools/pack200/Utils.java
! test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java

Changeset: 4316e603ae2a
Author:    chegar
Date:      2014-12-03 19:28 +0000
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/4316e603ae2a

Merge

! make/CompileDemos.gmk
! make/Import.gmk
! make/copy/Copy-java.base.gmk
! make/copy/Copy-java.desktop.gmk
! make/gensrc/GensrcIcons.gmk
! make/gensrc/GensrcProperties.gmk
! make/gensrc/GensrcX11Wrappers.gmk
! make/launcher/Launcher-jdk.runtime.gmk
! make/launcher/LauncherCommon.gmk
! make/lib/Awt2dLibraries.gmk
! make/lib/CoreLibraries.gmk
! make/lib/Lib-java.instrument.gmk
! make/lib/Lib-java.management.gmk
! make/lib/Lib-java.prefs.gmk
! make/lib/Lib-java.security.jgss.gmk
! make/lib/Lib-java.smartcardio.gmk
! make/lib/Lib-jdk.crypto.mscapi.gmk
! make/lib/Lib-jdk.crypto.pkcs11.gmk
! make/lib/Lib-jdk.jdi.gmk
! make/lib/Lib-jdk.jdwp.agent.gmk
! make/lib/Lib-jdk.runtime.gmk
! make/lib/Lib-jdk.sctp.gmk
! make/lib/Lib-jdk.security.auth.gmk
! make/lib/LibCommon.gmk
! make/lib/NetworkingLibraries.gmk
! make/lib/NioLibraries.gmk
! make/lib/SoundLibraries.gmk
! src/java.base/share/classes/java/nio/file/Files.java
! src/java.base/share/classes/java/util/jar/Attributes.java
- src/java.base/share/classes/java/util/zip/package.html
- src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService
! src/java.logging/share/classes/java/util/logging/LogManager.java
! src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
! test/ProblemList.txt
! test/TEST.groups
- test/sun/tools/jinfo/Basic.sh

More information about the jdk9-dev-changes mailing list