8211182: Remove jdk.packager.services.UserJvmOptionsService
Reviewed-by: almatvee
--- a/src/jdk.packager.services/share/classes/jdk/packager/services/UserJvmOptionsService.java Mon Oct 01 08:44:14 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.packager.services;
-
-import jdk.packager.services.userjvmoptions.PreferencesUserJvmOptions;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-/**
- * Runtime access to the UserJVMOptions.
- *
- * This class is not typically available in the Java Runtime, you must
- * explicitly include the 'jdk.packager.services' module from the jmod directory
- * of the JDK as part of your application bundle.
- *
- * @since 9
- */
-public interface UserJvmOptionsService {
-
- /**
- * Get the instance of UserJvmOptionService to use. Which one to use is
- * configured by the packager and the launcher. Do not directly
- * instantiate any instance of this interface, use this method to get
- * an appropriate instance.
- *
- * @return the instance of UserJvmOptionsService for your application.
- */
- static UserJvmOptionsService getUserJVMDefaults() {
- ServiceLoader<UserJvmOptionsService> loader =
- ServiceLoader.load(UserJvmOptionsService.class);
- Iterator<UserJvmOptionsService> iter = loader.iterator();
- if (iter.hasNext()) {
- return iter.next();
- } else {
- return new PreferencesUserJvmOptions();
- }
- }
-
- /**
- * The "current" set of UserJVMOptions.
- *
- * This will take effect on the next application start, and this may not
- * reflect the current set of UserJVMOptions used to start this application.
- *
- * @return A map of the keys and values. Alterations to this map will not
- * change the stored UserJVMOptions
- */
- Map<String, String> getUserJVMOptions();
-
- /**
- * Sets the passed in options as the UserJVMOptions.
- *
- * If the application has specified default values and those keys are not
- * in this map, they will be replaced by the default values.
- *
- * No validation or error checking is performed on these values. It is
- * entirely possible that you may provide a set of UserJVMOptions that
- * may prevent the normal startup of your application and may require
- * manual intervention to resolve.
- *
- * @param options The UserJVMOptions to set.
- */
- void setUserJVMOptions(Map<String, String> options);
-
- /**
- * The "default" set of UserJVMOptions.
- *
- * This returns the default set of keys and values that the application has
- * been configured to use.
- *
- * @return the keys and values of the default UserJVMOptions.
- * @throws UnsupportedOperationException if the defaults cannot be calculated.
- */
- Map<String, String> getUserJVMOptionDefaults();
-}
--- a/src/jdk.packager.services/share/classes/jdk/packager/services/userjvmoptions/LauncherUserJvmOptions.java Mon Oct 01 08:44:14 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.packager.services.userjvmoptions;
-
-import jdk.packager.services.UserJvmOptionsService;
-
-import java.security.AllPermission;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * Access the UserJVMOptions via a native library provided by the launcher.
- *
- * Do not instantiate this class directly, instead use
- * {@see jdk.packager.services.UserJvmOptionsService#getUserJVMDefaults()}
- * to get an instance.
- *
- * @since 8u40
- */
-final public class LauncherUserJvmOptions implements UserJvmOptionsService {
-
- private static final Object semaphore = new Object();
-
- static {
- try {
- checkAllPermissions();
- System.loadLibrary("packager");
- } catch (SecurityException se) {
- se.printStackTrace(System.err);
- // fail to load, we will also throw on all public methods
- }
- }
-
- private static void checkAllPermissions() {
- final SecurityManager securityManager = System.getSecurityManager();
- if (securityManager != null) {
- securityManager.checkPermission(new AllPermission());
- }
- }
-
- /**
- * Access the default User JVM Option for a specific key
- *
- * @param option the key for the User JVM Option
- *
- * @return the default value of the user JVM Option. Currently set user
- * values are not considered, and only the default is returned. If there
- * is no default value then null is returned.
- */
- private static native String _getUserJvmOptionDefaultValue(String option);
-
- /**
- * This lists the keys for User JVM Options that will have a default
- * provided by the launcher.
- *
- * This list will be a subset of the keys used by the launcher and only
- * lists those values that will have a default value provided if the user
- * does not set a value of their own.
- *
- * @return an array of keys in no particular order.
- */
- private static native String[] _getUserJvmOptionDefaultKeys();
- /**
- * Access the current User JVM Option for a specific key
- *
- * @param option the key for the User JVM Option
- *
- * @return the current value of the user JVM Option. If the user has not
- * set a value then the default value is returned, except in the case where
- * there is no default value, where null is returned.
- */
- private static native String _getUserJvmOptionValue(String option);
-
- /**
- * Update the all User JVM Options
- *
- * All option/value pairs will be replaced with the values provided. The
- * parameters options and values are paired at the same index.
- * Example: options[3] = -Xmx and values[3] = 999m
- * This cannot be used to adjust default values.
- *
- * @param options the keys for the User JVM Options
- * @param values the values for the User JVM Options
- */
- private static native void _setUserJvmKeysAndValues(String[] options,
- String[] values);
-
- /**
- * This lists the keys for all User JVM Options that will be used by the
- * launcher.
- *
- * This list will be a superset of the defaults as may also include user
- * values that do not have a default.
- *
- * @return an array of keys in no particular order.
- */
- private static native String[] _getUserJvmOptionKeys();
-
- @Override
- public Map<String, String> getUserJVMOptions() {
- checkAllPermissions();
- synchronized (semaphore) {
- Map<String, String> results = new LinkedHashMap<>();
- for (String s : _getUserJvmOptionKeys()) {
- results.put(s, _getUserJvmOptionValue(s));
- }
- return results;
- }
- }
-
- @Override
- public void setUserJVMOptions(Map<String, String> options) {
- checkAllPermissions();
- synchronized (semaphore) {
- List<String> keys = new LinkedList<>();
- List<String> values = new LinkedList<>();
-
- for (Map.Entry<String, String> option : options.entrySet()) {
- if (option.getKey() == null) {
- throw new IllegalArgumentException(
- "For Launcher Backed UserJVMOptions keys in the "
- + "UserJVMOptions map cannot be null.");
- }
- if (option.getValue() == null) {
- throw new IllegalArgumentException(
- "For Launcher Backed UserJVMOptions values in the "
- + "UserJVMOptions map cannot be null. Keys are "
- + "removed by absence, not by setting keys to null."
- );
- }
- keys.add(option.getKey());
- values.add(option.getValue());
- }
-
- _setUserJvmKeysAndValues(keys.toArray(new String[keys.size()]),
- values.toArray(new String[values.size()]));
- }
- }
-
- @Override
- public Map<String, String> getUserJVMOptionDefaults() {
- checkAllPermissions();
- synchronized (semaphore) {
- Map<String, String> results = new LinkedHashMap<>();
- for (String s : _getUserJvmOptionDefaultKeys()) {
- results.put(s, _getUserJvmOptionDefaultValue(s));
- }
- return results;
- }
- }
-}
--- a/src/jdk.packager.services/share/classes/jdk/packager/services/userjvmoptions/PreferencesUserJvmOptions.java Mon Oct 01 08:44:14 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.packager.services.userjvmoptions;
-
-import jdk.packager.services.UserJvmOptionsService;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
-
-/**
- * Access to old preferences based UserJvmOptions
- *
- * Do not instantiate this class directly, instead use
- * {@see jdk.packager.services.UserJvmOptionsService#getUserJVMDefaults()}
- * to get an instance.
- *
- * @since 8u40
- */
-final public class PreferencesUserJvmOptions implements UserJvmOptionsService {
-
- Preferences node = Preferences.userRoot().node(System.getProperty(
- "app.preferences.id").replace(".", "/")).node("JVMUserOptions");
-
- @Override
- public Map<String, String> getUserJVMOptions() {
- Map<String, String> result = new LinkedHashMap<>();
- try {
- for (String s : node.childrenNames()) {
- String o = node.get(s, null);
- if (o != null) {
- result.put(s, o);
- }
- }
- } catch (BackingStoreException ignore) {
- }
-
- return result;
- }
-
- @Override
- public void setUserJVMOptions(Map<String, String> options) {
- try {
- node.clear();
- for (Map.Entry<String, String> entry : options.entrySet()) {
- node.put(entry.getKey(), entry.getValue());
- }
- node.flush();
- } catch (BackingStoreException ignore) {
- }
-
- }
-
- @Override
- public Map<String, String> getUserJVMOptionDefaults() {
- throw new UnsupportedOperationException(
- "Preferences backed UserJvmOptions do not enumerate their defaults");
- }
-}
--- a/src/jdk.packager.services/share/classes/module-info.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager.services/share/classes/module-info.java Mon Oct 01 09:04:49 2018 -0400
@@ -30,13 +30,8 @@
* @since 11
*/
module jdk.packager.services {
- exports jdk.packager.services;
exports jdk.packager.services.singleton;
- requires java.prefs;
requires java.desktop;
- uses jdk.packager.services.UserJvmOptionsService;
-
- provides jdk.packager.services.UserJvmOptionsService with jdk.packager.services.userjvmoptions.LauncherUserJvmOptions;
-}
\ No newline at end of file
+}
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/linux/LinuxAppBundler.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/linux/LinuxAppBundler.java Mon Oct 01 09:04:49 2018 -0400
@@ -332,7 +332,6 @@
MAIN_JAR,
PREFERENCES_ID,
PRELOADER_CLASS,
- USER_JVM_OPTIONS,
VERSION,
VERBOSE
);
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler.properties Mon Oct 01 09:04:49 2018 -0400
@@ -24,5 +24,4 @@
error.cannot-write-to-output-dir=Output directory {0} is not writable.
message.creating-bundle-location=Creating app bundle\: {0}
-message.jvm-user-arg-is-null=WARNING\: a jvmuserarg has a null name or value
message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_ja.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_ja.properties Mon Oct 01 09:04:49 2018 -0400
@@ -18,5 +18,4 @@
error.cannot-write-to-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u4E0D\u53EF\u3067\u3059\u3002
message.creating-bundle-location=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {0}
-message.jvm-user-arg-is-null=\u8B66\u544A: jvmuserarg\u306Bnull\u306E\u540D\u524D\u307E\u305F\u306F\u5024\u304C\u3042\u308A\u307E\u3059
message.icon-not-png=\u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FPNG\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_zh_CN.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_zh_CN.properties Mon Oct 01 09:04:49 2018 -0400
@@ -18,5 +18,4 @@
error.cannot-write-to-output-dir=\u8F93\u51FA\u76EE\u5F55 {0} \u4E0D\u53EF\u5199\u3002
message.creating-bundle-location=\u6B63\u5728\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305: {0}
-message.jvm-user-arg-is-null=\u8B66\u544A: jvmuserarg \u7684\u540D\u79F0\u6216\u503C\u4E3A\u7A7A\u503C
message.icon-not-png=\u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F PNG \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/builders/mac/MacAppImageBuilder.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/builders/mac/MacAppImageBuilder.java Mon Oct 01 09:04:49 2018 -0400
@@ -632,21 +632,6 @@
data.put("DEPLOY_ARGUMENTS", sb.toString());
newline = "";
- sb = new StringBuilder();
- Map<String, String> overridableJVMOptions =
- USER_JVM_OPTIONS.fetchFrom(params);
- for (Map.Entry<String, String> arg : overridableJVMOptions.entrySet()) {
- sb.append(newline)
- .append(" <key>")
- .append(arg.getKey())
- .append("</key>\n")
- .append(" <string>")
- .append(arg.getValue())
- .append("</string>");
- newline = "\n";
- }
- data.put("DEPLOY_JVM_USER_OPTIONS", sb.toString());
-
data.put("DEPLOY_LAUNCHER_CLASS", MAIN_CLASS.fetchFrom(params));
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacAppBundler.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacAppBundler.java Mon Oct 01 09:04:49 2018 -0400
@@ -499,7 +499,6 @@
MAIN_JAR,
PREFERENCES_ID,
SIGNING_KEYCHAIN,
- USER_JVM_OPTIONS,
VERSION,
VERBOSE
);
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/Info.plist.template Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/Info.plist.template Mon Oct 01 09:04:49 2018 -0400
@@ -46,10 +46,6 @@
<array>
DEPLOY_JVM_OPTIONS
</array>
- <key>JVMUserOptions</key>
- <dict>
-DEPLOY_JVM_USER_OPTIONS
- </dict>
<key>ArgOptions</key>
<array>
DEPLOY_ARGUMENTS
--- a/src/jdk.packager/share/classes/jdk/packager/Main.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/Main.java Mon Oct 01 09:04:49 2018 -0400
@@ -61,8 +61,10 @@
}
public static int run(String... args) throws Exception {
- if (args.length == 0 || args.length == 1 && args[0].equals("--help")) {
- CLIHelp.showHelp();
+ if (args.length == 0) {
+ CLIHelp.showHelp(true);
+ } else if (hasHelp(args)){
+ CLIHelp.showHelp(false);
} else if (args.length == 1 && args[0].equals("--version")) {
Log.info(version);
} else {
@@ -84,4 +86,14 @@
return 0;
}
+
+ private static boolean hasHelp(String[] args) {
+ for (String a : args) {
+ if ("--help".equals(a) || "-h".equals(a)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/AbstractImageBundler.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/AbstractImageBundler.java Mon Oct 01 09:04:49 2018 -0400
@@ -46,19 +46,6 @@
throws ConfigException {
StandardBundlerParam.validateMainClassInfoFromAppResources(p);
- Map<String, String> userJvmOptions = USER_JVM_OPTIONS.fetchFrom(p);
- if (userJvmOptions != null) {
- for (Map.Entry<String, String> entry : userJvmOptions.entrySet()) {
- if (entry.getValue() == null || entry.getValue().isEmpty()) {
- throw new ConfigException(
- MessageFormat.format(I18N.getString(
- "error.empty-user-jvm-option-value"),
- entry.getKey()), I18N.getString(
- "error.empty-user-jvm-option-value.advice"));
- }
- }
- }
-
boolean hasMainJar = MAIN_JAR.fetchFrom(p) != null;
boolean hasMainModule =
StandardBundlerParam.MODULE.fetchFrom(p) != null;
--- a/src/jdk.packager/share/classes/jdk/packager/internal/Arguments.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/Arguments.java Mon Oct 01 09:04:49 2018 -0400
@@ -249,11 +249,6 @@
args.forEach(a -> setOptionValue("jvm-args", a));
}),
- USER_JVM_ARGS ("user-jvm-args", OptionCategories.PROPERTY, () -> {
- List<String> args = getArgumentList(popArg());
- args.forEach(a -> setOptionValue("user-jvm-args", a));
- }),
-
FILE_ASSOCIATIONS ("file-associations",
OptionCategories.PROPERTY, () -> {
Map<String, ? super Object> args = new HashMap<>();
--- a/src/jdk.packager/share/classes/jdk/packager/internal/CLIHelp.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/CLIHelp.java Mon Oct 01 09:04:49 2018 -0400
@@ -33,7 +33,7 @@
"jdk.packager.internal.resources.CLIHelp");
// generates --help for jpackager's CLI
- public static void showHelp() {
+ public static void showHelp(boolean all) {
Platform platform = Platform.getPlatform();
Log.info(I18N.getString("MSG_Help_common"));
@@ -41,12 +41,24 @@
switch (platform) {
case MAC:
Log.info(I18N.getString("MSG_Help_mac"));
+ if (all) {
+ Log.info(I18N.getString("MSG_Help_win"));
+ Log.info(I18N.getString("MSG_Help_linux"));
+ }
break;
case LINUX:
Log.info(I18N.getString("MSG_Help_linux"));
+ if (all) {
+ Log.info(I18N.getString("MSG_Help_win"));
+ Log.info(I18N.getString("MSG_Help_mac"));
+ }
break;
case WINDOWS:
Log.info(I18N.getString("MSG_Help_win"));
+ if (all) {
+ Log.info(I18N.getString("MSG_Help_linux"));
+ Log.info(I18N.getString("MSG_Help_mac"));
+ }
break;
}
}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/DeployParams.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/DeployParams.java Mon Oct 01 09:04:49 2018 -0400
@@ -113,7 +113,6 @@
// list of jvm args
// (in theory string can contain spaces and need to be escaped
List<String> jvmargs = new LinkedList<>();
- Map<String, String> jvmUserArgs = new LinkedHashMap<>();
// list of jvm properties (can also be passed as VM args
// but keeping them separate make it a bit more convinient
@@ -214,10 +213,6 @@
jvmargs.add(v);
}
- public void addJvmUserArg(String n, String v) {
- jvmUserArgs.put(n, v);
- }
-
public void addJvmProperty(String n, String v) {
properties.put(n, v);
}
@@ -554,7 +549,6 @@
static final Set<String> multi_args = new TreeSet<>(Arrays.asList(
StandardBundlerParam.JVM_PROPERTIES.getID(),
StandardBundlerParam.JVM_OPTIONS.getID(),
- StandardBundlerParam.USER_JVM_OPTIONS.getID(),
StandardBundlerParam.ARGUMENTS.getID(),
StandardBundlerParam.MODULE_PATH.getID(),
StandardBundlerParam.ADD_MODULES.getID(),
@@ -635,7 +629,6 @@
bundleParams.setJvmProperties(properties);
bundleParams.setJvmargs(jvmargs);
- bundleParams.setJvmUserArgs(jvmUserArgs);
bundleParams.setArguments(arguments);
if (addModules != null && !addModules.isEmpty()) {
--- a/src/jdk.packager/share/classes/jdk/packager/internal/SecondaryLauncherArguments.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/SecondaryLauncherArguments.java Mon Oct 01 09:04:49 2018 -0400
@@ -90,11 +90,6 @@
putUnlessNullOrEmpty(bundleParams,
CLIOptions.JVM_ARGS.getId(),
Arguments.getArgumentList(jvmargsStr));
-
- String jvmUserArgsStr = getOptionValue(CLIOptions.USER_JVM_ARGS);
- putUnlessNullOrEmpty(bundleParams,
- CLIOptions.USER_JVM_ARGS.getId(),
- Arguments.getArgumentMap(jvmUserArgsStr));
}
private String getOptionValue(CLIOptions option) {
--- a/src/jdk.packager/share/classes/jdk/packager/internal/StandardBundlerParam.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/StandardBundlerParam.java Mon Oct 01 09:04:49 2018 -0400
@@ -316,32 +316,6 @@
}
);
- @SuppressWarnings("unchecked")
- public static final
- StandardBundlerParam<Map<String, String>> USER_JVM_OPTIONS =
- new StandardBundlerParam<>(
- I18N.getString("param.user-jvm-options.name"),
- I18N.getString("param.user-jvm-options.description"),
- Arguments.CLIOptions.USER_JVM_ARGS.getId(),
- (Class<Map<String, String>>) (Object) Map.class,
- params -> Collections.emptyMap(),
- (s, params) -> {
- Map<String, String> map = new HashMap<>();
- try {
- Properties p = new Properties();
- p.load(new StringReader(s));
- for (Map.Entry<Object, Object> entry :
- p.entrySet()) {
- map.put((String)entry.getKey(),
- (String)entry.getValue());
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- return map;
- }
- );
-
public static final StandardBundlerParam<String> TITLE =
new StandardBundlerParam<>(
I18N.getString("param.title.name"),
--- a/src/jdk.packager/share/classes/jdk/packager/internal/ValidOptions.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/ValidOptions.java Mon Oct 01 09:04:49 2018 -0400
@@ -61,8 +61,6 @@
add(CLIOptions.CREATE_IMAGE, CLIOptions.ICON);
add(CLIOptions.CREATE_IMAGE, CLIOptions.VERSION);
add(CLIOptions.CREATE_IMAGE, CLIOptions.JVM_ARGS);
- add(CLIOptions.CREATE_IMAGE, CLIOptions.USER_JVM_ARGS);
- add(CLIOptions.CREATE_IMAGE, CLIOptions.USER_JVM_ARGS);
add(CLIOptions.CREATE_IMAGE, CLIOptions.SECONDARY_LAUNCHER);
add(CLIOptions.CREATE_IMAGE, CLIOptions.BUILD_ROOT);
add(CLIOptions.CREATE_IMAGE, CLIOptions.ECHO_MODE);
--- a/src/jdk.packager/share/classes/jdk/packager/internal/builders/AbstractAppImageBuilder.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/builders/AbstractAppImageBuilder.java Mon Oct 01 09:04:49 2018 -0400
@@ -46,7 +46,6 @@
import static jdk.packager.internal.StandardBundlerParam.*;
import static jdk.packager.internal.StandardBundlerParam.ARGUMENTS;
-import static jdk.packager.internal.StandardBundlerParam.USER_JVM_OPTIONS;
import java.util.ArrayList;
import jdk.packager.internal.JLinkBundlerHelper;
import jdk.packager.internal.Module;
@@ -246,18 +245,6 @@
out.println("-Djavafx.preloader="+preloader);
}
-
- out.println();
- out.println("[JVMUserOptions]");
- Map<String, String> overridableJVMOptions = USER_JVM_OPTIONS.fetchFrom(params);
- for (Map.Entry<String, String> arg: overridableJVMOptions.entrySet()) {
- if (arg.getKey() == null || arg.getValue() == null) {
- Log.info(I18N.getString("message.jvm-user-arg-is-null"));
- } else {
- out.println(arg.getKey().replaceAll("([\\=])", "\\\\$1") + "=" + arg.getValue());
- }
- }
-
out.println();
out.println("[ArgOptions]");
List<String> args = ARGUMENTS.fetchFrom(params);
--- a/src/jdk.packager/share/classes/jdk/packager/internal/bundlers/BundleParams.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/bundlers/BundleParams.java Mon Oct 01 09:04:49 2018 -0400
@@ -158,11 +158,6 @@
putUnlessNullOrEmpty(JVM_OPTIONS.getID(), jvmargs);
}
- public void setJvmUserArgs(Map<String, String> userArgs) {
-
- putUnlessNullOrEmpty(USER_JVM_OPTIONS.getID(), userArgs);
- }
-
public void setJvmProperties(Map<String, String> jvmProperties) {
putUnlessNullOrEmpty(JVM_PROPERTIES.getID(), jvmProperties);
}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractImageBundler.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractImageBundler.properties Mon Oct 01 09:04:49 2018 -0400
@@ -4,9 +4,6 @@
error.jre-missing-file=Java Runtime does not include {0}
error.jre-missing-file.advice=Make sure ant is using Oracle JDK 8 or later.
-error.empty-user-jvm-option-value=UserJvmOption key ''{0}'' has a null or empty value.
-error.empty-user-jvm-option-value.advice=Provide a value for the key or split the key into a key/value pair. Such as '-Xmx1G' into '-Xmx' and '1G'.
-
error.no-application-class=Main application class is missing.
error.no-application-class.advice=Please specify main application class.
@@ -22,4 +19,3 @@
error.app-cds-no-commercial-unlock=AppCDS Requires Commercial Features to be Unlocked.
error.app-cds-no-commercial-unlock.advice=Verify you have a license for commercial features for the Oracle Java Runtime the set the bundler argument 'commercialFeatures' to 'true'.
-message.jvm-user-arg-is-null=WARNING\: a jvmuserarg has a null name or value.
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractImageBundler_ja.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractImageBundler_ja.properties Mon Oct 01 09:04:49 2018 -0400
@@ -4,10 +4,6 @@
error.jre-missing-file=Java\u30e9\u30f3\u30bf\u30a4\u30e0\u306b{0}\u306f\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
error.jre-missing-file.advice=ant\u304cOracle JDK 8\u4ee5\u4e0a\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-error.empty-user-jvm-option-value=UserJvmOption\u30ad\u30fc''{0}''\u306bnull\u307e\u305f\u306f\u7a7a\u306e\u5024\u304c\u3042\u308a\u307e\u3059\u3002
-error.empty-user-jvm-option-value.advice=\u30ad\u30fc\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u304b\u3001\u30ad\u30fc\u3092\u30ad\u30fc/\u5024\u306e\u30da\u30a2\u306b\u5206\u5272\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u305f\u3068\u3048\u3070\u3001'-Xmx1G'\u3092'-Xmx'\u3068'1G'\u306b\u5206\u5272\u3057\u307e\u3059\u3002
-
-
error.no-main-module=\u30e1\u30a4\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002
error.no-main-module.advice=fx:module\u30bf\u30b9\u30af\u3092\u4f7f\u7528\u3057\u3066\u3001\u30e2\u30b8\u30e5\u30e9\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -20,4 +16,3 @@
error.app-cds-no-commercial-unlock=AppCDS\u306b\u306f\u3001\u5546\u7528\u6a5f\u80fd\u306e\u30ed\u30c3\u30af\u89e3\u9664\u304c\u5fc5\u8981\u3067\u3059\u3002
error.app-cds-no-commercial-unlock.advice=\u30d0\u30f3\u30c9\u30e9\u5f15\u6570'commercialFeatures'\u3092'true'\u306b\u8a2d\u5b9a\u3057\u305fOracle Java Runtime\u306e\u5546\u7528\u6a5f\u80fd\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u3092\u6301\u3063\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-message.jvm-user-arg-is-null=\u8b66\u544a: jvmuserarg\u306bnull\u306e\u540d\u524d\u307e\u305f\u306f\u5024\u304c\u3042\u308a\u307e\u3059\u3002
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractImageBundler_zh_CN.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractImageBundler_zh_CN.properties Mon Oct 01 09:04:49 2018 -0400
@@ -4,10 +4,6 @@
error.jre-missing-file=Java \u8fd0\u884c\u65f6\u4e0d\u5305\u62ec {0}
error.jre-missing-file.advice=\u786e\u4fdd ant \u4f7f\u7528\u7684\u662f Oracle JDK 8 \u6216\u66f4\u9ad8\u7248\u672c\u3002
-error.empty-user-jvm-option-value=UserJvmOption \u952e ''{0}'' \u5177\u6709\u7a7a\u503c\u6216\u503c\u4e3a\u7a7a\u3002
-error.empty-user-jvm-option-value.advice=\u63d0\u4f9b\u952e\u7684\u503c\u6216\u8005\u5c06\u952e\u62c6\u5206\u4e3a\u952e/\u503c\u5bf9\u3002\u4f8b\u5982\u5c06 '-Xmx1G' \u62c6\u5206\u4e3a '-Xmx' \u548c '1G'\u3002
-
-
error.no-main-module=\u7f3a\u5c11\u4e3b\u5e94\u7528\u7a0b\u5e8f\u6a21\u5757\u3002
error.no-main-module.advice=\u786e\u4fdd\u4f7f\u7528 fx:module \u4efb\u52a1\u521b\u5efa\u6a21\u5757\u5316\u5e94\u7528\u7a0b\u5e8f\u3002
@@ -20,4 +16,3 @@
error.app-cds-no-commercial-unlock=AppCDS \u9700\u8981\u5f00\u542f\u5546\u4e1a\u529f\u80fd\u3002
error.app-cds-no-commercial-unlock.advice=\u786e\u4fdd\u60a8\u5177\u6709 Oracle Java \u8fd0\u884c\u65f6\u7684\u5546\u4e1a\u529f\u80fd\u8bb8\u53ef\u8bc1, \u5e76\u4e14\u5c06\u6253\u5305\u7a0b\u5e8f\u53c2\u6570 'commercialFeatures' \u8bbe\u7f6e\u4e3a 'true'\u3002
-message.jvm-user-arg-is-null=\u8b66\u544a: jvmuserarg \u7684\u540d\u79f0\u6216\u503c\u4e3a\u7a7a\u503c\u3002
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties Mon Oct 01 09:04:49 2018 -0400
@@ -28,6 +28,10 @@
Generates a Server JRE installer.\n\
\n\
The following options are valid for all platforms:\n\
+\ --help -i \n\
+\ Shows the usage text, followed by a list and description of each valid option for the current platform and the given mode.\n\
+\ If no mode is given, shows the usage text, followed by a list and description of each valid option for the current platform.\n\
+\ When this option is used, all other options are ignored.\n\
\ --output -o\n\
\ Name of the directory where generated output file is placed.\n\
\ --input -i\n\
@@ -66,9 +70,6 @@
\ Removes native executables from the custom run-time images.\n\
\ --jvm-args\n\
\ JVM flags and options to pass to the application.\n\
-\ --user-jvm-args\n\
-\ JVM options the user may override along and their default values\n\
-\ (see UserJvmOptionsService API for more details).\n\
\ --file-associations\n\
\ Properties file that contains list of key=value parameters that\n\
\ describe a file association. "extension", "mime-type", "icon",\n\
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam.properties Mon Oct 01 09:04:49 2018 -0400
@@ -88,9 +88,6 @@
param.use-javafx-packaging.name=FX Packaging
param.use-javafx-packaging.description=Should we use the JavaFX packaging conventions?
-param.user-jvm-options.name=User JVM Options
-param.user-jvm-options.description=JVM Options the user may override, along with their default values.
-
param.vendor.name=Vendor
param.vendor.description=The vendor of the application.
param.vendor.default=Unknown
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_ja.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_ja.properties Mon Oct 01 09:04:49 2018 -0400
@@ -101,9 +101,6 @@
param.use-javafx-packaging.name=FX\u30D1\u30C3\u30B1\u30FC\u30B8\u30F3\u30B0
param.use-javafx-packaging.description=JavaFX\u30D1\u30C3\u30B1\u30FC\u30B8\u30F3\u30B0\u898F\u5247\u3092\u4F7F\u7528\u3057\u307E\u3059\u304B\u3002
-param.user-jvm-options.name=\u30E6\u30FC\u30B6\u30FC\u306EJVM\u30AA\u30D7\u30B7\u30E7\u30F3
-param.user-jvm-options.description=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306B\u52A0\u3048\u3066\u3001\u30E6\u30FC\u30B6\u30FC\u304C\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u308BJVM\u30AA\u30D7\u30B7\u30E7\u30F3\u3002
-
param.vendor.name=\u30D9\u30F3\u30C0\u30FC
param.vendor.description=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30D9\u30F3\u30C0\u30FC\u3002
param.vendor.default=\u4E0D\u660E
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_zh_CN.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_zh_CN.properties Mon Oct 01 09:04:49 2018 -0400
@@ -101,9 +101,6 @@
param.use-javafx-packaging.name=FX \u6253\u5305
param.use-javafx-packaging.description=\u662F\u5426\u5E94\u4F7F\u7528 JavaFX \u6253\u5305\u60EF\u4F8B?
-param.user-jvm-options.name=\u7528\u6237 JVM \u9009\u9879
-param.user-jvm-options.description=\u7528\u6237\u53EF\u4EE5\u8986\u76D6\u7684 JVM \u9009\u9879, \u53CA\u5176\u9ED8\u8BA4\u503C\u3002
-
param.vendor.name=\u4F9B\u5E94\u5546
param.vendor.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u4F9B\u5E94\u5546\u3002
param.vendor.default=\u672A\u77E5
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/AbstractAppImageBuilder.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/AbstractAppImageBuilder.properties Mon Oct 01 09:04:49 2018 -0400
@@ -2,4 +2,3 @@
message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1})
message.using-custom-resource-from-classpath=Using custom package resource {0} (loaded from {1})
message.using-default-resource-from-classpath=Using default package resource {0} (add {1} to the class path to customize)
-message.jvm-user-arg-is-null=WARNING\: a jvmuserarg has a null name or value.
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/AbstractAppImageBuilder_ja.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/AbstractAppImageBuilder_ja.properties Mon Oct 01 09:04:49 2018 -0400
@@ -2,4 +2,3 @@
message.using-custom-resource-from-file=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528(\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
message.using-custom-resource-from-classpath=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
message.using-default-resource-from-classpath=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u3092\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3057\u3066\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA)
-message.jvm-user-arg-is-null=\u8B66\u544A: jvmuserarg\u306Bnull\u306E\u540D\u524D\u307E\u305F\u306F\u5024\u304C\u3042\u308A\u307E\u3059\u3002
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/AbstractAppImageBuilder_zh_CN.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/AbstractAppImageBuilder_zh_CN.properties Mon Oct 01 09:04:49 2018 -0400
@@ -2,4 +2,3 @@
message.using-custom-resource-from-file=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE\u6587\u4EF6 {1} \u52A0\u8F7D)
message.using-custom-resource-from-classpath=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE {1} \u52A0\u8F7D)
message.using-default-resource-from-classpath=\u4F7F\u7528\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u5C06 {1} \u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84\u4EE5\u5B9A\u5236)
-message.jvm-user-arg-is-null=\u8B66\u544A: jvmuserarg \u7684\u540D\u79F0\u6216\u503C\u4E3A\u7A7A\u503C\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler.properties Mon Oct 01 09:04:49 2018 -0400
@@ -29,5 +29,4 @@
message.result-dir=Result application bundle\: {0}
message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.disable-bit-architecture-check=Disabled check for bit architecture mismatch.
-message.jvm-user-arg-is-null=WARNING\: a jvmuserarg has a null name or value
message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_ja.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_ja.properties Mon Oct 01 09:04:49 2018 -0400
@@ -28,5 +28,4 @@
message.result-dir=\u7D50\u679C\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB: {0}
message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.disable-bit-architecture-check=\u30D3\u30C3\u30C8\u30FB\u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3\u306E\u4E0D\u4E00\u81F4\u30C1\u30A7\u30C3\u30AF\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-message.jvm-user-arg-is-null=\u8B66\u544A: jvmuserarg\u306Bnull\u306E\u540D\u524D\u307E\u305F\u306F\u5024\u304C\u3042\u308A\u307E\u3059
message.icon-not-ico=\u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICO\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_zh_CN.properties Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_zh_CN.properties Mon Oct 01 09:04:49 2018 -0400
@@ -28,5 +28,4 @@
message.result-dir=\u751F\u6210\u7684\u5E94\u7528\u7A0B\u5E8F\u5305: {0}
message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.disable-bit-architecture-check=\u5DF2\u7981\u7528\u4F4D\u4F53\u7CFB\u7ED3\u6784\u4E0D\u5339\u914D\u68C0\u67E5\u3002
-message.jvm-user-arg-is-null=\u8B66\u544A: jvmuserarg \u7684\u540D\u79F0\u6216\u503C\u4E3A\u7A7A\u503C
message.icon-not-ico=\u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICO \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WinAppBundler.java Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WinAppBundler.java Mon Oct 01 09:04:49 2018 -0400
@@ -362,7 +362,6 @@
MAIN_JAR,
PREFERENCES_ID,
PRELOADER_CLASS,
- USER_JVM_OPTIONS,
VERSION,
VERBOSE
);