diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 4bd3efff276..e8997e0da83 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -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 \ .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff -jdk.incubator.jpackage_CLEAN += .properties +jdk.jpackage_CLEAN += .properties ################################################################################ diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index 62272edd34a..10aacff4726 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -125,7 +125,7 @@ endif JRE_TOOL_MODULES += \ jdk.jdwp.agent \ - jdk.incubator.jpackage \ + jdk.jpackage \ # ################################################################################ @@ -145,7 +145,7 @@ DOCS_MODULES += \ jdk.editpad \ jdk.hotspot.agent \ jdk.httpserver \ - jdk.incubator.jpackage \ + jdk.jpackage \ jdk.incubator.vector \ jdk.jartool \ jdk.javadoc \ @@ -228,7 +228,7 @@ endif # jpackage is only on windows, macosx, and linux ifeq ($(call isTargetOs, windows macosx linux), false) - MODULES_FILTER += jdk.incubator.jpackage + MODULES_FILTER += jdk.jpackage endif ################################################################################ diff --git a/make/modules/jdk.incubator.jpackage/Gensrc.gmk b/make/modules/jdk.jpackage/Gensrc.gmk similarity index 93% rename from make/modules/jdk.incubator.jpackage/Gensrc.gmk rename to make/modules/jdk.jpackage/Gensrc.gmk index 5948a80f120..6f3e8b08119 100644 --- a/make/modules/jdk.incubator.jpackage/Gensrc.gmk +++ b/make/modules/jdk.jpackage/Gensrc.gmk @@ -31,7 +31,7 @@ include GensrcCommonJdk.gmk ifeq ($(call isTargetOs, macosx), true) ENTITLEMENTS_SRC_FILE := $(TOPDIR)/make/data/macosxsigning/java.plist 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) $(call install-file) diff --git a/make/modules/jdk.incubator.jpackage/Launcher.gmk b/make/modules/jdk.jpackage/Launcher.gmk similarity index 95% rename from make/modules/jdk.incubator.jpackage/Launcher.gmk rename to make/modules/jdk.jpackage/Launcher.gmk index 7a25dae733c..8d553d5c107 100644 --- a/make/modules/jdk.incubator.jpackage/Launcher.gmk +++ b/make/modules/jdk.jpackage/Launcher.gmk @@ -26,5 +26,5 @@ include LauncherCommon.gmk $(eval $(call SetupBuildLauncher, jpackage, \ - MAIN_CLASS := jdk.incubator.jpackage.main.Main, \ + MAIN_CLASS := jdk.jpackage.main.Main, \ )) diff --git a/make/modules/jdk.incubator.jpackage/Lib.gmk b/make/modules/jdk.jpackage/Lib.gmk similarity index 91% rename from make/modules/jdk.incubator.jpackage/Lib.gmk rename to make/modules/jdk.jpackage/Lib.gmk index 7ffef99afe4..7dfb70be5a6 100644 --- a/make/modules/jdk.incubator.jpackage/Lib.gmk +++ b/make/modules/jdk.jpackage/Lib.gmk @@ -29,8 +29,8 @@ include LibCommon.gmk JPACKAGE_APPLAUNCHER_SRC := \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, applauncher) \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, common) + $(call FindSrcDirsForComponent, jdk.jpackage, applauncher) \ + $(call FindSrcDirsForComponent, jdk.jpackage, common) ifeq ($(call isTargetOs, windows), true) @@ -42,7 +42,7 @@ else 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 # 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, \ NAME := jpackage, \ OPTIMIZATION := LOW, \ - EXTRA_SRC := jdk.incubator.jpackage:common, \ + EXTRA_SRC := jdk.jpackage:common, \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_CXXFLAGS_windows), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -99,8 +99,8 @@ ifeq ($(call isTargetOs, windows), true) TARGETS += $(BUILD_LIB_WIXHELPER) JPACKAGE_MSIWRAPPER_SRC := \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, msiwrapper) \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, common) + $(call FindSrcDirsForComponent, jdk.jpackage, msiwrapper) \ + $(call FindSrcDirsForComponent, jdk.jpackage, common) # Build exe installer wrapper for msi installer $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_MSIWRAPPER, \ diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh index 25630199a21..5d0e846e755 100644 --- a/make/scripts/compare.sh +++ b/make/scripts/compare.sh @@ -696,7 +696,7 @@ compare_bin_file() { # pdb files. PDB_DIRS="$(ls -d \ {$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 ' ' ';')" fi diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java index 12ea481767e..9d0ae93b470 100644 --- a/src/java.base/share/classes/module-info.java +++ b/src/java.base/share/classes/module-info.java @@ -209,7 +209,7 @@ module java.base { jdk.jartool, jdk.jfr, jdk.jlink, - jdk.incubator.jpackage; + jdk.jpackage; exports jdk.internal.perf to java.management, jdk.management.agent, diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java similarity index 96% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java index 9396bfb93c3..9311d9dc282 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.awt.image.BufferedImage; import java.io.BufferedReader; @@ -46,16 +46,16 @@ import java.util.stream.Stream; import javax.imageio.ImageIO; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import jdk.incubator.jpackage.internal.Arguments.CLIOptions; -import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON; -import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.ICON_PNG; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import jdk.jpackage.internal.Arguments.CLIOptions; +import static jdk.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON; +import static jdk.jpackage.internal.LinuxAppImageBuilder.ICON_PNG; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; /** * Helper to create files for desktop integration. diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java similarity index 91% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java index aa0b3bbf852..10df465a0fb 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -153,17 +153,17 @@ final public class LibProvidersLookup { // // 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) - // 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 - // 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) // libdl.so.2 => /lib64/libdl.so.2 (0x00007f4e00630000) // libc.so.6 => /lib64/libc.so.6 (0x00007f4e00262000) // 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) // libjvm.so => not found // diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java similarity index 97% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java index 1978db0fd6e..9a308155f78 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; public class LinuxAppBundler extends AppImageBundler { public LinuxAppBundler() { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java similarity index 94% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java index 0afca510b09..b5d602afe65 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -32,9 +32,9 @@ import java.nio.file.Path; import java.text.MessageFormat; import java.util.List; import java.util.Map; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; public class LinuxAppImageBuilder extends AbstractAppImageBuilder { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java similarity index 97% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java index e79de26b4e1..3732193a20b 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -45,13 +45,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.RELEASE; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT; public class LinuxDebBundler extends LinuxPackageBundler { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java similarity index 95% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java index 622d93dab35..e2e03087717 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.InvalidPathException; @@ -40,13 +40,13 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.DesktopIntegration.*; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; +import static jdk.jpackage.internal.DesktopIntegration.*; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.RELEASE; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR; abstract class LinuxPackageBundler extends AbstractBundler { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java index 4ddddf0ae91..ac33836579e 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Path; @@ -37,12 +37,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.RELEASE; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.OverridableResource.createResource; /** * There are two command line options to configure license information for RPM diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java similarity index 98% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java index 8d2f2ffef88..b9f43b93742 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.text.MessageFormat; diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources.properties rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/java32.png b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/java32.png rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.control b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.control similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.control rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.control diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.copyright b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.copyright similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.copyright rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.copyright diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.desktop b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.desktop rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postinst b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postinst similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postinst rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postinst diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postrm b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postrm similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postrm rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postrm diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.preinst b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.preinst similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.preinst rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.preinst diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.prerm b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.prerm similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.prerm rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.prerm diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.spec b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.spec rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/utils.sh b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/utils.sh rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh diff --git a/src/jdk.incubator.jpackage/windows/classes/module-info.java.extra b/src/jdk.jpackage/linux/classes/module-info.java.extra similarity index 85% rename from src/jdk.incubator.jpackage/windows/classes/module-info.java.extra rename to src/jdk.jpackage/linux/classes/module-info.java.extra index 6e34520b6d1..d32314b0429 100644 --- a/src/jdk.incubator.jpackage/windows/classes/module-info.java.extra +++ b/src/jdk.jpackage/linux/classes/module-info.java.extra @@ -23,8 +23,8 @@ * questions. */ -provides jdk.incubator.jpackage.internal.Bundler with - jdk.incubator.jpackage.internal.WinAppBundler, - jdk.incubator.jpackage.internal.WinExeBundler, - jdk.incubator.jpackage.internal.WinMsiBundler; +provides jdk.jpackage.internal.Bundler with + jdk.jpackage.internal.LinuxAppBundler, + jdk.jpackage.internal.LinuxDebBundler, + jdk.jpackage.internal.LinuxRpmBundler; diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Executor.cpp b/src/jdk.jpackage/linux/native/applauncher/Executor.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Executor.cpp rename to src/jdk.jpackage/linux/native/applauncher/Executor.cpp diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Executor.h b/src/jdk.jpackage/linux/native/applauncher/Executor.h similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Executor.h rename to src/jdk.jpackage/linux/native/applauncher/Executor.h diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/LinuxLauncher.cpp b/src/jdk.jpackage/linux/native/applauncher/LinuxLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/LinuxLauncher.cpp rename to src/jdk.jpackage/linux/native/applauncher/LinuxLauncher.cpp diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Package.cpp b/src/jdk.jpackage/linux/native/applauncher/Package.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Package.cpp rename to src/jdk.jpackage/linux/native/applauncher/Package.cpp diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Package.h b/src/jdk.jpackage/linux/native/applauncher/Package.h similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Package.h rename to src/jdk.jpackage/linux/native/applauncher/Package.h diff --git a/src/jdk.incubator.jpackage/linux/native/common/LinuxSysInfo.cpp b/src/jdk.jpackage/linux/native/common/LinuxSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/common/LinuxSysInfo.cpp rename to src/jdk.jpackage/linux/native/common/LinuxSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java similarity index 98% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java index a144f0f29e3..61bedfb8e67 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.math.BigInteger; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java similarity index 92% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java index aba31acbd71..e7054c4c122 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.text.MessageFormat; import java.util.Map; import java.util.Optional; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.MAIN_CLASS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; +import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; public class MacAppBundler extends AppImageBundler { public MacAppBundler() { diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java similarity index 95% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java index 3f51bc824ce..82ba22ac344 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -49,28 +49,28 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import static jdk.incubator.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; -import static jdk.incubator.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.MAIN_CLASS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; +import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT; +import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; +import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; +import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON; +import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; public class MacAppImageBuilder extends AbstractAppImageBuilder { 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 OS_TYPE_CODE = "APPL"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java similarity index 94% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java index 44e7ecf0581..8dcbdd8b765 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Files; import java.nio.file.Path; @@ -35,16 +35,16 @@ import java.util.Objects; import java.util.Optional; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; -import static jdk.incubator.jpackage.internal.MacAppBundler.DEFAULT_ICNS_ICON; -import static jdk.incubator.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; +import static jdk.jpackage.internal.MacAppBundler.DEFAULT_ICNS_ICON; +import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; public class MacAppStoreBundler extends MacBaseInstallerBundler { 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"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java similarity index 95% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java index 1d7c999ba2d..4d38cd3e167 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,10 +36,10 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; public abstract class MacBaseInstallerBundler extends AbstractBundler { diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java similarity index 99% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java index b1c0ec78bca..75dd82c8ff0 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java index 2973731010f..32b5c261097 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.File; @@ -37,20 +37,20 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.MacAppImageBuilder.ICON_ICNS; -import static jdk.incubator.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.MacAppImageBuilder.ICON_ICNS; +import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; +import static jdk.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; public class MacDmgBundler extends MacBaseInstallerBundler { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); // Background image name in resources static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java index 5b5b8189234..27b74a10641 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.PrintWriter; @@ -40,21 +40,21 @@ import java.util.Objects; import java.util.Optional; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; -import static jdk.incubator.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; +import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; +import static jdk.jpackage.internal.OverridableResource.createResource; public class MacPkgBundler extends MacBaseInstallerBundler { 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"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Info-lite.plist.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info-lite.plist.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Info-lite.plist.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info-lite.plist.template diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources.properties rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Runtime-Info.plist.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Runtime-Info.plist.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Runtime-Info.plist.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Runtime-Info.plist.template diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_dmg.tiff similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_dmg.tiff diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_pkg.png b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_pkg.png similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_pkg.png rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_pkg.png diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/java.icns b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/java.icns similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/java.icns rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/java.icns diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/lic_template.plist b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/lic_template.plist rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/postinstall.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/postinstall.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/postinstall.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/postinstall.template diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/preinstall.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/preinstall.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/preinstall.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/preinstall.template diff --git a/src/jdk.incubator.jpackage/linux/classes/module-info.java.extra b/src/jdk.jpackage/macosx/classes/module-info.java.extra similarity index 85% rename from src/jdk.incubator.jpackage/linux/classes/module-info.java.extra rename to src/jdk.jpackage/macosx/classes/module-info.java.extra index 0c2987a8bf4..158209e9796 100644 --- a/src/jdk.incubator.jpackage/linux/classes/module-info.java.extra +++ b/src/jdk.jpackage/macosx/classes/module-info.java.extra @@ -23,8 +23,9 @@ * questions. */ -provides jdk.incubator.jpackage.internal.Bundler with - jdk.incubator.jpackage.internal.LinuxAppBundler, - jdk.incubator.jpackage.internal.LinuxDebBundler, - jdk.incubator.jpackage.internal.LinuxRpmBundler; +provides jdk.jpackage.internal.Bundler with + jdk.jpackage.internal.MacAppBundler, + jdk.jpackage.internal.MacAppStoreBundler, + jdk.jpackage.internal.MacDmgBundler, + jdk.jpackage.internal.MacPkgBundler; diff --git a/src/jdk.incubator.jpackage/macosx/native/applauncher/MacLauncher.cpp b/src/jdk.jpackage/macosx/native/applauncher/MacLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/macosx/native/applauncher/MacLauncher.cpp rename to src/jdk.jpackage/macosx/native/applauncher/MacLauncher.cpp diff --git a/src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp b/src/jdk.jpackage/macosx/native/common/MacSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp rename to src/jdk.jpackage/macosx/native/common/MacSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java similarity index 91% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java index a941c66d721..da73b9a6419 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; import java.util.Map; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.SOURCE_DIR; -import jdk.incubator.jpackage.internal.resources.ResourceLocator; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.SOURCE_DIR; +import jdk.jpackage.internal.resources.ResourceLocator; /* * AbstractAppImageBuilder diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java index ef2ed7433ba..b615176fd15 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Path; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java index ade19cd2c3a..bf2107f6210 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; import java.util.List; -import jdk.incubator.jpackage.internal.Arguments.CLIOptions; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; +import jdk.jpackage.internal.Arguments.CLIOptions; +import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; /* * AddLauncherArguments diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java similarity index 93% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java index 56c0633bb07..5ee569c94e4 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -32,10 +32,10 @@ import java.text.MessageFormat; import java.util.Map; import java.util.Objects; import java.util.function.Function; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; class AppImageBundler extends AbstractBundler { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java index d51f40fa825..a2b4278e47c 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -43,9 +43,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; public class AppImageFile { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java index ef2e1eef136..c725afed3a1 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.util.Map; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java index 9efcbe8cc8f..ae44d28b8f7 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.Reader; @@ -57,7 +57,7 @@ import java.util.regex.Pattern; */ public class Arguments { 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_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(); String type = deployParams.getTargetFormat(); String bundleType = (appImage ? "IMAGE" : "INSTALLER"); - for (jdk.incubator.jpackage.internal.Bundler bundler : + for (jdk.jpackage.internal.Bundler bundler : Bundlers.createBundlersInstance().getBundlers(bundleType)) { if (type == null) { if (bundler.isDefault() @@ -651,7 +651,7 @@ public class Arguments { StandardBundlerParam.TEMP_ROOT.fetchFrom(params); // determine what bundler to run - jdk.incubator.jpackage.internal.Bundler bundler = getPlatformBundler(); + jdk.jpackage.internal.Bundler bundler = getPlatformBundler(); if (bundler == null) { throw new PackagerException("ERR_InvalidInstallerType", diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java index f6ad3cbe17a..7f444fe7337 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Arrays; import java.util.Collection; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java similarity index 95% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java index de56acc110b..453d6963be2 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.HashMap; import java.util.Map; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; public class BundleParams { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java index be702f711ea..59916fc3ca1 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.util.Map; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java index 0db8c8cc95b..4173980002b 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Map; import java.util.function.BiFunction; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java index 88150ce4f0e..955952d563d 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Collection; import java.util.Iterator; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java index 6f803d549b8..d9ee8d81bfd 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.ResourceBundle; import java.io.File; @@ -38,7 +38,7 @@ import java.text.MessageFormat; public class CLIHelp { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.HelpResources"); + "jdk.jpackage.internal.resources.HelpResources"); // generates --help for jpackage's CLI public static void showHelp(boolean noArgs) { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java similarity index 92% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java index 99d3f77bbfa..0826e3970a4 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.File; @@ -32,11 +32,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ARGUMENTS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS; +import static jdk.jpackage.internal.StandardBundlerParam.ARGUMENTS; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; /** * App launcher's config file. diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java index 8dba7bd383c..5a43fbe93fe 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; public class ConfigException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java index 2c54a089ce5..0783c327e11 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java index 8ade9a28ace..652c90ae1e6 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.math.BigInteger; import java.text.MessageFormat; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java index 0ada00dec68..320a63190b5 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java similarity index 88% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java index b4b9be9f150..7f8ff7fa168 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.text.MessageFormat; @@ -33,12 +33,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; +import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; +import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; +import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON; +import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; final class FileAssociation { void verify() { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java similarity index 84% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java index dac2e930c85..f349b71126e 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.ResourceBundle; @@ -36,20 +36,20 @@ class I18N { } private static final ResourceBundle SHARED = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); private static final ResourceBundle PLATFORM; static { if (Platform.isLinux()) { PLATFORM = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.LinuxResources"); + "jdk.jpackage.internal.resources.LinuxResources"); } else if (Platform.isWindows()) { PLATFORM = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.WinResources"); + "jdk.jpackage.internal.resources.WinResources"); } else if (Platform.isMac()) { PLATFORM = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); } else { throw new IllegalStateException("Unknwon platform"); } diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java index 27ae1f175b9..414ae2275ee 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java index cbd9eda8d43..343c469f931 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java similarity index 93% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java index e4d18a4656f..18f7f5df21a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.PrintWriter; import java.util.spi.ToolProvider; @@ -43,7 +43,7 @@ public class JPackageToolProvider implements ToolProvider { public synchronized int run( PrintWriter out, PrintWriter err, String... args) { 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) { Log.fatalError(re.getMessage()); Log.verbose(re); diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java index ef9d36854f3..2541ffdc20a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; @@ -46,7 +46,7 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.stream.Collectors; 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. diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java index e1e6b1bff05..c20066075d2 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.PrintWriter; import java.text.SimpleDateFormat; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java index c29a8b63840..23ed0ee7477 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -42,8 +42,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; -import jdk.incubator.jpackage.internal.resources.ResourceLocator; +import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; +import jdk.jpackage.internal.resources.ResourceLocator; /** @@ -52,7 +52,7 @@ import jdk.incubator.jpackage.internal.resources.ResourceLocator; * jpackage parameter. * * 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. * * Public name is a path relative to resource directory to a file with custom diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java similarity index 94% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java index e5414b23188..b5f514ae1ab 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.text.MessageFormat; import java.util.ResourceBundle; @@ -31,7 +31,7 @@ import java.util.ResourceBundle; public class PackagerException extends Exception { private static final long serialVersionUID = 1L; private static final ResourceBundle bundle = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); public PackagerException(Throwable cause) { super(cause); diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java index d7e332f3fbf..2cb44db59f9 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java index 7b03b36fe4d..5849c1777ac 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.regex.Pattern; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java index 54aa2333df4..6102e24c015 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java index 2370389d52b..dfa75b217af 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.util.function.Consumer; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java similarity index 92% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java index 9d6f037b400..47fe75da4bc 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -31,9 +31,9 @@ import java.nio.file.Path; import java.util.Map; import java.util.Objects; import java.util.Optional; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; /** * Runs custom script from resource directory. diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java index 173e5183f94..ec8ede14dc4 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; @@ -235,7 +235,7 @@ class StandardBundlerParam extends BundlerParamInfo { Path.class, params -> { try { - return Files.createTempDirectory("jdk.incubator.jpackage"); + return Files.createTempDirectory("jdk.jpackage"); } catch (IOException ioe) { return null; } diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java index 497d46e19be..04519ca710a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Path; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java index de56d448473..5fb8a68fbe2 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.HashMap; -import jdk.incubator.jpackage.internal.Arguments.CLIOptions; +import jdk.jpackage.internal.Arguments.CLIOptions; /** * ValidOptions diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java similarity index 96% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java index c51d1daf425..dfb5da7f829 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal.resources; +package jdk.jpackage.internal.resources; /* * ResourceLocator diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/CommandLine.java b/src/jdk.jpackage/share/classes/jdk/jpackage/main/CommandLine.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/CommandLine.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/main/CommandLine.java index 08ebc23f8fa..e9ab994624b 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/CommandLine.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/CommandLine.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.main; +package jdk.jpackage.main; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java similarity index 92% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java index 7cf25e872c6..1381902f52a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.incubator.jpackage.main; +package jdk.jpackage.main; -import jdk.incubator.jpackage.internal.Arguments; -import jdk.incubator.jpackage.internal.Log; -import jdk.incubator.jpackage.internal.CLIHelp; +import jdk.jpackage.internal.Arguments; +import jdk.jpackage.internal.Log; +import jdk.jpackage.internal.CLIHelp; import java.io.PrintWriter; import java.util.ResourceBundle; import java.io.FileNotFoundException; @@ -37,7 +37,7 @@ import java.text.MessageFormat; public class Main { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); /** * main(String... args) @@ -49,7 +49,7 @@ public class Main { // Create logger with default system.out and system.err Log.setLogger(null); - int status = new jdk.incubator.jpackage.main.Main().execute(args); + int status = new jdk.jpackage.main.Main().execute(args); System.exit(status); } diff --git a/src/jdk.incubator.jpackage/share/classes/module-info.java b/src/jdk.jpackage/share/classes/module-info.java similarity index 86% rename from src/jdk.incubator.jpackage/share/classes/module-info.java rename to src/jdk.jpackage/share/classes/module-info.java index 1b516403a71..475daa0bd56 100644 --- a/src/jdk.incubator.jpackage/share/classes/module-info.java +++ b/src/jdk.jpackage/share/classes/module-info.java @@ -43,20 +43,20 @@ * * * @moduleGraph - * @since 14 + * @since 16 */ -module jdk.incubator.jpackage { +module jdk.jpackage { requires jdk.jlink; requires java.desktop; - uses jdk.incubator.jpackage.internal.Bundler; - uses jdk.incubator.jpackage.internal.Bundlers; + uses jdk.jpackage.internal.Bundler; + uses jdk.jpackage.internal.Bundlers; - provides jdk.incubator.jpackage.internal.Bundlers with - jdk.incubator.jpackage.internal.BasicBundlers; + provides jdk.jpackage.internal.Bundlers with + jdk.jpackage.internal.BasicBundlers; provides java.util.spi.ToolProvider - with jdk.incubator.jpackage.internal.JPackageToolProvider; + with jdk.jpackage.internal.JPackageToolProvider; } diff --git a/src/jdk.incubator.jpackage/share/man/jpackage.1 b/src/jdk.jpackage/share/man/jpackage.1 similarity index 100% rename from src/jdk.incubator.jpackage/share/man/jpackage.1 rename to src/jdk.jpackage/share/man/jpackage.1 diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.cpp b/src/jdk.jpackage/share/native/applauncher/AppLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.cpp rename to src/jdk.jpackage/share/native/applauncher/AppLauncher.cpp diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.h b/src/jdk.jpackage/share/native/applauncher/AppLauncher.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.h rename to src/jdk.jpackage/share/native/applauncher/AppLauncher.h diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.cpp b/src/jdk.jpackage/share/native/applauncher/CfgFile.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.cpp rename to src/jdk.jpackage/share/native/applauncher/CfgFile.cpp diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.h b/src/jdk.jpackage/share/native/applauncher/CfgFile.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.h rename to src/jdk.jpackage/share/native/applauncher/CfgFile.h diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.cpp b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.cpp rename to src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.h b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.h rename to src/jdk.jpackage/share/native/applauncher/JvmLauncher.h diff --git a/src/jdk.incubator.jpackage/share/native/common/Dll.h b/src/jdk.jpackage/share/native/common/Dll.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Dll.h rename to src/jdk.jpackage/share/native/common/Dll.h diff --git a/src/jdk.incubator.jpackage/share/native/common/ErrorHandling.cpp b/src/jdk.jpackage/share/native/common/ErrorHandling.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/ErrorHandling.cpp rename to src/jdk.jpackage/share/native/common/ErrorHandling.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/ErrorHandling.h b/src/jdk.jpackage/share/native/common/ErrorHandling.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/ErrorHandling.h rename to src/jdk.jpackage/share/native/common/ErrorHandling.h diff --git a/src/jdk.incubator.jpackage/share/native/common/FileUtils.cpp b/src/jdk.jpackage/share/native/common/FileUtils.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/FileUtils.cpp rename to src/jdk.jpackage/share/native/common/FileUtils.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/FileUtils.h b/src/jdk.jpackage/share/native/common/FileUtils.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/FileUtils.h rename to src/jdk.jpackage/share/native/common/FileUtils.h diff --git a/src/jdk.incubator.jpackage/share/native/common/Log.cpp b/src/jdk.jpackage/share/native/common/Log.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Log.cpp rename to src/jdk.jpackage/share/native/common/Log.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/Log.h b/src/jdk.jpackage/share/native/common/Log.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Log.h rename to src/jdk.jpackage/share/native/common/Log.h diff --git a/src/jdk.incubator.jpackage/share/native/common/SourceCodePos.h b/src/jdk.jpackage/share/native/common/SourceCodePos.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/SourceCodePos.h rename to src/jdk.jpackage/share/native/common/SourceCodePos.h diff --git a/src/jdk.incubator.jpackage/share/native/common/SysInfo.h b/src/jdk.jpackage/share/native/common/SysInfo.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/SysInfo.h rename to src/jdk.jpackage/share/native/common/SysInfo.h diff --git a/src/jdk.incubator.jpackage/share/native/common/Toolbox.h b/src/jdk.jpackage/share/native/common/Toolbox.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Toolbox.h rename to src/jdk.jpackage/share/native/common/Toolbox.h diff --git a/src/jdk.incubator.jpackage/share/native/common/kludge_c++11.h b/src/jdk.jpackage/share/native/common/kludge_c++11.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/kludge_c++11.h rename to src/jdk.jpackage/share/native/common/kludge_c++11.h diff --git a/src/jdk.incubator.jpackage/share/native/common/tstrings.cpp b/src/jdk.jpackage/share/native/common/tstrings.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/tstrings.cpp rename to src/jdk.jpackage/share/native/common/tstrings.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/tstrings.h b/src/jdk.jpackage/share/native/common/tstrings.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/tstrings.h rename to src/jdk.jpackage/share/native/common/tstrings.h diff --git a/src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.cpp b/src/jdk.jpackage/unix/native/common/PlatformLogEvent.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.cpp rename to src/jdk.jpackage/unix/native/common/PlatformLogEvent.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.h b/src/jdk.jpackage/unix/native/common/PlatformLogEvent.h similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.h rename to src/jdk.jpackage/unix/native/common/PlatformLogEvent.h diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixDll.cpp b/src/jdk.jpackage/unix/native/common/UnixDll.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixDll.cpp rename to src/jdk.jpackage/unix/native/common/UnixDll.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixFileUtils.cpp b/src/jdk.jpackage/unix/native/common/UnixFileUtils.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixFileUtils.cpp rename to src/jdk.jpackage/unix/native/common/UnixFileUtils.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.cpp b/src/jdk.jpackage/unix/native/common/UnixSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.cpp rename to src/jdk.jpackage/unix/native/common/UnixSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.h b/src/jdk.jpackage/unix/native/common/UnixSysInfo.h similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.h rename to src/jdk.jpackage/unix/native/common/UnixSysInfo.h diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/ExecutableRebrander.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java similarity index 92% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/ExecutableRebrander.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java index 53af7209d4d..cec106cdd24 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/ExecutableRebrander.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -38,18 +38,18 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; final class ExecutableRebrander { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.WinResources"); + "jdk.jpackage.internal.resources.WinResources"); private static final String LAUNCHER_PROPERTIES_TEMPLATE = "WinLauncher.template"; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/MsiVersion.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/MsiVersion.java similarity index 98% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/MsiVersion.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/MsiVersion.java index 6d8bba3aa30..90a56f38066 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/MsiVersion.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/MsiVersion.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.math.BigInteger; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java similarity index 97% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java index 58a9dddceb6..16ae11e1f4a 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; public class WinAppBundler extends AppImageBundler { public WinAppBundler() { diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinExeBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java similarity index 99% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinExeBundler.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java index b72cf6d1164..96971193957 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinExeBundler.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java index b01455e5acb..8ff2df9998c 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -54,15 +54,15 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; @@ -84,7 +84,7 @@ import org.xml.sax.SAXException; * *

* main.wxs file is a copy of main.wxs resource from - * jdk.incubator.jpackage.internal.resources package. It is parametrized with the + * jdk.jpackage.internal.resources package. It is parametrized with the * following WiX variables: *