svn commit: r988559 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java

[gn...@apache.org]

Author: gnodet
Date: Tue Aug 24 14:22:29 2010
New Revision: 988559

URL: http://svn.apache.org/viewvc?rev=988559&view=rev
Log:
KARAF-157: minor patch to make it easier to reuse the Karaf command line console from outside Karaf specialising the user and application

Modified:
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java

Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java?rev=988559&r1=988558&r2=988559&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java Tue Aug 24 14:22:29 2010
@@ -47,9 +47,15 @@ import org.osgi.service.command.CommandS
 import org.osgi.service.command.Function;
 
 public class Main {
+    private String application = System.getProperty("karaf.name", "root");
+    private String user = "karaf";
 
     public static void main(String args[]) throws Exception {
+        Main main = new Main();
+        main.run(args);
+    }
 
+    public void run(String args[]) throws Exception {
         ThreadIOImpl threadio = new ThreadIOImpl();
         threadio.start();
 
@@ -112,8 +118,8 @@ public class Main {
             }
         };
         CommandSession session = console.getSession();
-        session.put("USER", "karaf");
-        session.put("APPLICATION", System.getProperty("karaf.name", "root"));
+        session.put("USER", user);
+        session.put("APPLICATION", application);
         session.put("LINES", Integer.toString(terminal.getTerminalHeight()));
         session.put("COLUMNS", Integer.toString(terminal.getTerminalWidth()));
         session.put(".jline.terminal", terminal);
@@ -134,6 +140,22 @@ public class Main {
         terminalFactory.destroy();
     }
 
+    public String getApplication() {
+        return application;
+    }
+
+    public void setApplication(String application) {
+        this.application = application;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
     private static PrintStream wrap(PrintStream stream) {
         OutputStream o = AnsiConsole.wrapOutputStream(stream);
         if (o instanceof PrintStream) {