/hg/icedtea-web: add command line interface to the control panel
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Dec 20 06:26:50 PST 2010
changeset 7679acd58461 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7679acd58461
author: Omair Majid <omajid at redhat.com>
date: Mon Dec 20 09:26:16 2010 -0500
add command line interface to the control panel
2010-12-20 Omair Majid <omajid at redhat.com>
* Makefile.am ($(NETX_DIR)/launcher/controlpanel/%.o): Set
program name, and launch
net.sourceforge.jnlp.controlpanel.CommandLine.
* netx/net/sourceforge/jnlp/config/Defaults.java (getDefaults):
Set descriptions to Unknown rather than the name. Set source to
localized form of internal.
* netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
(getProperty): Check for nulls. (setProperty): Add unknown as
description and source for new properties.
(checkAndFixConfiguration): Fix translation constants.
(parsePropertiesFile): Use unknown as description.
* netx/net/sourceforge/jnlp/controlpanel/CommandLine.java: New file
(CommandLine): New method. (handleHelpCommand): Likewise.
(printListHelp): Likewise. (handleListCommand): Likewise.
(printGetHelp): Likewise. (handleGetCommand): Likewise.
(printSetHelp): Likewise. (handleSetCommand): Likewise.
(printResetHelp): Likewise. (handleResetCommand): Likewise.
(printInfoHelp): Likewise. (handleInfoCommand): Likewise.
(printCheckHelp): Likewise. (handleCheckCommand): Likewise.
(handle): Likewise. (main): Likewise.
* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
Usage, Unknown, RConfigurationFatal, DCIncorrectValue,
DCSourceInternal, DCUnknownSettingWithName, VVPossibleValues,
CLNoInfo, CLValue, CLValueSource, CLDescription, CLUnknownCommand
CLUnknownProperty, CLNoIssuesFound, CLIncorrectValue,
CLListDescription, CLGetDescription, CLSetDescription,
CLResetDescription, CLInfoDescription, CLCheckDescription and
CLHelpDescription. Remove DCErrorInSetting and
DCUnknownSettingWithVal.
diffstat:
6 files changed, 536 insertions(+), 10 deletions(-)
ChangeLog | 41
Makefile.am | 3
netx/net/sourceforge/jnlp/config/Defaults.java | 4
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 16
netx/net/sourceforge/jnlp/controlpanel/CommandLine.java | 456 ++++++++++
netx/net/sourceforge/jnlp/resources/Messages.properties | 26
diffs (truncated from 668 to 500 lines):
diff -r 5f77ece02afd -r 7679acd58461 ChangeLog
--- a/ChangeLog Fri Dec 17 16:22:11 2010 -0500
+++ b/ChangeLog Mon Dec 20 09:26:16 2010 -0500
@@ -1,3 +1,44 @@ 2010-12-17 Omair Majid <omajid at redhat.
+2010-12-20 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am
+ ($(NETX_DIR)/launcher/controlpanel/%.o): Set program name, and launch
+ net.sourceforge.jnlp.controlpanel.CommandLine.
+ * netx/net/sourceforge/jnlp/config/Defaults.java
+ (getDefaults): Set descriptions to Unknown rather than the name.
+ Set source to localized form of internal.
+ * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
+ (getProperty): Check for nulls.
+ (setProperty): Add unknown as description and source for new
+ properties.
+ (checkAndFixConfiguration): Fix translation constants.
+ (parsePropertiesFile): Use unknown as description.
+ * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java: New file
+ (CommandLine): New method.
+ (handleHelpCommand): Likewise.
+ (printListHelp): Likewise.
+ (handleListCommand): Likewise.
+ (printGetHelp): Likewise.
+ (handleGetCommand): Likewise.
+ (printSetHelp): Likewise.
+ (handleSetCommand): Likewise.
+ (printResetHelp): Likewise.
+ (handleResetCommand): Likewise.
+ (printInfoHelp): Likewise.
+ (handleInfoCommand): Likewise.
+ (printCheckHelp): Likewise.
+ (handleCheckCommand): Likewise.
+ (handle): Likewise.
+ (main): Likewise.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: Add
+ Usage, Unknown, RConfigurationFatal, DCIncorrectValue,
+ DCSourceInternal, DCUnknownSettingWithName, VVPossibleValues,
+ CLNoInfo, CLValue, CLValueSource, CLDescription, CLUnknownCommand
+ CLUnknownProperty, CLNoIssuesFound, CLIncorrectValue,
+ CLListDescription, CLGetDescription, CLSetDescription,
+ CLResetDescription, CLInfoDescription, CLCheckDescription and
+ CLHelpDescription. Remove DCErrorInSetting and
+ DCUnknownSettingWithVal.
+
2010-12-17 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
diff -r 5f77ece02afd -r 7679acd58461 Makefile.am
--- a/Makefile.am Fri Dec 17 16:22:11 2010 -0500
+++ b/Makefile.am Mon Dec 20 09:26:16 2010 -0500
@@ -354,7 +354,8 @@ extra-lib/about.jar: stamps/extra-class-
$(NETX_DIR)/launcher/controlpanel/%.o: $(LAUNCHER_SRCDIR)/%.c
mkdir -p $(NETX_DIR)/launcher/controlpanel && \
- $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.controlpanel.ControlPanel", }' \
+ $(CC) $(LAUNCHER_FLAGS) \
+ -DJAVA_ARGS='{ "-J-ms8m", "-Dprogram.name=itweb-settings", "net.sourceforge.jnlp.controlpanel.CommandLine", }' \
-DPROGNAME='"itweb-settings"' -c -o $@ $<
$(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
diff -r 5f77ece02afd -r 7679acd58461 netx/net/sourceforge/jnlp/config/Defaults.java
--- a/netx/net/sourceforge/jnlp/config/Defaults.java Fri Dec 17 16:22:11 2010 -0500
+++ b/netx/net/sourceforge/jnlp/config/Defaults.java Mon Dec 20 09:26:16 2010 -0500
@@ -36,6 +36,8 @@ exception statement from your version.
*/
package net.sourceforge.jnlp.config;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
import java.io.File;
import java.util.HashMap;
@@ -385,7 +387,7 @@ public class Defaults {
ValueValidator checker = (ValueValidator) defaults[i][1];
String actualValue = (String) defaults[i][2];
boolean locked = false;
- Setting<String> value = new Setting<String>(name, name, locked, checker, actualValue, actualValue, "<internal>");
+ Setting<String> value = new Setting<String>(name, R("Unknown"), locked, checker, actualValue, actualValue, R("DCSourceInternal"));
result.put(name, value);
}
diff -r 5f77ece02afd -r 7679acd58461 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Fri Dec 17 16:22:11 2010 -0500
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon Dec 20 09:26:16 2010 -0500
@@ -267,7 +267,11 @@ public final class DeploymentConfigurati
}
}
- return currentConfiguration.get(key).getValue();
+ String value = null;
+ if (currentConfiguration.get(key) != null) {
+ value = currentConfiguration.get(key).getValue();
+ }
+ return value;
}
/**
@@ -319,7 +323,7 @@ public final class DeploymentConfigurati
currentValue.setValue(value);
}
} else {
- currentValue = new Setting<String>(key, key, false, null, null, value, "<unknown>");
+ currentValue = new Setting<String>(key, R("Unknown"), false, null, null, value, R("Unknown"));
currentConfiguration.put(key, currentValue);
}
}
@@ -341,7 +345,7 @@ public final class DeploymentConfigurati
if (!(s.getName().equals(key))) {
System.out.println(R("DCInternal", "key " + key + " does not match setting name " + s.getName()));
} else if (!defaults.containsKey(key)) {
- System.out.println(R("DCUnknownSettingWithVal", key));
+ System.out.println(R("DCUnknownSettingWithName", key));
} else {
ValueValidator checker = defaults.get(key).getValidator();
if (checker == null) {
@@ -351,7 +355,7 @@ public final class DeploymentConfigurati
try {
checker.validate(s.getValue());
} catch (IllegalArgumentException e) {
- System.out.println(R("DCErrorInSetting", key, s.getValue(), s.getDefaultValue(), checker.getPossibleValues()));
+ System.out.println(R("DCIncorrectValue", key, s.getValue(), checker.getPossibleValues()));
s.setValue(s.getDefaultValue());
}
}
@@ -546,7 +550,7 @@ public final class DeploymentConfigurati
String realKey = key.substring(0, key.length() - ".locked".length());
Setting<String> configValue = result.get(realKey);
if (configValue == null) {
- configValue = new Setting<String>(realKey, realKey, true, null, null, null, propertiesFile.toString());
+ configValue = new Setting<String>(realKey, R("Unknown"), true, null, null, null, propertiesFile.toString());
result.put(realKey, configValue);
} else {
configValue.setLocked(true);
@@ -556,7 +560,7 @@ public final class DeploymentConfigurati
String newValue = properties.getProperty(key);
Setting<String> configValue = result.get(key);
if (configValue == null) {
- configValue = new Setting<String>(key, key, false, null, null, newValue, propertiesFile.toString());
+ configValue = new Setting<String>(key, R("Unknown"), false, null, null, newValue, propertiesFile.toString());
result.put(key, configValue);
} else {
configValue.setValue(newValue);
diff -r 5f77ece02afd -r 7679acd58461 netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Mon Dec 20 09:26:16 2010 -0500
@@ -0,0 +1,456 @@
+/* CommandLine.java -- command line interface to icedtea-web's deployment settings.
+Copyright (C) 2010 Red Hat
+
+This program 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; either version 2 of the License, or
+(at your option) any later version.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+package net.sourceforge.jnlp.controlpanel;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.ConfigurationException;
+
+import net.sourceforge.jnlp.config.ConfiguratonValidator;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.Setting;
+
+/**
+ * Encapsulates a command line interface to the deployment configuration.
+ * <p>
+ * The central method is {@link #handle(String[])}, which calls one of the
+ * various 'handle' methods. The commands listed in {@link #allCommands} are
+ * supported. For each supported command, a method handleCOMMANDCommand exists.
+ * This method actually takes action based on the command. Generally, a
+ * printCOMMANDHelp method also exists, and prints out the help message for
+ * that specific command. For example, see {@link #handleListCommand(List)}
+ * and {@link #printListHelp()}.
+ * <p>
+ * Sample usage:
+ * <pre>
+ * CommandLine cli = new CommandLine();
+ * // the string array represents input using the command line
+ * int retVal = cli.handle(new String[] { "help" });
+ * if (retVal == CommandLine.SUCCESS) {
+ * // good!
+ * } else {
+ * // bad!
+ * }
+ * </pre>
+ *
+ * @author Omair Majid (omajid at redhat.com)
+ */
+public class CommandLine {
+
+ public static final int ERROR = 1;
+ public static final int SUCCESS = 0;
+
+ public final String PROGRAM_NAME;
+
+ private static final List<String> allCommands = Arrays.asList(new String[] {
+ "list", "get", "set", "reset", "info", "check"
+ });
+
+ DeploymentConfiguration config = null;
+
+ /**
+ * Creates a new instance
+ */
+ public CommandLine() {
+ PROGRAM_NAME = System.getProperty("program.name");
+
+ config = new DeploymentConfiguration();
+ try {
+ config.load(false);
+ } catch (ConfigurationException e) {
+ System.out.println(R("RConfigurationFatal"));
+ }
+ }
+
+ /**
+ * Handle the 'help' command
+ *
+ * @param args optional
+ * @return the result of handling the help command. SUCCESS if no errors occurred.
+ */
+ public int handleHelpCommand(List<String> args) {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " "
+ + allCommands.toString().replace(',', '|').replaceAll(" ", "") + " [help]");
+ System.out.println(R("CLHelpDescription", PROGRAM_NAME));
+ return SUCCESS;
+ }
+
+ /**
+ * Prints help message for the list command
+ */
+ public void printListHelp() {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " list [--details]");
+ System.out.println(R("CLListDescription"));
+ }
+
+ /**
+ * Handles the 'list' command
+ *
+ * @param args the arguments to the list command
+ * @return result of handling the command. SUCCESS if no errors occurred.
+ */
+ public int handleListCommand(List<String> args) {
+ if (args.contains("help")) {
+ printListHelp();
+ return SUCCESS;
+ }
+
+ boolean verbose = false;
+
+ if (args.contains("--details")) {
+ verbose = true;
+ args.remove("--details");
+ }
+
+ if (args.size() != 0) {
+ printListHelp();
+ return ERROR;
+ }
+
+ Map<String, Setting<String>> all = config.getRaw();
+ for (String key : all.keySet()) {
+ Setting<String> value = all.get(key);
+ System.out.println(key + ": " + value.getValue());
+ if (verbose) {
+ System.out.println("\t" + R("CLDescription", value.getDescription()));
+ }
+ }
+ return SUCCESS;
+ }
+
+ /**
+ * Prints help message for the get command
+ */
+ public void printGetHelp() {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " get property-name");
+ System.out.println(R("CLGetDescription"));
+ }
+
+ /**
+ * Handles the 'get' command.
+ *
+ * @param args the arguments to the get command
+ * @return an integer representing success (SUCCESS) or error handling the
+ * get command.
+ */
+ public int handleGetCommand(List<String> args) {
+ if (args.contains("help")) {
+ printGetHelp();
+ return SUCCESS;
+ }
+
+ if (args.size() != 1) {
+ printGetHelp();
+ return ERROR;
+ }
+
+ Map<String, Setting<String>> all = config.getRaw();
+
+ String key = args.get(0);
+ String value = null;
+ if (all.containsKey(key)) {
+ value = all.get(key).getValue();
+ System.out.println(value);
+ return SUCCESS;
+ } else {
+ System.out.println(R("CLUnknownProperty", key));
+ return ERROR;
+ }
+ }
+
+ /**
+ * Prints the help message for the 'set' command
+ */
+ public void printSetHelp() {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " set property-name value");
+ System.out.println(R("CLSetDescription"));
+ }
+
+ /**
+ * Handles the 'set' command
+ *
+ * @param args the arguments to the set command
+ * @return an integer indicating success (SUCCESS) or error in handling
+ * the command
+ */
+ public int handleSetCommand(List<String> args) {
+ if (args.contains("help")) {
+ printSetHelp();
+ return SUCCESS;
+ }
+
+ if (args.size() != 2) {
+ printSetHelp();
+ return ERROR;
+ }
+
+ String key = args.get(0);
+ String value = args.get(1);
+
+ if (config.getRaw().containsKey(key)) {
+ Setting<String> old = config.getRaw().get(key);
+ if (old.getValidator() != null) {
+ try {
+ old.getValidator().validate(value);
+ } catch (IllegalArgumentException e) {
+ System.out.println(R("CLIncorrectValue", old.getName(), value, old.getValidator().getPossibleValues()));
+ return ERROR;
+ }
+ }
+ config.setProperty(key, value);
+ } else {
+ System.out.println(R("CLUnknownProperty", value));
+ config.setProperty(key, value);
+ }
+
+ try {
+ config.save();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ERROR;
+ }
+
+ return SUCCESS;
+ }
+
+ /**
+ * Prints a help message for the reset command
+ */
+ public void printResetHelp() {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " reset property-name");
+ System.out.println(R("CLResetDescription"));
+ }
+
+ /**
+ * Handles the 'reset' command
+ *
+ * @param args the arguments to the reset command
+ * @return an integer indicating success (SUCCESS) or error in handling
+ * the command
+ */
+ public int handleResetCommand(List<String> args) {
+ if (args.contains("help")) {
+ printResetHelp();
+ return SUCCESS;
+ }
+
+ if (args.size() != 1) {
+ printResetHelp();
+ return ERROR;
+ }
+
+ String key = args.get(0);
+
+ Map<String, Setting<String>> all = config.getRaw();
+ if (!all.containsKey(key)) {
+ System.out.println(R("CLUnknownProperty", key));
+ return ERROR;
+ }
+
+ Setting<String> setting = all.get(key);
+ setting.setValue(setting.getDefaultValue());
+
+ try {
+ config.save();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ERROR;
+ }
+
+ return SUCCESS;
+ }
+
+ /**
+ * Print a help message for the 'info' command
+ */
+ public void printInfoHelp() {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " info property-name");
+ System.out.println(R("CLInfoDescription"));
+ }
+
+ /**
+ * Handles the 'info' command
+ *
+ * @param args the arguments to the info command
+ * @return an integer indicating success (SUCCESS) or error in handling
+ * the command
+ */
+ public int handleInfoCommand(List<String> args) {
+ if (args.contains("help")) {
+ printInfoHelp();
+ return SUCCESS;
+ }
+
+ if (args.size() != 1) {
+ printInfoHelp();
+ return ERROR;
+ }
+
+ Map<String, Setting<String>> all = config.getRaw();
+
+ String key = args.get(0);
+ Setting<String> value = all.get(key);
+ if (value == null) {
+ System.out.println(R("CLNoInfo"));
+ return ERROR;
+ } else {
+ System.out.println(R("CLDescription", value.getDescription()));
+ System.out.println(R("CLValue", value.getValue()));
+ if (value.getValidator() != null) {
+ System.out.println("\t" + R("VVPossibleValues", value.getValidator().getPossibleValues()));
+ }
+ System.out.println(R("CLValueSource", value.getSource()));
+ return SUCCESS;
+ }
+ }
+
+ /**
+ * Prints a help message for the 'check' command
+ */
+ public void printCheckHelp() {
+ System.out.println(R("Usage"));
+ System.out.println(" " + PROGRAM_NAME + " check");
+ System.out.println(R("CLCheckDescription"));
+ }
+
+ /**
+ * Handles the 'check' command
+ *
+ * @param args the arguments to the check command.
+ * @return an integer indicating success (SUCCESS) or error in handling
+ * the command
+ */
+ public int handleCheckCommand(List<String> args) {
+ if (args.contains("help")) {
+ printCheckHelp();
More information about the distro-pkg-dev
mailing list