You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2014/01/17 12:43:44 UTC

git commit: KARAF-2691 Adding shell variable for karaf pid

Updated Branches:
  refs/heads/master 768894019 -> c84af72aa


KARAF-2691 Adding shell variable for karaf pid


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c84af72a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c84af72a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c84af72a

Branch: refs/heads/master
Commit: c84af72aa157f4c7c6b77fbb16424c0638b4671b
Parents: 7688940
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jan 17 12:43:05 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Jan 17 12:43:05 2014 +0100

----------------------------------------------------------------------
 .../shell/console/impl/jline/ConsoleFactoryService.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c84af72a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java
index 4c2c90b..93a0b95 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.console.impl.jline;
 
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.lang.management.ManagementFactory;
 import java.security.PrivilegedAction;
 import java.util.Iterator;
 import java.util.List;
@@ -41,7 +42,7 @@ import org.osgi.framework.BundleContext;
 
 public class ConsoleFactoryService implements ConsoleFactory {
 
-    private static final Class[] SECURITY_BUGFIX = {
+    private static final Class<?>[] SECURITY_BUGFIX = {
             JaasHelper.class,
             JaasHelper.OsgiSubjectDomainCombiner.class,
             JaasHelper.DelegatingProtectionDomain.class,
@@ -83,10 +84,17 @@ public class ConsoleFactoryService implements ConsoleFactory {
         });
         session.put(".jline.terminal", terminal);
         addSystemProperties(session);
+        session.put("pid", getPid());
         return console;
     }
 
-    private void addSystemProperties(CommandSession session) {
+    private String getPid() {
+    	String name = ManagementFactory.getRuntimeMXBean().getName();
+    	String[] parts = name.split("@");
+		return parts[0];
+	}
+
+	private void addSystemProperties(CommandSession session) {
         Properties sysProps = System.getProperties();
         Iterator<Object> it = sysProps.keySet().iterator();
         while (it.hasNext()) {