archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8252870: Finalize (remove "incubator" from) jpackage

Browse source 
Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse
This commit is contained in:
Andy Herrick 2020-11-04 20:27:11 +00:00
parent 804bd72599
commit 26e7ef78fb
251 changed files with 396 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/CompileJavaModules.gmk
View file

@ -385,11 +385,11 @@ endif
################################################################################ ################################################################################
jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \ jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
.postrm .postinst .list .sh .desktop .copyright .control .plist .template \ .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
.icns .scpt .wxs .wxl .wxi .ico .bmp .tiff .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff
jdk.incubator.jpackage_CLEAN += .properties jdk.jpackage_CLEAN += .properties
################################################################################ ################################################################################

6
make/common/Modules.gmk
View file

@ -125,7 +125,7 @@ endif
JRE_TOOL_MODULES += \ JRE_TOOL_MODULES += \
jdk.jdwp.agent \ jdk.jdwp.agent \
jdk.incubator.jpackage \ jdk.jpackage \
# #
################################################################################ ################################################################################
@ -145,7 +145,7 @@ DOCS_MODULES += \
jdk.editpad \ jdk.editpad \
jdk.hotspot.agent \ jdk.hotspot.agent \
jdk.httpserver \ jdk.httpserver \
jdk.incubator.jpackage \ jdk.jpackage \
jdk.incubator.vector \ jdk.incubator.vector \
jdk.jartool \ jdk.jartool \
jdk.javadoc \ jdk.javadoc \
@ -228,7 +228,7 @@ endif
# jpackage is only on windows, macosx, and linux # jpackage is only on windows, macosx, and linux
ifeq ($(call isTargetOs, windows macosx linux), false) ifeq ($(call isTargetOs, windows macosx linux), false)
MODULES_FILTER += jdk.incubator.jpackage MODULES_FILTER += jdk.jpackage
endif endif
################################################################################ ################################################################################

2
make/modules/jdk.incubator.jpackage/Gensrc.gmk → make/modules/jdk.jpackage/Gensrc.gmk
View file

