Author: jbonofre
Date: Tue Nov 5 06:01:07 2013
New Revision: 1538871
URL: http://svn.apache.org/r1538871
Log:
[KARAF-2474] Improve system:property command to dump all properties
Modified:
karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/SystemProperty.java
karaf/trunk/system/command/src/main/resources/OSGI-INF/blueprint/system-commands.xml
Modified:
karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/SystemProperty.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/SystemProperty.java?rev=1538871&r1=1538870&r2=1538871&view=diff
==============================================================================
---
karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/SystemProperty.java
(original)
+++
karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/SystemProperty.java
Tue Nov 5 06:01:07 2013
@@ -19,6 +19,13 @@ package org.apache.karaf.system.commands
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Command that allow access to system properties easily.
@@ -26,21 +33,116 @@ import org.apache.karaf.shell.commands.O
@Command(scope = "system", name = "property", description = "Get or set a
system property.")
public class SystemProperty extends AbstractSystemAction {
- @Option(name = "-p", aliases = { "--persistent" }, description = "Persist
the new value to the etc/system.properties file")
+ @Option(name = "-p", aliases = {"--persistent"}, description = "Persist
the new value to the etc/system.properties file")
boolean persistent;
- @Argument(index = 0, name = "key", description = "The system property
name")
+ @Option(name = "-f", aliases = {"--file-dump"}, description = "Dump all
system properties in a file")
+ boolean dumpToFile;
+
+ @Option(name = "-u", aliases = {"--unset"}, description = "Show unset know
properties with value unset")
+ boolean unset;
+
+ @Argument(index = 0, name = "key", required = false, description = "The
system property name")
String key;
@Argument(index = 1, name = "value", required = false, description = "New
value for the system property")
String value;
+ private BundleContext bundleContext;
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
@Override
protected Object doExecute() throws Exception {
+ if (key == null && value == null) {
+ Properties props = (Properties) System.getProperties().clone();
+
+ String def = null;
+ if (unset) {
+ def = "unset";
+ }
+
+ setProperty(props, Constants.FRAMEWORK_BEGINNING_STARTLEVEL, def);
+ setProperty(props, Constants.FRAMEWORK_BOOTDELEGATION, def);
+ setProperty(props, Constants.FRAMEWORK_BUNDLE_PARENT, def);
+ setProperty(props, Constants.FRAMEWORK_BUNDLE_PARENT_APP, def);
+ setProperty(props, Constants.FRAMEWORK_BUNDLE_PARENT_BOOT, def);
+ setProperty(props, Constants.FRAMEWORK_BUNDLE_PARENT_EXT, def);
+ setProperty(props, Constants.FRAMEWORK_BUNDLE_PARENT_FRAMEWORK,
def);
+ setProperty(props, Constants.FRAMEWORK_EXECPERMISSION, def);
+ setProperty(props, Constants.FRAMEWORK_EXECUTIONENVIRONMENT, def);
+ setProperty(props, Constants.FRAMEWORK_LANGUAGE, def);
+ setProperty(props, Constants.FRAMEWORK_LIBRARY_EXTENSIONS, def);
+ setProperty(props, Constants.FRAMEWORK_OS_NAME, def);
+ setProperty(props, Constants.FRAMEWORK_OS_VERSION, def);
+ setProperty(props, Constants.FRAMEWORK_PROCESSOR, def);
+ setProperty(props, Constants.FRAMEWORK_SECURITY, def);
+ setProperty(props, Constants.FRAMEWORK_SECURITY_OSGI, def);
+ setProperty(props, Constants.FRAMEWORK_STORAGE, def);
+ setProperty(props, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT,
def);
+ setProperty(props, Constants.FRAMEWORK_SYSTEMPACKAGES, def);
+ setProperty(props, Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, def);
+ setProperty(props, Constants.FRAMEWORK_VENDOR, def);
+ setProperty(props, Constants.FRAMEWORK_VERSION, def);
+ setProperty(props, Constants.FRAMEWORK_WINDOWSYSTEM, def);
+
+ setProperty(props, Constants.SUPPORTS_BOOTCLASSPATH_EXTENSION,
def);
+ setProperty(props, Constants.SUPPORTS_FRAMEWORK_EXTENSION, def);
+ setProperty(props, Constants.SUPPORTS_FRAMEWORK_FRAGMENT, def);
+ setProperty(props, Constants.SUPPORTS_FRAMEWORK_REQUIREBUNDLE,
def);
+
+ if (dumpToFile) {
+ PrintStream ps = new PrintStream(
+ new File(
+ bundleContext.getProperty("karaf.data"),
+ "dump-properties-" +
System.currentTimeMillis() + ".properties"
+ )
+ );
+ ps.println("#Dump of the System and OSGi properties with the
command dev:dump-properties");
+ ps.println("#Dump execute at " + new
SimpleDateFormat().format(new Date()));
+ printOrderedProperties(props, ps);
+ ps.flush();
+ ps.close();
+ } else {
+ System.out.println("Dumping OSGi and System properties");
+ printOrderedProperties(props, System.out);
+ }
+
+ return null;
+ }
+
if (value != null) {
- return systemService.setSystemProperty(key, value, persistent);
+ systemService.setSystemProperty(key, value, persistent);
} else {
- return System.getProperty(key);
+ System.out.println(System.getProperty(key));
}
+
+ return null;
}
+
+ private void printOrderedProperties(Properties props, PrintStream out) {
+ Set<Object> keys = props.keySet();
+ Vector<String> order = new Vector<String>(keys.size());
+ for (Iterator<Object> i = keys.iterator(); i.hasNext(); ) {
+ Object str = (Object) i.next();
+ order.add((String) str);
+ }
+ Collections.sort(order);
+ for (Iterator<String> i = order.iterator(); i.hasNext(); ) {
+ String key = (String) i.next();
+ out.println(key + "=" + props.getProperty(key));
+ }
+ }
+
+ private void setProperty(Properties props, String key, String def) {
+ String val = bundleContext.getProperty(key);
+ if (val == null && def != null) {
+ props.setProperty(key, def);
+ } else if (val != null) {
+ props.setProperty(key, val);
+ }
+ }
+
}
Modified:
karaf/trunk/system/command/src/main/resources/OSGI-INF/blueprint/system-commands.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/system/command/src/main/resources/OSGI-INF/blueprint/system-commands.xml?rev=1538871&r1=1538870&r2=1538871&view=diff
==============================================================================
---
karaf/trunk/system/command/src/main/resources/OSGI-INF/blueprint/system-commands.xml
(original)
+++
karaf/trunk/system/command/src/main/resources/OSGI-INF/blueprint/system-commands.xml
Tue Nov 5 06:01:07 2013
@@ -48,6 +48,7 @@
<command>
<action class="org.apache.karaf.system.commands.SystemProperty" >
<property name="systemService" ref="systemService"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</action>
</command>
</command-bundle>
