hg: jdk9/sandbox/jdk: Merge
erik.joelsson at oracle.com
erik.joelsson at oracle.com
Wed Apr 6 15:57:18 UTC 2016
Changeset: 810558c04dc3
Author: erikj
Date: 2016-04-06 17:55 +0200
URL: http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/810558c04dc3
Merge
! make/CompileInterimRmic.gmk
! make/CompileTools.gmk
! make/Import.gmk
+ make/ModuleTools.gmk
! make/Tools.gmk
! make/copy/Copy-java.base.gmk
- make/data/swingbeaninfo/SwingBeanInfo.template
- make/data/swingbeaninfo/images/AbstractButtonColor16.gif
- make/data/swingbeaninfo/images/BorderColor16.gif
- make/data/swingbeaninfo/images/BoxColor16.gif
- make/data/swingbeaninfo/images/BoxColor32.gif
- make/data/swingbeaninfo/images/BoxMono16.gif
- make/data/swingbeaninfo/images/BoxMono32.gif
- make/data/swingbeaninfo/images/JAppletColor16.gif
- make/data/swingbeaninfo/images/JAppletColor32.gif
- make/data/swingbeaninfo/images/JAppletMono16.gif
- make/data/swingbeaninfo/images/JAppletMono32.gif
- make/data/swingbeaninfo/images/JButtonColor16.gif
- make/data/swingbeaninfo/images/JButtonColor32.gif
- make/data/swingbeaninfo/images/JButtonMono16.gif
- make/data/swingbeaninfo/images/JButtonMono32.gif
- make/data/swingbeaninfo/images/JCheckBoxColor16.gif
- make/data/swingbeaninfo/images/JCheckBoxColor32.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemColor16.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemColor32.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemMono16.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemMono32.gif
- make/data/swingbeaninfo/images/JCheckBoxMono16.gif
- make/data/swingbeaninfo/images/JCheckBoxMono32.gif
- make/data/swingbeaninfo/images/JColorChooserColor16.gif
- make/data/swingbeaninfo/images/JColorChooserColor32.gif
- make/data/swingbeaninfo/images/JColorChooserMono16.gif
- make/data/swingbeaninfo/images/JColorChooserMono32.gif
- make/data/swingbeaninfo/images/JComboBoxColor16.gif
- make/data/swingbeaninfo/images/JComboBoxColor32.gif
- make/data/swingbeaninfo/images/JComboBoxMono16.gif
- make/data/swingbeaninfo/images/JComboBoxMono32.gif
- make/data/swingbeaninfo/images/JComponentColor16.gif
- make/data/swingbeaninfo/images/JDesktopPaneColor16.gif
- make/data/swingbeaninfo/images/JDesktopPaneColor32.gif
- make/data/swingbeaninfo/images/JDesktopPaneMono16.gif
- make/data/swingbeaninfo/images/JDesktopPaneMono32.gif
- make/data/swingbeaninfo/images/JDialogColor16.gif
- make/data/swingbeaninfo/images/JDialogColor32.gif
- make/data/swingbeaninfo/images/JDialogMono16.gif
- make/data/swingbeaninfo/images/JDialogMono32.gif
- make/data/swingbeaninfo/images/JEditorPaneColor16.gif
- make/data/swingbeaninfo/images/JEditorPaneColor32.gif
- make/data/swingbeaninfo/images/JEditorPaneMono16.gif
- make/data/swingbeaninfo/images/JEditorPaneMono32.gif
- make/data/swingbeaninfo/images/JFileChooserColor16.gif
- make/data/swingbeaninfo/images/JFileChooserColor32.gif
- make/data/swingbeaninfo/images/JFileChooserMono16.gif
- make/data/swingbeaninfo/images/JFileChooserMono32.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldColor16.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldColor32.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldMono16.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldMono32.gif
- make/data/swingbeaninfo/images/JFrameColor16.gif
- make/data/swingbeaninfo/images/JFrameColor32.gif
- make/data/swingbeaninfo/images/JFrameMono16.gif
- make/data/swingbeaninfo/images/JFrameMono32.gif
- make/data/swingbeaninfo/images/JInternalFrameColor16.gif
- make/data/swingbeaninfo/images/JInternalFrameColor32.gif
- make/data/swingbeaninfo/images/JInternalFrameMono16.gif
- make/data/swingbeaninfo/images/JInternalFrameMono32.gif
- make/data/swingbeaninfo/images/JLabelColor16.gif
- make/data/swingbeaninfo/images/JLabelColor32.gif
- make/data/swingbeaninfo/images/JLabelMono16.gif
- make/data/swingbeaninfo/images/JLabelMono32.gif
- make/data/swingbeaninfo/images/JLayeredPaneColor16.gif
- make/data/swingbeaninfo/images/JLayeredPaneColor32.gif
- make/data/swingbeaninfo/images/JLayeredPaneMono16.gif
- make/data/swingbeaninfo/images/JLayeredPaneMono32.gif
- make/data/swingbeaninfo/images/JListColor16.gif
- make/data/swingbeaninfo/images/JListColor32.gif
- make/data/swingbeaninfo/images/JListMono16.gif
- make/data/swingbeaninfo/images/JListMono32.gif
- make/data/swingbeaninfo/images/JMenuBarColor16.gif
- make/data/swingbeaninfo/images/JMenuBarColor32.gif
- make/data/swingbeaninfo/images/JMenuBarMono16.gif
- make/data/swingbeaninfo/images/JMenuBarMono32.gif
- make/data/swingbeaninfo/images/JMenuColor16.gif
- make/data/swingbeaninfo/images/JMenuColor32.gif
- make/data/swingbeaninfo/images/JMenuItemColor16.gif
- make/data/swingbeaninfo/images/JMenuItemColor32.gif
- make/data/swingbeaninfo/images/JMenuItemMono16.gif
- make/data/swingbeaninfo/images/JMenuItemMono32.gif
- make/data/swingbeaninfo/images/JMenuMono16.gif
- make/data/swingbeaninfo/images/JMenuMono32.gif
- make/data/swingbeaninfo/images/JOptionPaneColor16.gif
- make/data/swingbeaninfo/images/JOptionPaneColor32.gif
- make/data/swingbeaninfo/images/JOptionPaneMono16.gif
- make/data/swingbeaninfo/images/JOptionPaneMono32.gif
- make/data/swingbeaninfo/images/JPanelColor16.gif
- make/data/swingbeaninfo/images/JPanelColor32.gif
- make/data/swingbeaninfo/images/JPanelMono16.gif
- make/data/swingbeaninfo/images/JPanelMono32.gif
- make/data/swingbeaninfo/images/JPasswordFieldColor16.gif
- make/data/swingbeaninfo/images/JPasswordFieldColor32.gif
- make/data/swingbeaninfo/images/JPasswordFieldMono16.gif
- make/data/swingbeaninfo/images/JPasswordFieldMono32.gif
- make/data/swingbeaninfo/images/JPopupMenuColor16.gif
- make/data/swingbeaninfo/images/JPopupMenuColor32.gif
- make/data/swingbeaninfo/images/JPopupMenuMono16.gif
- make/data/swingbeaninfo/images/JPopupMenuMono32.gif
- make/data/swingbeaninfo/images/JProgressBarColor16.gif
- make/data/swingbeaninfo/images/JProgressBarColor32.gif
- make/data/swingbeaninfo/images/JProgressBarMono16.gif
- make/data/swingbeaninfo/images/JProgressBarMono32.gif
- make/data/swingbeaninfo/images/JRadioButtonColor16.gif
- make/data/swingbeaninfo/images/JRadioButtonColor32.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemColor16.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemColor32.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemMono16.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemMono32.gif
- make/data/swingbeaninfo/images/JRadioButtonMono16.gif
- make/data/swingbeaninfo/images/JRadioButtonMono32.gif
- make/data/swingbeaninfo/images/JRootPaneColor16.gif
- make/data/swingbeaninfo/images/JRootPaneColor32.gif
- make/data/swingbeaninfo/images/JRootPaneMono16.gif
- make/data/swingbeaninfo/images/JRootPaneMono32.gif
- make/data/swingbeaninfo/images/JScrollBarColor16.gif
- make/data/swingbeaninfo/images/JScrollBarColor32.gif
- make/data/swingbeaninfo/images/JScrollBarMono16.gif
- make/data/swingbeaninfo/images/JScrollBarMono32.gif
- make/data/swingbeaninfo/images/JScrollPaneColor16.gif
- make/data/swingbeaninfo/images/JScrollPaneColor32.gif
- make/data/swingbeaninfo/images/JScrollPaneMono16.gif
- make/data/swingbeaninfo/images/JScrollPaneMono32.gif
- make/data/swingbeaninfo/images/JSeparatorColor16.gif
- make/data/swingbeaninfo/images/JSeparatorColor32.gif
- make/data/swingbeaninfo/images/JSeparatorMono16.gif
- make/data/swingbeaninfo/images/JSeparatorMono32.gif
- make/data/swingbeaninfo/images/JSliderColor16.gif
- make/data/swingbeaninfo/images/JSliderColor32.gif
- make/data/swingbeaninfo/images/JSliderMono16.gif
- make/data/swingbeaninfo/images/JSliderMono32.gif
- make/data/swingbeaninfo/images/JSpinnerColor16.gif
- make/data/swingbeaninfo/images/JSpinnerColor32.gif
- make/data/swingbeaninfo/images/JSpinnerMono16.gif
- make/data/swingbeaninfo/images/JSpinnerMono32.gif
- make/data/swingbeaninfo/images/JSplitPaneColor16.gif
- make/data/swingbeaninfo/images/JSplitPaneColor32.gif
- make/data/swingbeaninfo/images/JSplitPaneMono16.gif
- make/data/swingbeaninfo/images/JSplitPaneMono32.gif
- make/data/swingbeaninfo/images/JTabbedPaneColor16.gif
- make/data/swingbeaninfo/images/JTabbedPaneColor32.gif
- make/data/swingbeaninfo/images/JTabbedPaneMono16.gif
- make/data/swingbeaninfo/images/JTabbedPaneMono32.gif
- make/data/swingbeaninfo/images/JTableColor16.gif
- make/data/swingbeaninfo/images/JTableColor32.gif
- make/data/swingbeaninfo/images/JTableMono16.gif
- make/data/swingbeaninfo/images/JTableMono32.gif
- make/data/swingbeaninfo/images/JTextAreaColor16.gif
- make/data/swingbeaninfo/images/JTextAreaColor32.gif
- make/data/swingbeaninfo/images/JTextAreaMono16.gif
- make/data/swingbeaninfo/images/JTextAreaMono32.gif
- make/data/swingbeaninfo/images/JTextFieldColor16.gif
- make/data/swingbeaninfo/images/JTextFieldColor32.gif
- make/data/swingbeaninfo/images/JTextFieldMono16.gif
- make/data/swingbeaninfo/images/JTextFieldMono32.gif
- make/data/swingbeaninfo/images/JTextPaneColor16.gif
- make/data/swingbeaninfo/images/JTextPaneColor32.gif
- make/data/swingbeaninfo/images/JTextPaneMono16.gif
- make/data/swingbeaninfo/images/JTextPaneMono32.gif
- make/data/swingbeaninfo/images/JToggleButtonColor16.gif
- make/data/swingbeaninfo/images/JToggleButtonColor32.gif
- make/data/swingbeaninfo/images/JToggleButtonMono16.gif
- make/data/swingbeaninfo/images/JToggleButtonMono32.gif
- make/data/swingbeaninfo/images/JToolBarColor16.gif
- make/data/swingbeaninfo/images/JToolBarColor32.gif
- make/data/swingbeaninfo/images/JToolBarMono16.gif
- make/data/swingbeaninfo/images/JToolBarMono32.gif
- make/data/swingbeaninfo/images/JTreeColor16.gif
- make/data/swingbeaninfo/images/JTreeColor32.gif
- make/data/swingbeaninfo/images/JTreeMono16.gif
- make/data/swingbeaninfo/images/JTreeMono32.gif
- make/data/swingbeaninfo/images/JViewportColor16.gif
- make/data/swingbeaninfo/images/JViewportColor32.gif
- make/data/swingbeaninfo/images/JViewportMono16.gif
- make/data/swingbeaninfo/images/JViewportMono32.gif
- make/data/swingbeaninfo/images/JWindowColor16.gif
- make/data/swingbeaninfo/images/JWindowColor32.gif
- make/data/swingbeaninfo/images/JWindowMono16.gif
- make/data/swingbeaninfo/images/JWindowMono32.gif
- make/data/swingbeaninfo/javax/swing/SwingBeanInfoBase.java
- make/data/swingbeaninfo/manifest.mf
- make/data/swingbeaninfo/sun/swing/BeanInfoUtils.java
- make/gendata/Gendata-jdk.jdeps.gmk
! make/gendata/GendataBreakIterator.gmk
- make/gensrc/Gensrc-jdk.dev.gmk
- make/gensrc/Gensrc-jdk.jvmstat.gmk
! make/gensrc/GensrcMisc.gmk
- make/launcher/Launcher-jdk.dev.gmk
! make/launcher/Launcher-jdk.pack200.gmk
! make/launcher/LauncherCommon.gmk
! make/lib/Awt2dLibraries.gmk
! make/lib/CoreLibraries.gmk
! make/lib/Lib-java.instrument.gmk
+ make/lib/Lib-java.rmi.gmk
! make/rmic/Rmic-java.management.gmk
- make/scripts/localelist.sh
- make/src/classes/build/tools/module/GenJdepsModulesXml.java
- make/src/classes/build/tools/module/GenModulesList.java
- make/src/classes/build/tools/module/ImageBuilder.java
- make/src/classes/build/tools/module/Module.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
- make/src/classes/build/tools/swingbeaninfo/DocBeanInfo.java
- make/src/classes/build/tools/swingbeaninfo/GenDocletBeanInfo.java
- make/src/classes/build/tools/swingbeaninfo/GenSwingBeanInfo.java
- make/src/native/genconstants/ch/genSocketOptionRegistry.c
- make/src/native/genconstants/fs/genSolarisConstants.c
- make/src/native/genconstants/fs/genUnixConstants.c
- src/java.base/share/classes/jdk/internal/jimage/Archive.java
- src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ExternalFilesWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java
- src/java.base/share/classes/jdk/internal/jimage/ImageJavaSubstrate.java
- src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java
- src/java.base/share/classes/jdk/internal/jimage/ImageLocationWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java
- src/java.base/share/classes/jdk/internal/jimage/ImageModuleDataWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java
- src/java.base/share/classes/jdk/internal/jimage/ImageResourcesTree.java
- src/java.base/share/classes/jdk/internal/jimage/ImageStringsWriter.java
- src/java.base/share/classes/jdk/internal/jimage/ImageSubstrate.java
- src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java
- src/java.base/share/classes/jdk/internal/jimage/ResourcePool.java
- src/java.base/share/classes/jdk/internal/jimage/ResourcePoolImpl.java
- src/java.base/share/classes/jdk/internal/jimage/StringTable.java
- src/java.base/share/classes/jdk/internal/jimage/UTF8String.java
- src/java.base/share/classes/sun/misc/GC.java
- src/java.base/share/classes/sun/misc/InvalidJarIndexException.java
- src/java.base/share/classes/sun/misc/JarIndex.java
- src/java.base/share/classes/sun/misc/Launcher.java
- src/java.base/share/classes/sun/misc/Resource.java
- src/java.base/share/classes/sun/misc/URLClassPath.java
- src/java.base/share/classes/sun/misc/VMSupport.java
- src/java.base/share/classes/sun/misc/resources/Messages.java
- src/java.base/share/classes/sun/misc/resources/Messages_de.java
- src/java.base/share/classes/sun/misc/resources/Messages_es.java
- src/java.base/share/classes/sun/misc/resources/Messages_fr.java
- src/java.base/share/classes/sun/misc/resources/Messages_it.java
- src/java.base/share/classes/sun/misc/resources/Messages_ja.java
- src/java.base/share/classes/sun/misc/resources/Messages_ko.java
- src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java
- src/java.base/share/classes/sun/misc/resources/Messages_sv.java
- src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java
- src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java
- src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
- src/java.base/share/native/libjava/GC.c
- src/java.base/share/native/libjava/Package.c
- src/java.base/share/native/libjava/Proxy.c
- src/java.base/share/native/libjimage/ImageNativeSubstrate.cpp
- src/java.base/unix/classes/sun/misc/FileURLMapper.java
- src/java.base/windows/classes/sun/misc/FileURLMapper.java
- src/java.desktop/macosx/classes/com/apple/eawt/AboutHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppEvent.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppEventListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppForegroundListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppHiddenListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppReOpenedListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/OpenFilesHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/OpenURIHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/PreferencesHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/PrintFilesHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/QuitHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/QuitResponse.java
- src/java.desktop/macosx/classes/com/apple/eawt/QuitStrategy.java
- src/java.desktop/macosx/classes/com/apple/eawt/ScreenSleepListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/SystemSleepListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/UserSessionListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java
- src/java.desktop/share/classes/META-INF/services/java.net.ContentHandlerFactory
- src/java.desktop/share/classes/META-INF/services/javax.print.PrintServiceLookup
- src/java.desktop/share/classes/META-INF/services/javax.print.StreamPrintServiceFactory
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileReader
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileWriter
- src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.SoundbankReader
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileReader
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileWriter
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider
- src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
- src/java.desktop/share/classes/META-INF/services/sun.datatransfer.DesktopDatatransferService
- src/java.logging/share/classes/META-INF/services/jdk.internal.logger.DefaultLoggerFinder
- src/java.security.jgss/share/classes/META-INF/services/sun.security.ssl.ClientKeyExchangeService
- src/jdk.accessibility/windows/classes/META-INF/services/javax.accessibility.AccessibilityProvider
- src/jdk.attach/share/classes/META-INF/services/com.sun.tools.attach.spi.AttachProvider
- src/jdk.charsets/share/classes/META-INF/services/java.nio.charset.spi.CharsetProvider
- src/jdk.dev/share/classes/jdk/tools/jimage/ExtractedImage.java
- 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/TaskHelper.java
- src/jdk.dev/share/classes/jdk/tools/jimage/resources/jimage.properties
- src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.Connector
- src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.spi.TransportService
- src/jdk.jvmstat.rmi/share/classes/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
- src/jdk.jvmstat/share/classes/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
- src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
- src/jdk.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider
- src/jdk.naming.dns/share/classes/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- src/jdk.zipfs/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider
- test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html
- test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html
- test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.html
- test/java/awt/hidpi/properties/HiDPIPropertiesLinuxTest.java
- test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
- test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java/net/MyDatagramSocketImplFactory.java
- test/java/net/httpclient/whitebox/TEST.properties
- test/java/net/httpclient/whitebox/java/net/http/SelectorTest.java
- test/java/util/stream/bootlib/TEST.properties
- test/jdk/internal/jimage/ExecutableTest.java
- test/jdk/internal/jimage/JImageTest.java
- test/jdk/internal/jimage/VerifyJimage.java
- test/sun/security/krb5/config/NamingManager.java
- test/sun/security/krb5/config/dns.sh
- test/sun/security/mscapi/IsSunMSCAPIAvailable.sh
- test/sun/security/ssl/StatusStapling/BogusStatusRequest.java
- test/sun/security/ssl/StatusStapling/CertStatusReqExtensionTests.java
- test/sun/security/ssl/StatusStapling/CertStatusReqItemV2Tests.java
- test/sun/security/ssl/StatusStapling/CertStatusReqListV2ExtensionTests.java
- test/sun/security/ssl/StatusStapling/OCSPStatusRequestTests.java
- test/sun/security/ssl/StatusStapling/StatusResponseManagerTests.java
- test/sun/security/ssl/StatusStapling/TestCase.java
- test/sun/security/ssl/StatusStapling/TestUtils.java
More information about the jdk9-sandbox-changes
mailing list