@ -31,7 +31,7 @@ include GensrcCommonJdk.gmk
ifeq ($(call isTargetOs, macosx), true) ifeq ($(call isTargetOs, macosx), true)
ENTITLEMENTS_SRC_FILE := $(TOPDIR)/make/data/macosxsigning/java.plist ENTITLEMENTS_SRC_FILE := $(TOPDIR)/make/data/macosxsigning/java.plist
ENTITLEMENTS_TARGET_FILE := \ ENTITLEMENTS_TARGET_FILE := \
$(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/incubator/jpackage/internal/resources/entitlements.plist $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/jpackage/internal/resources/entitlements.plist
$(ENTITLEMENTS_TARGET_FILE): $(ENTITLEMENTS_SRC_FILE) $(ENTITLEMENTS_TARGET_FILE): $(ENTITLEMENTS_SRC_FILE)
$(call install-file) $(call install-file)

2
make/modules/jdk.incubator.jpackage/Launcher.gmk → make/modules/jdk.jpackage/Launcher.gmk
View file

@ -26,5 +26,5 @@
include LauncherCommon.gmk include LauncherCommon.gmk
$(eval $(call SetupBuildLauncher, jpackage, \ $(eval $(call SetupBuildLauncher, jpackage, \
MAIN_CLASS := jdk.incubator.jpackage.main.Main, \ MAIN_CLASS := jdk.jpackage.main.Main, \
)) ))

12
make/modules/jdk.incubator.jpackage/Lib.gmk → make/modules/jdk.jpackage/Lib.gmk
View file

@ -29,8 +29,8 @@ include LibCommon.gmk
JPACKAGE_APPLAUNCHER_SRC := \ JPACKAGE_APPLAUNCHER_SRC := \
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, applauncher) \ $(call FindSrcDirsForComponent, jdk.jpackage, applauncher) \
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, common) $(call FindSrcDirsForComponent, jdk.jpackage, common)
ifeq ($(call isTargetOs, windows), true) ifeq ($(call isTargetOs, windows), true)
@ -42,7 +42,7 @@ else
endif endif
JPACKAGE_OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/incubator/jpackage/internal/resources JPACKAGE_OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources
JPACKAGE_CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE JPACKAGE_CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE
# Output app launcher executable in resources dir, and symbols in the object dir # Output app launcher executable in resources dir, and symbols in the object dir
@ -73,7 +73,7 @@ ifeq ($(call isTargetOs, windows), true)
$(eval $(call SetupJdkLibrary, BUILD_LIB_JPACKAGE, \ $(eval $(call SetupJdkLibrary, BUILD_LIB_JPACKAGE, \
NAME := jpackage, \ NAME := jpackage, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
EXTRA_SRC := jdk.incubator.jpackage:common, \ EXTRA_SRC := jdk.jpackage:common, \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_CXXFLAGS_windows), \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_CXXFLAGS_windows), \
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
@ -99,8 +99,8 @@ ifeq ($(call isTargetOs, windows), true)
TARGETS += $(BUILD_LIB_WIXHELPER) TARGETS += $(BUILD_LIB_WIXHELPER)
JPACKAGE_MSIWRAPPER_SRC := \ JPACKAGE_MSIWRAPPER_SRC := \
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, msiwrapper) \ $(call FindSrcDirsForComponent, jdk.jpackage, msiwrapper) \
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, common) $(call FindSrcDirsForComponent, jdk.jpackage, common)
# Build exe installer wrapper for msi installer # Build exe installer wrapper for msi installer
$(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_MSIWRAPPER, \ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_MSIWRAPPER, \

2
make/scripts/compare.sh
View file

@ -696,7 +696,7 @@ compare_bin_file() {
# pdb files. # pdb files.
PDB_DIRS="$(ls -d \ PDB_DIRS="$(ls -d \
{$OTHER,$THIS}/support/modules_{cmds,libs}/{*,*/*} \ {$OTHER,$THIS}/support/modules_{cmds,libs}/{*,*/*} \
{$OTHER,$THIS}/support/native/jdk.incubator.jpackage/* \ {$OTHER,$THIS}/support/native/jdk.jpackage/* \
)" )"
export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')" export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')"
fi fi

2
src/java.base/share/classes/module-info.java
View file

@ -209,7 +209,7 @@ module java.base {
jdk.jartool, jdk.jartool,
jdk.jfr, jdk.jfr,
jdk.jlink, jdk.jlink,
jdk.incubator.jpackage; jdk.jpackage;
exports jdk.internal.perf to exports jdk.internal.perf to
java.management, java.management,
jdk.management.agent, jdk.management.agent,

22
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -46,16 +46,16 @@ import java.util.stream.Stream;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter; import javax.xml.stream.XMLStreamWriter;
import jdk.incubator.jpackage.internal.Arguments.CLIOptions; import jdk.jpackage.internal.Arguments.CLIOptions;
import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON; import static jdk.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON;
import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.ICON_PNG; import static jdk.jpackage.internal.LinuxAppImageBuilder.ICON_PNG;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
/** /**
* Helper to create files for desktop integration. * Helper to create files for desktop integration.

10
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -153,17 +153,17 @@ final public class LibProvidersLookup {
// //
// Typical ldd output: // Typical ldd output:
// //
// ldd: warning: you do not have execution permission for `/tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so' // ldd: warning: you do not have execution permission for `/tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so'
// linux-vdso.so.1 => (0x00007ffce6bfd000) // linux-vdso.so.1 => (0x00007ffce6bfd000)
// libawt.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000) // libawt.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000)
// libjvm.so => not found // libjvm.so => not found
// libjava.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000) // libjava.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000)
// libm.so.6 => /lib64/libm.so.6 (0x00007f4e00834000) // libm.so.6 => /lib64/libm.so.6 (0x00007f4e00834000)
// libdl.so.2 => /lib64/libdl.so.2 (0x00007f4e00630000) // libdl.so.2 => /lib64/libdl.so.2 (0x00007f4e00630000)
// libc.so.6 => /lib64/libc.so.6 (0x00007f4e00262000) // libc.so.6 => /lib64/libc.so.6 (0x00007f4e00262000)
// libjvm.so => not found // libjvm.so => not found
// libjvm.so => not found // libjvm.so => not found
// libverify.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000) // libverify.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000)
// /lib64/ld-linux-x86-64.so.2 (0x00007f4e00b36000) // /lib64/ld-linux-x86-64.so.2 (0x00007f4e00b36000)
// libjvm.so => not found // libjvm.so => not found
// //

2
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
public class LinuxAppBundler extends AppImageBundler { public class LinuxAppBundler extends AppImageBundler {
public LinuxAppBundler() { public LinuxAppBundler() {

8
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -32,9 +32,9 @@ import java.nio.file.Path;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
public class LinuxAppImageBuilder extends AbstractAppImageBuilder { public class LinuxAppImageBuilder extends AbstractAppImageBuilder {

16
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileVisitResult; import java.nio.file.FileVisitResult;
@ -45,13 +45,13 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
public class LinuxDebBundler extends LinuxPackageBundler { public class LinuxDebBundler extends LinuxPackageBundler {

16
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.InvalidPathException; import java.nio.file.InvalidPathException;
@ -40,13 +40,13 @@ import java.util.function.Predicate;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static jdk.incubator.jpackage.internal.DesktopIntegration.*; import static jdk.jpackage.internal.DesktopIntegration.*;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
abstract class LinuxPackageBundler extends AbstractBundler { abstract class LinuxPackageBundler extends AbstractBundler {

14
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
@ -37,12 +37,12 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
/** /**
* There are two command line options to configure license information for RPM * There are two command line options to configure license information for RPM

2
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.text.MessageFormat; import java.text.MessageFormat;

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources.properties → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/java32.png → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.control → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.control
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.copyright → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.copyright
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.desktop → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postinst → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postinst
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postrm → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postrm
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.preinst → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.preinst
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.prerm → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.prerm
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.spec → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec
View file

0
src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/utils.sh → src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh
View file

8
src/jdk.incubator.jpackage/windows/classes/module-info.java.extra → src/jdk.jpackage/linux/classes/module-info.java.extra
View file

@ -23,8 +23,8 @@
* questions. * questions.
*/ */
provides jdk.incubator.jpackage.internal.Bundler with provides jdk.jpackage.internal.Bundler with
jdk.incubator.jpackage.internal.WinAppBundler, jdk.jpackage.internal.LinuxAppBundler,
jdk.incubator.jpackage.internal.WinExeBundler, jdk.jpackage.internal.LinuxDebBundler,
jdk.incubator.jpackage.internal.WinMsiBundler; jdk.jpackage.internal.LinuxRpmBundler;

0
src/jdk.incubator.jpackage/linux/native/applauncher/Executor.cpp → src/jdk.jpackage/linux/native/applauncher/Executor.cpp
View file

0
src/jdk.incubator.jpackage/linux/native/applauncher/Executor.h → src/jdk.jpackage/linux/native/applauncher/Executor.h
View file

0
src/jdk.incubator.jpackage/linux/native/applauncher/LinuxLauncher.cpp → src/jdk.jpackage/linux/native/applauncher/LinuxLauncher.cpp
View file

0
src/jdk.incubator.jpackage/linux/native/applauncher/Package.cpp → src/jdk.jpackage/linux/native/applauncher/Package.cpp
View file

0
src/jdk.incubator.jpackage/linux/native/applauncher/Package.h → src/jdk.jpackage/linux/native/applauncher/Package.h
View file

0
src/jdk.incubator.jpackage/linux/native/common/LinuxSysInfo.cpp → src/jdk.jpackage/linux/native/common/LinuxSysInfo.cpp
View file

2
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.math.BigInteger; import java.math.BigInteger;

12
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
View file

@ -23,17 +23,17 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.MAIN_CLASS; import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
public class MacAppBundler extends AppImageBundler { public class MacAppBundler extends AppImageBundler {
public MacAppBundler() { public MacAppBundler() {

38
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -49,28 +49,28 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath; import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import static jdk.incubator.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX;
import static jdk.incubator.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY;
import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_ICON; import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.MAIN_CLASS; import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
public class MacAppImageBuilder extends AbstractAppImageBuilder { public class MacAppImageBuilder extends AbstractAppImageBuilder {
private static final ResourceBundle I18N = ResourceBundle.getBundle( private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MacResources"); "jdk.jpackage.internal.resources.MacResources");
private static final String TEMPLATE_BUNDLE_ICON = "java.icns"; private static final String TEMPLATE_BUNDLE_ICON = "java.icns";
private static final String OS_TYPE_CODE = "APPL"; private static final String OS_TYPE_CODE = "APPL";

14
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -35,16 +35,16 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY;
import static jdk.incubator.jpackage.internal.MacAppBundler.DEFAULT_ICNS_ICON; import static jdk.jpackage.internal.MacAppBundler.DEFAULT_ICNS_ICON;
import static jdk.incubator.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX;
public class MacAppStoreBundler extends MacBaseInstallerBundler { public class MacAppStoreBundler extends MacBaseInstallerBundler {
private static final ResourceBundle I18N = ResourceBundle.getBundle( private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MacResources"); "jdk.jpackage.internal.resources.MacResources");
private static final String TEMPLATE_BUNDLE_ICON_HIDPI = "java.icns"; private static final String TEMPLATE_BUNDLE_ICON_HIDPI = "java.icns";

10
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -36,10 +36,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
public abstract class MacBaseInstallerBundler extends AbstractBundler { public abstract class MacBaseInstallerBundler extends AbstractBundler {

2
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;

20
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@ -37,20 +37,20 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import static jdk.incubator.jpackage.internal.MacAppImageBuilder.ICON_ICNS; import static jdk.jpackage.internal.MacAppImageBuilder.ICON_ICNS;
import static jdk.incubator.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
public class MacDmgBundler extends MacBaseInstallerBundler { public class MacDmgBundler extends MacBaseInstallerBundler {
private static final ResourceBundle I18N = ResourceBundle.getBundle( private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MacResources"); "jdk.jpackage.internal.resources.MacResources");
// Background image name in resources // Background image name in resources
static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff"; static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff";

24
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
@ -40,21 +40,21 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
import static jdk.incubator.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
public class MacPkgBundler extends MacBaseInstallerBundler { public class MacPkgBundler extends MacBaseInstallerBundler {
private static final ResourceBundle I18N = ResourceBundle.getBundle( private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MacResources"); "jdk.jpackage.internal.resources.MacResources");
private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png"; private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png";

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Info-lite.plist.template → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info-lite.plist.template
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources.properties → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Runtime-Info.plist.template → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Runtime-Info.plist.template
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_dmg.tiff
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_pkg.png → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_pkg.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/java.icns → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/java.icns
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/lic_template.plist → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/postinstall.template → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/postinstall.template
View file

0
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/preinstall.template → src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/preinstall.template
View file

9
src/jdk.incubator.jpackage/linux/classes/module-info.java.extra → src/jdk.jpackage/macosx/classes/module-info.java.extra
View file

@ -23,8 +23,9 @@
* questions. * questions.
*/ */
provides jdk.incubator.jpackage.internal.Bundler with provides jdk.jpackage.internal.Bundler with
jdk.incubator.jpackage.internal.LinuxAppBundler, jdk.jpackage.internal.MacAppBundler,
jdk.incubator.jpackage.internal.LinuxDebBundler, jdk.jpackage.internal.MacAppStoreBundler,
jdk.incubator.jpackage.internal.LinuxRpmBundler; jdk.jpackage.internal.MacDmgBundler,
jdk.jpackage.internal.MacPkgBundler;

0
src/jdk.incubator.jpackage/macosx/native/applauncher/MacLauncher.cpp → src/jdk.jpackage/macosx/native/applauncher/MacLauncher.cpp
View file

0
src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp → src/jdk.jpackage/macosx/native/common/MacSysInfo.cpp
View file

12
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
View file

@ -23,17 +23,17 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Map; import java.util.Map;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.SOURCE_DIR; import static jdk.jpackage.internal.StandardBundlerParam.SOURCE_DIR;
import jdk.incubator.jpackage.internal.resources.ResourceLocator; import jdk.jpackage.internal.resources.ResourceLocator;
/* /*
* AbstractAppImageBuilder * AbstractAppImageBuilder

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;

6
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
View file

@ -23,14 +23,14 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.List; import java.util.List;
import jdk.incubator.jpackage.internal.Arguments.CLIOptions; import jdk.jpackage.internal.Arguments.CLIOptions;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
/* /*
* AddLauncherArguments * AddLauncherArguments

10
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -32,10 +32,10 @@ import java.text.MessageFormat;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
class AppImageBundler extends AbstractBundler { class AppImageBundler extends AbstractBundler {

8
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -43,9 +43,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
public class AppImageFile { public class AppImageFile {

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Map; import java.util.Map;

10
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
@ -57,7 +57,7 @@ import java.util.regex.Pattern;
*/ */
public class Arguments { public class Arguments {
private static final ResourceBundle I18N = ResourceBundle.getBundle( private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MainResources"); "jdk.jpackage.internal.resources.MainResources");
private static final String FA_EXTENSIONS = "extension"; private static final String FA_EXTENSIONS = "extension";
private static final String FA_CONTENT_TYPE = "mime-type"; private static final String FA_CONTENT_TYPE = "mime-type";
@ -615,12 +615,12 @@ public class Arguments {
} }
} }
private jdk.incubator.jpackage.internal.Bundler getPlatformBundler() { private jdk.jpackage.internal.Bundler getPlatformBundler() {
boolean appImage = deployParams.isTargetAppImage(); boolean appImage = deployParams.isTargetAppImage();
String type = deployParams.getTargetFormat(); String type = deployParams.getTargetFormat();
String bundleType = (appImage ? "IMAGE" : "INSTALLER"); String bundleType = (appImage ? "IMAGE" : "INSTALLER");
for (jdk.incubator.jpackage.internal.Bundler bundler : for (jdk.jpackage.internal.Bundler bundler :
Bundlers.createBundlersInstance().getBundlers(bundleType)) { Bundlers.createBundlersInstance().getBundlers(bundleType)) {
if (type == null) { if (type == null) {
if (bundler.isDefault() if (bundler.isDefault()
@ -651,7 +651,7 @@ public class Arguments {
StandardBundlerParam.TEMP_ROOT.fetchFrom(params); StandardBundlerParam.TEMP_ROOT.fetchFrom(params);
// determine what bundler to run // determine what bundler to run
jdk.incubator.jpackage.internal.Bundler bundler = getPlatformBundler(); jdk.jpackage.internal.Bundler bundler = getPlatformBundler();
if (bundler == null) { if (bundler == null) {
throw new PackagerException("ERR_InvalidInstallerType", throw new PackagerException("ERR_InvalidInstallerType",

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
View file

@ -23,11 +23,11 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
public class BundleParams { public class BundleParams {

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Map; import java.util.Map;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.Map; import java.util.Map;
import java.util.function.BiFunction; import java.util.function.BiFunction;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.io.File; import java.io.File;
@ -38,7 +38,7 @@ import java.text.MessageFormat;
public class CLIHelp { public class CLIHelp {
private static final ResourceBundle I18N = ResourceBundle.getBundle( private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.HelpResources"); "jdk.jpackage.internal.resources.HelpResources");
// generates --help for jpackage's CLI // generates --help for jpackage's CLI
public static void showHelp(boolean noArgs) { public static void showHelp(boolean noArgs) {

12
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.io.File; import java.io.File;
@ -32,11 +32,11 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS; import static jdk.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ARGUMENTS; import static jdk.jpackage.internal.StandardBundlerParam.ARGUMENTS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
/** /**
* App launcher's config file. * App launcher's config file.

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
public class ConfigException extends Exception { public class ConfigException extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.math.BigInteger; import java.math.BigInteger;
import java.text.MessageFormat; import java.text.MessageFormat;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

14
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.nio.file.Path; import java.nio.file.Path;
import java.text.MessageFormat; import java.text.MessageFormat;
@ -33,12 +33,12 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_ICON; import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
final class FileAssociation { final class FileAssociation {
void verify() { void verify() {

10
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@ -36,20 +36,20 @@ class I18N {
} }
private static final ResourceBundle SHARED = ResourceBundle.getBundle( private static final ResourceBundle SHARED = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MainResources"); "jdk.jpackage.internal.resources.MainResources");
private static final ResourceBundle PLATFORM; private static final ResourceBundle PLATFORM;
static { static {
if (Platform.isLinux()) { if (Platform.isLinux()) {
PLATFORM = ResourceBundle.getBundle( PLATFORM = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.LinuxResources"); "jdk.jpackage.internal.resources.LinuxResources");
} else if (Platform.isWindows()) { } else if (Platform.isWindows()) {
PLATFORM = ResourceBundle.getBundle( PLATFORM = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.WinResources"); "jdk.jpackage.internal.resources.WinResources");
} else if (Platform.isMac()) { } else if (Platform.isMac()) {
PLATFORM = ResourceBundle.getBundle( PLATFORM = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MacResources"); "jdk.jpackage.internal.resources.MacResources");
} else { } else {
throw new IllegalStateException("Unknwon platform"); throw new IllegalStateException("Unknwon platform");
} }

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStreamReader; import java.io.InputStreamReader;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.spi.ToolProvider; import java.util.spi.ToolProvider;
@ -43,7 +43,7 @@ public class JPackageToolProvider implements ToolProvider {
public synchronized int run( public synchronized int run(
PrintWriter out, PrintWriter err, String... args) { PrintWriter out, PrintWriter err, String... args) {
try { try {
return new jdk.incubator.jpackage.main.Main().execute(out, err, args); return new jdk.jpackage.main.Main().execute(out, err, args);
} catch (RuntimeException re) { } catch (RuntimeException re) {
Log.fatalError(re.getMessage()); Log.fatalError(re.getMessage());
Log.verbose(re); Log.verbose(re);

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -46,7 +46,7 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
/** /**
* Extracts data needed to run application from parameters. * Extracts data needed to run application from parameters.

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;

8
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -42,8 +42,8 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
import jdk.incubator.jpackage.internal.resources.ResourceLocator; import jdk.jpackage.internal.resources.ResourceLocator;
/** /**
@ -52,7 +52,7 @@ import jdk.incubator.jpackage.internal.resources.ResourceLocator;
* jpackage parameter. * jpackage parameter.
* *
* Resource has default name and public name. Default name is the name of a file * Resource has default name and public name. Default name is the name of a file
* in {@code jdk.incubator.jpackage.internal.resources} package that provides the default * in {@code jdk.jpackage.internal.resources} package that provides the default
* value of the resource. * value of the resource.
* *
* Public name is a path relative to resource directory to a file with custom * Public name is a path relative to resource directory to a file with custom

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@ -31,7 +31,7 @@ import java.util.ResourceBundle;
public class PackagerException extends Exception { public class PackagerException extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final ResourceBundle bundle = ResourceBundle.getBundle( private static final ResourceBundle bundle = ResourceBundle.getBundle(
"jdk.incubator.jpackage.internal.resources.MainResources"); "jdk.jpackage.internal.resources.MainResources");
public PackagerException(Throwable cause) { public PackagerException(Throwable cause) {
super(cause); super(cause);

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.regex.Pattern; import java.util.regex.Pattern;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.nio.file.Path; import java.nio.file.Path;

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.util.function.Consumer; import java.util.function.Consumer;

8
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -31,9 +31,9 @@ import java.nio.file.Path;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import static jdk.incubator.jpackage.internal.OverridableResource.createResource; import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
/** /**
* Runs custom script from resource directory. * Runs custom script from resource directory.

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -235,7 +235,7 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
Path.class, Path.class,
params -> { params -> {
try { try {
return Files.createTempDirectory("jdk.incubator.jpackage"); return Files.createTempDirectory("jdk.jpackage");
} catch (IOException ioe) { } catch (IOException ioe) {
return null; return null;
} }

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;

4
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
View file

@ -23,10 +23,10 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal; package jdk.jpackage.internal;
import java.util.HashMap; import java.util.HashMap;
import jdk.incubator.jpackage.internal.Arguments.CLIOptions; import jdk.jpackage.internal.Arguments.CLIOptions;
/** /**
* ValidOptions * ValidOptions

0
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources.properties → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
View file

0
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
View file

0
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
View file

0
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
View file

0
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
View file

0
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
View file

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java → src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java
View file

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package jdk.incubator.jpackage.internal.resources; package jdk.jpackage.internal.resources;
/* /*
* ResourceLocator * ResourceLocator

Some files were not shown because too many files have changed in this diff Show more