You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2010/10/05 22:56:26 UTC
svn commit: r1004811 - in /karaf/trunk/shell/commands/src/main:
java/org/apache/karaf/shell/commands/
java/org/apache/karaf/shell/commands/info/ resources/OSGI-INF/blueprint/
Author: iocanel
Date: Tue Oct 5 20:56:26 2010
New Revision: 1004811
URL: http://svn.apache.org/viewvc?rev=1004811&view=rev
Log:
KARAF-209 Added interface InfoProvider. Info command displays information provided by InfoProviders
Added:
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
Modified:
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java?rev=1004811&r1=1004810&r2=1004811&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java Tue Oct 5 20:56:26 2010
@@ -16,29 +16,27 @@
*/
package org.apache.karaf.shell.commands;
-import java.util.Locale;
-import java.text.DecimalFormatSymbols;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.lang.management.OperatingSystemMXBean;
-import java.lang.management.ManagementFactory;
-import java.lang.management.ClassLoadingMXBean;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.ThreadMXBean;
-import java.lang.management.RuntimeMXBean;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.reflect.Method;
-
-import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.commands.info.InfoProvider;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.fusesource.jansi.Ansi;
+import java.lang.management.*;
+import java.lang.reflect.Method;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.List;
+import java.util.Locale;
+
@Command(scope = "shell", name = "info", description = "Prints system informations")
public class InfoAction extends OsgiCommandSupport {
private NumberFormat fmtI = new DecimalFormat("###,###", new DecimalFormatSymbols(Locale.ENGLISH));
private NumberFormat fmtD = new DecimalFormat("###,##0.000", new DecimalFormatSymbols(Locale.ENGLISH));
+ private List<InfoProvider> infoProviders;
+
protected Object doExecute() throws Exception {
int maxNameLen;
@@ -56,7 +54,7 @@ public class InfoAction extends OsgiComm
printValue("Karaf home", maxNameLen, System.getProperty("karaf.home"));
printValue("Karaf base", maxNameLen, System.getProperty("karaf.base"));
printValue("OSGi Framework", maxNameLen, bundleContext.getBundle(0).getSymbolicName() + " - " +
- bundleContext.getBundle(0).getVersion());
+ bundleContext.getBundle(0).getVersion());
System.out.println();
System.out.println("JVM");
@@ -66,7 +64,8 @@ public class InfoAction extends OsgiComm
printValue("Uptime", maxNameLen, printDuration(runtime.getUptime()));
try {
printValue("Process CPU time", maxNameLen, printDuration(getSunOsValueAsLong(os, "getProcessCpuTime") / 1000000));
- } catch (Throwable t) {}
+ } catch (Throwable t) {
+ }
printValue("Total compile time", maxNameLen, printDuration(ManagementFactory.getCompilationMXBean().getTotalCompilationTime()));
System.out.println("Threads");
@@ -100,7 +99,18 @@ public class InfoAction extends OsgiComm
printValue("Committed virtual memory", maxNameLen, printSizeInKb(getSunOsValueAsLong(os, "getCommittedVirtualMemorySize")));
printValue("Total swap space", maxNameLen, printSizeInKb(getSunOsValueAsLong(os, "getTotalSwapSpaceSize")));
printValue("Free swap space", maxNameLen, printSizeInKb(getSunOsValueAsLong(os, "getFreeSwapSpaceSize")));
- } catch (Throwable t) {}
+ } catch (Throwable t) {
+ }
+
+ //Display Information from external information providers.
+ if (infoProviders != null) {
+ for (InfoProvider provider : infoProviders) {
+ System.out.println(provider.getName());
+ for (String propertyName : provider.getProperties().stringPropertyNames()) {
+ printValue(propertyName, maxNameLen, provider.getProperties().getProperty(propertyName));
+ }
+ }
+ }
return null;
}
@@ -155,8 +165,8 @@ public class InfoAction extends OsgiComm
void printValue(String name, int pad, String value) {
System.out.println(Ansi.ansi().a(" ")
- .a(Ansi.Attribute.INTENSITY_BOLD).a(name).a(spaces(pad - name.length())).a(Ansi.Attribute.RESET)
- .a(" ").a(value).toString());
+ .a(Ansi.Attribute.INTENSITY_BOLD).a(name).a(spaces(pad - name.length())).a(Ansi.Attribute.RESET)
+ .a(" ").a(value).toString());
}
String spaces(int nb) {
@@ -167,4 +177,11 @@ public class InfoAction extends OsgiComm
return sb.toString();
}
+ public List<InfoProvider> getInfoProviders() {
+ return infoProviders;
+ }
+
+ public void setInfoProviders(List<InfoProvider> infoProviders) {
+ this.infoProviders = infoProviders;
+ }
}
Added: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java?rev=1004811&view=auto
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java (added)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java Tue Oct 5 20:56:26 2010
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.shell.commands.info;
+
+import java.util.Properties;
+
+/**
+ * @author iocanel
+ */
+public interface InfoProvider {
+
+ public String getName();
+
+ public Properties getProperties();
+
+}
Modified: karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=1004811&r1=1004810&r2=1004811&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Tue Oct 5 20:56:26 2010
@@ -45,7 +45,9 @@
<action class="org.apache.karaf.shell.commands.IfAction"/>
</command>
<command name="shell/info">
- <action class="org.apache.karaf.shell.commands.InfoAction"/>
+ <action class="org.apache.karaf.shell.commands.InfoAction">
+ <property name="infoProviders" ref="infoProviders"/>
+ </action>
</command>
<command name="shell/java">
<action class="org.apache.karaf.shell.commands.JavaAction"/>
@@ -80,4 +82,7 @@
</command>
</command-bundle>
+ <reference-list id="infoProviders" interface="org.apache.karaf.shell.commands.info.InfoProvider"
+ availability="optional"/>
+
</blueprint>