hg: jdk/sandbox: 2 new changesets

[andy.herrick at oracle.com]

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

8215036: Create initial set of tests for jpackage create-installer mode
Submitten-by: almatvee
Reviewed-by: herrick. kcr

! test/jdk/tools/jpackage/JPackageMissingArgumentsTest.java
- test/jdk/tools/jpackage/apps/Hello.java
+ test/jdk/tools/jpackage/apps/image/Hello.java
+ test/jdk/tools/jpackage/apps/installer/Hello.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageArgumentsTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageBuildRootTest.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageBuildRootTest.java.rej
! test/jdk/tools/jpackage/createimage/JPackageCreateImageForceTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageIconTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageInputFilesTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageMainClassAttributeTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageNoNameTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageRuntimeTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageStripNativeCommandsTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageVerboseTest.java
! test/jdk/tools/jpackage/createimage/JPackageCreateImageVersionTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBundleNameBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerFileAssociationsBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerInstallDirBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseTypeBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerMaintainerBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerPackageDepsBase.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerBundleNameTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerFileAssociationsTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerInstallDirTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerLicenseTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerMaintainerTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerPackageDepsTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/JPackageCreateInstallerTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/deb/install.sh
+ test/jdk/tools/jpackage/createinstaller/linux/deb/uninstall.sh
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerBundleNameTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerFileAssociationsTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerInstallDirTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerLicenseTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerLicenseTypeTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerPackageDepsTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/JPackageCreateInstallerTest.java
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/install.sh
+ test/jdk/tools/jpackage/createinstaller/linux/rpm/uninstall.sh
+ test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerBase.java
+ test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerFileAssociationsBase.java
+ test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerInstallDirBase.java
+ test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerLicenseBase.java
+ test/jdk/tools/jpackage/createinstaller/macosx/dmg/JPackageCreateInstallerFileAssociationsTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/dmg/JPackageCreateInstallerInstallDirTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/dmg/JPackageCreateInstallerLicenseTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/dmg/JPackageCreateInstallerTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/dmg/install.sh
+ test/jdk/tools/jpackage/createinstaller/macosx/dmg/uninstall.sh
+ test/jdk/tools/jpackage/createinstaller/macosx/pkg/JPackageCreateInstallerFileAssociationsTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/pkg/JPackageCreateInstallerInstallDirTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/pkg/JPackageCreateInstallerLicenseTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/pkg/JPackageCreateInstallerTest.java
+ test/jdk/tools/jpackage/createinstaller/macosx/pkg/install.sh
+ test/jdk/tools/jpackage/createinstaller/macosx/pkg/uninstall.sh
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerFileAssociationsBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerLicenseBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinDirChooserBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuGroupBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinPerUserInstallBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinRegistryNameBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinShortcutBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerFileAssociationsTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerLicenseTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinDirChooserTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinMenuGroupTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinMenuTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinPerUserInstallTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinRegistryNameTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinShortcutTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/install.bat
+ test/jdk/tools/jpackage/createinstaller/windows/exe/uninstall.bat
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerFileAssociationsTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerLicenseTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinDirChooserTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinMenuGroupTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinMenuTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinPerUserInstallTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinRegistryNameTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinShortcutTest.java
+ test/jdk/tools/jpackage/createinstaller/windows/msi/install.bat
+ test/jdk/tools/jpackage/createinstaller/windows/msi/uninstall.bat
! test/jdk/tools/jpackage/helpers/JPackageHelper.java
+ test/jdk/tools/jpackage/helpers/JPackageInstallerHelper.java
! test/jdk/tools/jpackage/helpers/JPackagePath.java
+ test/jdk/tools/jpackage/resources/license.txt

Changeset: bd4ce7f9ea2c
Author:    herrick
Date:      2018-12-18 19:31 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/bd4ce7f9ea2c

8214495:  Change behavior of --license-file
Submitten-by: almatvee
Reviewed-by: herrick. kcr

! 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/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/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/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/BundleParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.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
! 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/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/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