hg: jdk/sandbox: 3 new changesets

[andy.herrick at oracle.com]

Changeset: 9bb2a4dc3af7
Author:    herrick
Date:      2018-12-05 12:23 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/9bb2a4dc3af7

8214143: Reduce Resource files
Reviewed-by: almatvee

! make/lib/Lib-jdk.jpackage.gmk
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxAppBundler.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxAppBundler_ja.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxAppBundler_zh_CN.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxAppImageBuilder.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxAppImageBuilder_ja.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxAppImageBuilder_zh_CN.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxDebBundler.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxDebBundler_ja.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxDebBundler_zh_CN.properties
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxRpmBundler.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxRpmBundler_ja.properties
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxRpmBundler_zh_CN.properties
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppBundler.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppBundler_ja.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppBundler_zh_CN.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppImageBuilder.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppImageBuilder_ja.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppImageBuilder_zh_CN.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppStoreBundler.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppStoreBundler_ja.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacAppStoreBundler_zh_CN.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacBaseInstallerBundler.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacBaseInstallerBundler_ja.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacBaseInstallerBundler_zh_CN.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacDmgBundler.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacDmgBundler_ja.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacDmgBundler_zh_CN.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacPkgBundler.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacPkgBundler_ja.properties
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacPkgBundler_zh_CN.properties
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractImageBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractAppImageBuilder.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractAppImageBuilder_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractAppImageBuilder_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractBundler.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractBundler_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractBundler_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractImageBundler.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractImageBundler_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/AbstractImageBundler_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/Arguments.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/Arguments_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/Arguments_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/Bundle.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/Bundle_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/Bundle_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/CLIHelp.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/CLIHelpi_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/CLIHelpi_zh_CN.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/JLinkBundlerHelper.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/JLinkBundlerHelper_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/JLinkBundlerHelper_zh_CN.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/StandardBundlerParam.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/StandardBundlerParam_ja.properties
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/StandardBundlerParam_zh_CN.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsBundlerParam.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinAppBundler.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinAppBundler_ja.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinAppBundler_zh_CN.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinExeBundler.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinExeBundler_ja.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinExeBundler_zh_CN.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinLauncher.properties
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinLauncher.template
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinMsiBundler.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinMsiBundler_ja.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinMsiBundler_zh_CN.properties
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WindowsAppImageBuilder.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WindowsAppImageBuilder_ja.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WindowsAppImageBuilder_zh_CN.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WindowsBundlerParam.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WindowsBundlerParam_ja.properties
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WindowsBundlerParam_zh_CN.properties

Changeset: 5103d6d2e796
Author:    herrick
Date:      2018-12-05 17:03 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/5103d6d2e796

8213385: jpackager Command-Line Argument File.
Reviewed-by: almatvee, kcr

! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties

Changeset: ac44f38300b2
Author:    herrick
Date:      2018-12-05 17:05 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/ac44f38300b2

Merge

- src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/Command.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/Execute.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/HelpCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/JSONWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/PrettyWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/PrintCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/ReconstructCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/SplitCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/StructuredWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/SummaryCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/XMLWriter.java
- test/jdk/java/util/Properties/Compatibility.xml
- test/jdk/java/util/Properties/CompatibilityTest.java
- test/jdk/jdk/jfr/cmd/ExecuteHelper.java
- test/jdk/jdk/jfr/cmd/TestHelp.java
- test/jdk/jdk/jfr/cmd/TestPrint.java
- test/jdk/jdk/jfr/cmd/TestPrintDefault.java
- test/jdk/jdk/jfr/cmd/TestPrintJSON.java
- test/jdk/jdk/jfr/cmd/TestPrintXML.java
- test/jdk/jdk/jfr/cmd/TestReconstruct.java
- test/jdk/jdk/jfr/cmd/TestSplit.java
- test/jdk/jdk/jfr/cmd/TestSummary.java