svn commit: r996537 - in /karaf/trunk: demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java

[gn...@apache.org]

Author: gnodet
Date: Mon Sep 13 14:03:30 2010
New Revision: 996537

URL: http://svn.apache.org/viewvc?rev=996537&view=rev
Log:
KARAF-137: IOException on web demo when trying to connect through SSH

Modified:
    karaf/trunk/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java

Modified: karaf/trunk/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java?rev=996537&r1=996536&r2=996537&view=diff
==============================================================================
--- karaf/trunk/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java (original)
+++ karaf/trunk/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java Mon Sep 13 14:03:30 2010
@@ -33,7 +33,9 @@ public class WebAppListener implements S
 			String root = new File(sce.getServletContext().getRealPath("/") + "WEB-INF/karaf").getAbsolutePath();
 			System.err.println("Root: " + root);
 			System.setProperty("karaf.home", root);
-			System.setProperty("karaf.base", root);
+            System.setProperty("karaf.base", root);
+            System.setProperty("karaf.data", root + "/data");
+            System.setProperty("karaf.history", root + "/data/history.txt");
             System.setProperty("karaf.instances", root + "/instances");
 			System.setProperty("karaf.startLocalConsole", "false");
 			System.setProperty("karaf.startRemoteShell", "true");

Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java?rev=996537&r1=996536&r2=996537&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java Mon Sep 13 14:03:30 2010
@@ -97,7 +97,8 @@ public class Console implements Runnable
                                    getClass().getResourceAsStream("keybinding.properties"),
                                    this.terminal);
 
-        File file = new File(System.getProperty("user.home"), ".karaf/karaf.history");
+        File file = new File(System.getProperty("karaf.history",
+                             new File(System.getProperty("user.home"), ".karaf/karaf.history").toString()));
         file.getParentFile().mkdirs();
         reader.getHistory().setHistoryFile(file);
         session.put(".jline.history", reader.getHistory());