Author: jbonofre
Date: Tue Sep 11 16:26:23 2012
New Revision: 1383469
URL: http://svn.apache.org/viewvc?rev=1383469&view=rev
Log:
[KARAF-1806] Ad version command and version attribute in SystemMBean
Added:
karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Version.java
- copied, changed from r1383467,
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java
Modified:
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/internal/SystemMBeanImpl.java
karaf/branches/karaf-2.3.x/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
Modified:
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java?rev=1383469&r1=1383468&r2=1383469&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java
(original)
+++
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java
Tue Sep 11 16:26:23 2012
@@ -24,6 +24,8 @@ public interface SystemMBean {
String getName();
void setName(String name);
+ String getVersion();
+
void shutdown() throws Exception;
}
Modified:
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/internal/SystemMBeanImpl.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/internal/SystemMBeanImpl.java?rev=1383469&r1=1383468&r2=1383469&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/internal/SystemMBeanImpl.java
(original)
+++
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/internal/SystemMBeanImpl.java
Tue Sep 11 16:26:23 2012
@@ -59,6 +59,10 @@ public class SystemMBeanImpl extends Sta
}
}
+ public String getVersion() {
+ return System.getProperty("karaf.version");
+ }
+
public void shutdown() throws Exception {
bundleContext.getBundle(0).stop();
}
Copied:
karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Version.java
(from r1383467,
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Version.java?p2=karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Version.java&p1=karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java&r1=1383467&r2=1383469&rev=1383469&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/management/mbeans/system/src/main/java/org/apache/karaf/management/mbeans/system/SystemMBean.java
(original)
+++
karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Version.java
Tue Sep 11 16:26:23 2012
@@ -14,16 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.system;
+package org.apache.karaf.shell.osgi;
-/**
- * System MBean.
- */
-public interface SystemMBean {
+import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
- String getName();
- void setName(String name);
+@Command(scope = "osgi", name = "version", description = "Display the instance
version.")
+public class Version extends OsgiCommandSupport {
- void shutdown() throws Exception;
+ public Object doExecute() throws Exception {
+ System.out.println(System.getProperty("karaf.version"));
+ return null;
+ }
}
Modified:
karaf/branches/karaf-2.3.x/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml?rev=1383469&r1=1383468&r2=1383469&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
(original)
+++
karaf/branches/karaf-2.3.x/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
Tue Sep 11 16:26:23 2012
@@ -81,6 +81,9 @@
<command name="osgi/uninstall">
<action class="org.apache.karaf.shell.osgi.UninstallBundle"/>
</command>
+ <command name="osgi/version">
+ <action class="org.apache.karaf.shell.osgi.Version"/>
+ </command>
</command-bundle>
<service auto-export="interfaces">
