/hg/icedtea-web: Added New Option Parser and used in boot of javaws
ldracz at icedtea.classpath.org
ldracz at icedtea.classpath.org
Thu Sep 18 17:18:24 UTC 2014
changeset e1c7156ed0a1 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e1c7156ed0a1
author: Lukasz Dracz <ldracz at redhat.com>
date: Thu Sep 18 13:18:11 2014 -0400
Added New Option Parser and used in boot of javaws
2014-09-18 Lukasz Dracz <ldracz at redhat.com>
Added New Option Parser and used in boot of javaws
* netx/net/sourceforge/jnlp/Launcher.java:
(addProperties, addArguments, addParameters) refactored to take in
a List<String> instead of String[]
* netx/net/sourceforge/jnlp/OptionsDefinitions.java:
added JNLP to enum OPTIONS
* netx/net/sourceforge/jnlp/ParserSettings.java
(setGlobalParserSettingsFromOptionParser): refactored to take in
an OptionParser instead of args
* netx/net/sourceforge/jnlp/runtime/Boot.java:
Uses OptionParser to parse arguments for options and check whether
an option is present. (getJNLPFile): changed to use OptionParser,
and look for one main argument or one value from the JNLP option, if
not present then throws an InvalidArgumentException
* netx/net/sourceforge/jnlp/util/optionparser/InvalidArgumentException.java:
added
* netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java:
new file, a common parser for options and their values
(parseContents): called in OptionParser constructor, parses and populates
values in a map based on their option
(findMainArg): Takes arguments and parses them backwards to find the
first value that is eligible to be a main arg (not an option or a value
for an option with one value)
(addMainArg): adds the specified arg to main and removes it from its
current placement in the map
(stringEqualsOption): used to determine whether a string fits an option
keyword irrespective if it has a leading dash or is followed by a equals char
* tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java:
(testSetGlobalParserSettingsFromOptionParser,
testSetGlobalParserSettingsFromOptionParserHasSameOptionsAsOptionParser):
added
* tests/netx/unit/net/sourceforge/jnlp/util/optionparser/OptionParserTest.java:
new file to test parser works as intended
diffstat:
ChangeLog | 36 +
NEWS | 2 +
netx/net/sourceforge/jnlp/Launcher.java | 42 +-
netx/net/sourceforge/jnlp/OptionsDefinitions.java | 4 +-
netx/net/sourceforge/jnlp/ParserSettings.java | 14 +-
netx/net/sourceforge/jnlp/runtime/Boot.java | 137 +--
netx/net/sourceforge/jnlp/util/optionparser/InvalidArgumentException.java | 43 +
netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java | 217 +++++
tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java | 45 +-
tests/netx/unit/net/sourceforge/jnlp/util/optionparser/OptionParserTest.java | 400 ++++++++++
10 files changed, 808 insertions(+), 132 deletions(-)
diffs (truncated from 1218 to 500 lines):
diff -r e7f5499a75d3 -r e1c7156ed0a1 ChangeLog
--- a/ChangeLog Wed Sep 17 14:20:31 2014 +0200
+++ b/ChangeLog Thu Sep 18 13:18:11 2014 -0400
@@ -1,3 +1,39 @@
+2014-09-18 Lukasz Dracz <ldracz at redhat.com>
+
+ Added New Option Parser and used in boot of javaws
+ * netx/net/sourceforge/jnlp/Launcher.java:
+ (addProperties, addArguments, addParameters) refactored to take in
+ a List<String> instead of String[]
+ * netx/net/sourceforge/jnlp/OptionsDefinitions.java:
+ added JNLP to enum OPTIONS
+ * netx/net/sourceforge/jnlp/ParserSettings.java
+ (setGlobalParserSettingsFromOptionParser): refactored to take in
+ an OptionParser instead of args
+ * netx/net/sourceforge/jnlp/runtime/Boot.java:
+ Uses OptionParser to parse arguments for options and check whether
+ an option is present. (getJNLPFile): changed to use OptionParser,
+ and look for one main argument or one value from the JNLP option, if
+ not present then throws an InvalidArgumentException
+ * netx/net/sourceforge/jnlp/util/optionparser/InvalidArgumentException.java:
+ added
+ * netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java:
+ new file, a common parser for options and their values
+ (parseContents): called in OptionParser constructor, parses and populates
+ values in a map based on their option
+ (findMainArg): Takes arguments and parses them backwards to find the
+ first value that is eligible to be a main arg (not an option or a value
+ for an option with one value)
+ (addMainArg): adds the specified arg to main and removes it from its
+ current placement in the map
+ (stringEqualsOption): used to determine whether a string fits an option
+ keyword irrespective if it has a leading dash or is followed by a equals char
+ * tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java:
+ (testSetGlobalParserSettingsFromOptionParser,
+ testSetGlobalParserSettingsFromOptionParserHasSameOptionsAsOptionParser):
+ added
+ * tests/netx/unit/net/sourceforge/jnlp/util/optionparser/OptionParserTest.java:
+ new file to test parser works as intended
+
2014-09-17 Jiri Vanek <jvanek at redhat.com>
Javaws and PolicyEditor made localizable
diff -r e7f5499a75d3 -r e1c7156ed0a1 NEWS
--- a/NEWS Wed Sep 17 14:20:31 2014 +0200
+++ b/NEWS Thu Sep 18 13:18:11 2014 -0400
@@ -21,6 +21,8 @@
- PR1858: Java Console accepts multi-byte encodings
- PR1859: Java Console UI improvement for lower resolutions (800*600)
- RH1091563: [abrt] icedtea-web-1.5-2.fc20: Uncaught exception java.lang.ClassCastException in method sun.applet.PluginAppletViewer$8.run()
+ - Dropped support for long unmaintained -basedir argument
+ - Returned support for -jnlp argument
* Plugin
- PR1743 - Intermittant deadlock in PluginRequestProcessor
- RH1121549: coverity defects
diff -r e7f5499a75d3 -r e1c7156ed0a1 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Wed Sep 17 14:20:31 2014 +0200
+++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Sep 18 13:18:11 2014 -0400
@@ -83,7 +83,7 @@
private ParserSettings parserSettings = new ParserSettings();
- private Map<String, String[]> extra = null;
+ private Map<String, List<String>> extra = null;
/**
* Create a launcher with the runtime's default update policy
@@ -191,7 +191,7 @@
* the values for keys "arguments", "parameters", and "properties" are
* used.
*/
- public void setInformationToMerge(Map<String, String[]> input) {
+ public void setInformationToMerge(Map<String, List<String>> input) {
this.extra = input;
}
@@ -295,22 +295,22 @@
* @throws LaunchException if an exception occurs while extracting
* extra information
*/
- private void mergeExtraInformation(JNLPFile file, Map<String, String[]> extra) throws LaunchException {
+ private void mergeExtraInformation(JNLPFile file, Map<String, List<String>> extra) throws LaunchException {
if (extra == null) {
return;
}
- String[] properties = extra.get("properties");
+ List<String> properties = extra.get("properties");
if (properties != null) {
addProperties(file, properties);
}
- String[] arguments = extra.get("arguments");
+ List<String> arguments = extra.get("arguments");
if (arguments != null && file.isApplication()) {
addArguments(file, arguments);
}
- String[] parameters = extra.get("parameters");
+ List<String> parameters = extra.get("parameters");
if (parameters != null && file.isApplet()) {
addParameters(file, parameters);
}
@@ -321,18 +321,18 @@
* @throws LaunchException if an exception occurs while extracting
* extra information
*/
- private void addProperties(JNLPFile file, String[] props) throws LaunchException {
+ private void addProperties(JNLPFile file, List<String> props) throws LaunchException {
ResourcesDesc resources = file.getResources();
- for (int i = 0; i < props.length; i++) {
+ for (String input : props) {
// allows empty property, not sure about validity of that.
- int equals = props[i].indexOf("=");
+ int equals = input.indexOf("=");
if (equals == -1) {
- throw launchError(new LaunchException(R("BBadProp", props[i])));
+ throw launchError(new LaunchException(R("BBadProp", input)));
}
- String key = props[i].substring(0, equals);
- String value = props[i].substring(equals + 1, props[i].length());
+ String key = input.substring(0, equals);
+ String value = input.substring(equals + 1, input.length());
resources.addResource(new PropertyDesc(key, value));
}
@@ -344,18 +344,18 @@
* @throws LaunchException if an exception occurs while extracting
* extra information
*/
- private void addParameters(JNLPFile file, String[] params) throws LaunchException {
+ private void addParameters(JNLPFile file, List<String> params) throws LaunchException {
AppletDesc applet = file.getApplet();
- for (int i = 0; i < params.length; i++) {
+ for (String input : params) {
// allows empty param, not sure about validity of that.
- int equals = params[i].indexOf("=");
+ int equals = input.indexOf("=");
if (equals == -1) {
- throw launchError(new LaunchException(R("BBadParam", params[i])));
+ throw launchError(new LaunchException(R("BBadParam", input)));
}
- String name = params[i].substring(0, equals);
- String value = params[i].substring(equals + 1, params[i].length());
+ String name = input.substring(0, equals);
+ String value = input.substring(equals + 1, input.length());
applet.addParameter(name, value);
}
@@ -365,11 +365,11 @@
* Add the arguments to the JNLP file; only call if file is
* actually an application (not installer).
*/
- private void addArguments(JNLPFile file, String[] args) {
+ private void addArguments(JNLPFile file, List<String> args) {
ApplicationDesc app = file.getApplication();
- for (int i = 0; i < args.length; i++) {
- app.addArgument(args[i]);
+ for (String input : args ) {
+ app.addArgument(input);
}
}
diff -r e7f5499a75d3 -r e1c7156ed0a1 netx/net/sourceforge/jnlp/OptionsDefinitions.java
--- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Wed Sep 17 14:20:31 2014 +0200
+++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Thu Sep 18 13:18:11 2014 -0400
@@ -71,6 +71,7 @@
NOHEADERS("-Xignoreheaders", "BXignoreheaders"),
OFFLINE("-Xoffline", "BXoffline"),
TRUSTNONE("-Xtrustnone","BOTrustnone"),
+ JNLP("-jnlp","BOJnlp", NumberOfArguments.ONE),
//itweb settings
NODASHHELP("help", "IBOHelp"),
LIST("list", "IBOList"),
@@ -200,7 +201,8 @@
OPTIONS.NOFORK,
OPTIONS.NOHEADERS,
OPTIONS.OFFLINE,
- OPTIONS.TRUSTNONE});
+ OPTIONS.TRUSTNONE,
+ OPTIONS.JNLP});
}
public static List<OPTIONS> getJavaWsOptions() {
diff -r e7f5499a75d3 -r e1c7156ed0a1 netx/net/sourceforge/jnlp/ParserSettings.java
--- a/netx/net/sourceforge/jnlp/ParserSettings.java Wed Sep 17 14:20:31 2014 +0200
+++ b/netx/net/sourceforge/jnlp/ParserSettings.java Thu Sep 18 13:18:11 2014 -0400
@@ -37,8 +37,7 @@
package net.sourceforge.jnlp;
-import java.util.Arrays;
-import java.util.List;
+import net.sourceforge.jnlp.util.optionparser.OptionParser;
/**
* Contains settings to be used by the Parser while parsing JNLP files.
@@ -99,12 +98,11 @@
* at boot on the command line. These settings are also stored so they
* can be retrieved at a later time.
*/
- public static ParserSettings setGlobalParserSettingsFromArgs(String[] cmdArgs) {
- List<String> argList = Arrays.asList(cmdArgs);
- boolean strict = argList.contains("-strict");
- boolean malformedXmlAllowed = !argList.contains("-xml");
-
- globalParserSettings = new ParserSettings(strict, true, malformedXmlAllowed);
+ public static ParserSettings setGlobalParserSettingsFromOptionParser(OptionParser optionParser) {
+ ParserSettings settings = new
+ ParserSettings(optionParser.hasOption(OptionsDefinitions.OPTIONS.STRICT), true,
+ !optionParser.hasOption(OptionsDefinitions.OPTIONS.XML));
+ setGlobalParserSettings(settings);
return globalParserSettings;
}
diff -r e7f5499a75d3 -r e1c7156ed0a1 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Sep 17 14:20:31 2014 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Sep 18 13:18:11 2014 -0400
@@ -22,7 +22,6 @@
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -32,6 +31,7 @@
import net.sourceforge.jnlp.LaunchException;
import net.sourceforge.jnlp.Launcher;
+import net.sourceforge.jnlp.OptionsDefinitions;
import net.sourceforge.jnlp.ParserSettings;
import net.sourceforge.jnlp.about.AboutDialog;
import net.sourceforge.jnlp.cache.CacheUtil;
@@ -44,6 +44,8 @@
import net.sourceforge.jnlp.util.docprovider.TextsProvider;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.PlainTextFormatter;
import net.sourceforge.jnlp.util.logging.OutputController;
+import net.sourceforge.jnlp.util.optionparser.InvalidArgumentException;
+import net.sourceforge.jnlp.util.optionparser.OptionParser;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
@@ -88,30 +90,32 @@
+ " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+ "\n";
- private static final String doubleArgs = "-basedir -jnlp -arg -param -property -update";
-
- private static String args[]; // avoid the hot potato
+ private static OptionParser optionParser;
/**
* Launch the JNLP file specified by the command-line arguments.
*/
public static void main(String[] argsIn) {
- args = argsIn;
+ optionParser = new OptionParser(argsIn, OptionsDefinitions.getJavaWsOptions());
- if (null != getOption("-verbose")) {
+ if (!optionParser.hasOption(OptionsDefinitions.OPTIONS.JNLP)) {
+ optionParser.findMainArg();
+ }
+
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.VERBOSE)) {
JNLPRuntime.setDebug(true);
}
if (AppContext.getAppContext() == null) {
SunToolkit.createNewAppContext();
}
- if (null != getOption("-headless")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.HEADLESS)) {
JNLPRuntime.setHeadless(true);
}
DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
- if (null != getOption("-viewer")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.VIEWER)) {
try {
CertificateViewer.main(null);
JNLPRuntime.exit(0);
@@ -120,24 +124,24 @@
}
}
- if (null != getOption("-version")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.VERSION)) {
OutputController.getLogger().printOutLn(nameAndVersion);
JNLPRuntime.exit(0);
}
- if (null != getOption("-license")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.LICENSE)) {
OutputController.getLogger().printOutLn(miniLicense);
JNLPRuntime.exit(0);
}
- if (null != getOption("-help")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.HELP)) {
handleMessage();
JNLPRuntime.exit(0);
}
- if (null != getOption("-about")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.ABOUT)) {
handleAbout();
- if (null != getOption("-headless")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.HEADLESS)) {
JNLPRuntime.exit(0);
} else {
try {
@@ -152,27 +156,27 @@
}
- if (null != getOption("-update")) {
- int value = Integer.parseInt(getOption("-update"));
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.UPDATE)) {
+ int value = Integer.parseInt(optionParser.getValue(OptionsDefinitions.OPTIONS.UPDATE));
JNLPRuntime.setDefaultUpdatePolicy(new UpdatePolicy(value * 1000l));
}
- if (null != getOption("-noupdate"))
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.NOUPDATE))
JNLPRuntime.setDefaultUpdatePolicy(UpdatePolicy.NEVER);
- if (null != getOption("-Xnofork")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.NOFORK)) {
JNLPRuntime.setForksAllowed(false);
}
- if (null != getOption("-Xtrustall")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.TRUSTALL)) {
JNLPRuntime.setTrustAll(true);
}
- if (null != getOption("-Xtrustnone")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.TRUSTNONE)) {
JNLPRuntime.setTrustNone(true);
}
- if (null != getOption("-Xignoreheaders")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.NOHEADERS)) {
JNLPRuntime.setIgnoreHeaders(true);
}
- if (null != getOption("-allowredirect")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.REDIRECT)) {
JNLPRuntime.setAllowRedirect(true);
}
@@ -218,8 +222,8 @@
* The privileged part (jdk1.3 compatibility).
*/
public Void run() {
- JNLPRuntime.setSecurityEnabled(null == getOption("-nosecurity"));
- JNLPRuntime.setOfflineForced(null != getOption("-Xoffline"));
+ JNLPRuntime.setSecurityEnabled(!optionParser.hasOption(OptionsDefinitions.OPTIONS.NOSEC));
+ JNLPRuntime.setOfflineForced(optionParser.hasOption(OptionsDefinitions.OPTIONS.OFFLINE));
JNLPRuntime.initialize(true);
/*
@@ -228,17 +232,17 @@
* code. But we need to know what the cache and base directories are,
* and baseDir is initialized here
*/
- if (null != getOption("-Xclearcache")) {
+ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.CLEARCACHE)) {
CacheUtil.clearCache();
return null;
}
- Map<String, String[]> extra = new HashMap<String, String[]>();
- extra.put("arguments", getOptions("-arg"));
- extra.put("parameters", getOptions("-param"));
- extra.put("properties", getOptions("-property"));
+ Map<String, List<String>> extra = new HashMap<String, List<String>>();
+ extra.put("arguments", optionParser.getValues(OptionsDefinitions.OPTIONS.ARG));
+ extra.put("parameters", optionParser.getValues(OptionsDefinitions.OPTIONS.PARAM));
+ extra.put("properties", optionParser.getValues(OptionsDefinitions.OPTIONS.PROPERTY));
- ParserSettings settings = ParserSettings.setGlobalParserSettingsFromArgs(args);
+ ParserSettings settings = ParserSettings.setGlobalParserSettingsFromOptionParser(optionParser);
try {
Launcher launcher = new Launcher(false);
@@ -266,7 +270,13 @@
*/
private static URL getFileLocation() {
- String location = getJNLPFile();
+ String location = null;
+ try {
+ location = getJNLPFile();
+ } catch (InvalidArgumentException e) {
+ OutputController.getLogger().log(e);
+ fatalError("Invalid argument: "+e);
+ }
if (location == null) {
handleMessage();
@@ -294,64 +304,19 @@
/**
* Gets the JNLP file from the command line arguments, or exits upon error.
*/
- private static String getJNLPFile() {
+ private static String getJNLPFile() throws InvalidArgumentException {
+ if (optionParser.getMainArgs().size() > 1 || (optionParser.mainArgExists()
+ && optionParser.hasOption(OptionsDefinitions.OPTIONS.JNLP))) {
+ throw new InvalidArgumentException(optionParser.getMainArg());
+ } else if (optionParser.hasOption(OptionsDefinitions.OPTIONS.JNLP)) {
+ return optionParser.getValue(OptionsDefinitions.OPTIONS.JNLP);
+ } else if (optionParser.mainArgExists()) {
+ return optionParser.getMainArg();
+ }
- if (args.length == 0) {
- handleMessage();
- JNLPRuntime.exit(0);
- } else if (args.length == 1) {
- return args[args.length - 1];
- } else {
- String lastArg = args[args.length - 1];
- String secondLastArg = args[args.length - 2];
-
- if (doubleArgs.indexOf(secondLastArg) == -1) {
- return lastArg;
- } else {
- handleMessage();
- JNLPRuntime.exit(0);
- }
- }
+ handleMessage();
+ JNLPRuntime.exit(0);
return null;
}
- /**
- * Return value of the first occurence of the specified
- * option, or null if the option is not present. If the
- * option is a flag (0-parameter) and is present then the
- * option name is returned.
- */
- private static String getOption(String option) {
- String result[] = getOptions(option);
-
- if (result.length == 0)
- return null;
- else
- return result[0];
- }
-
- /**
- * Return all the values of the specified option, or an empty
- * array if the option is not present. If the option is a
- * flag (0-parameter) and is present then the option name is
- * returned once for each occurrence.
- */
- private static String[] getOptions(String option) {
- List<String> result = new ArrayList<String>();
-
- for (int i = 0; i < args.length; i++) {
- if (option.equals(args[i])) {
- if (-1 == doubleArgs.indexOf(option))
- result.add(option);
- else if (i + 1 < args.length)
- result.add(args[i + 1]);
- }
-
- if (args[i].startsWith("-") && -1 != doubleArgs.indexOf(args[i]))
- i++;
- }
-
- return result.toArray(new String[result.size()]);
- }
-
}
diff -r e7f5499a75d3 -r e1c7156ed0a1 netx/net/sourceforge/jnlp/util/optionparser/InvalidArgumentException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/optionparser/InvalidArgumentException.java Thu Sep 18 13:18:11 2014 -0400
@@ -0,0 +1,43 @@
+/*Copyright (C) 2014 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
More information about the distro-pkg-dev
mailing list