You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/04/11 16:24:14 UTC
svn commit: r1091088 - in /karaf/branches/karaf-2.2.x: main/pom.xml
main/src/main/java/org/apache/karaf/main/Main.java
shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
Author: jbonofre
Date: Mon Apr 11 14:24:14 2011
New Revision: 1091088
URL: http://svn.apache.org/viewvc?rev=1091088&view=rev
Log:
[KARAF-554] Add karaf version in system properties and display in shell:info command output.
Modified:
karaf/branches/karaf-2.2.x/main/pom.xml
karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java
karaf/branches/karaf-2.2.x/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
Modified: karaf/branches/karaf-2.2.x/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/main/pom.xml?rev=1091088&r1=1091087&r2=1091088&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/main/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/main/pom.xml Mon Apr 11 14:24:14 2011
@@ -78,6 +78,18 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
Modified: karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java?rev=1091088&r1=1091087&r2=1091088&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java Mon Apr 11 14:24:14 2011
@@ -126,6 +126,10 @@ public class Main {
* holds the bundles data and cache for a Karaf instance.
*/
public static final String ENV_KARAF_INSTANCES = "KARAF_INSTANCES";
+ /**
+ * The system property for holding the Karaf version.
+ */
+ public static final String PROP_KARAF_VERSION = "karaf.version";
/**
* Config property which identifies directories which contain bundles to be loaded by SMX
@@ -207,10 +211,10 @@ public class Main {
karafData = Utils.getKarafDirectory(Main.PROP_KARAF_DATA, Main.ENV_KARAF_DATA, new File(karafBase, "data"), true, true);
karafInstances = Utils.getKarafDirectory(Main.PROP_KARAF_INSTANCES, Main.ENV_KARAF_INSTANCES, new File(karafHome, "instances"), false, false);
- //System.out.println("Karaf Home: "+main.karafHome.getPath());
- //System.out.println("Karaf Base: "+main.karafBase.getPath());
- //System.out.println("Karaf Data: "+main.karafData.getPath());
-
+ Package p = Package.getPackage("org.apache.karaf.main");
+ if (p != null && p.getImplementationVersion() != null) {
+ System.setProperty(PROP_KARAF_VERSION, p.getImplementationVersion());
+ }
System.setProperty(PROP_KARAF_HOME, karafHome.getPath());
System.setProperty(PROP_KARAF_BASE, karafBase.getPath());
System.setProperty(PROP_KARAF_DATA, karafData.getPath());
Modified: karaf/branches/karaf-2.2.x/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java?rev=1091088&r1=1091087&r2=1091088&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java (original)
+++ karaf/branches/karaf-2.2.x/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java Mon Apr 11 14:24:14 2011
@@ -62,6 +62,7 @@ public class InfoAction extends OsgiComm
//
maxNameLen = 25;
System.out.println("Karaf");
+ printValue("Karaf version", maxNameLen, System.getProperty("karaf.version"));
printValue("Karaf home", maxNameLen, System.getProperty("karaf.home"));
printValue("Karaf base", maxNameLen, System.getProperty("karaf.base"));
printValue("OSGi Framework", maxNameLen, bundleContext.getBundle(0).getSymbolicName() + " - " +