From 4a798881e6a237ec3bd94c36d32a9e8c19e32fcd Mon Sep 17 00:00:00 2001
From: Jonas Boner <jonas@jonasboner.com>
Date: Thu, 12 Mar 2009 20:29:03 +0100
Subject: [PATCH] fixed env path bug preventing startup of dist, now working
 fine starting up voldemort

---
 kernel/src/main/scala/Boot.scala   | 9 +++++----
 kernel/src/main/scala/Kernel.scala | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kernel/src/main/scala/Boot.scala b/kernel/src/main/scala/Boot.scala
index 5f84eaf67e..3dad25c03d 100644
--- a/kernel/src/main/scala/Boot.scala
+++ b/kernel/src/main/scala/Boot.scala
@@ -13,7 +13,7 @@ import java.net.{URL, URLClassLoader}
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-class Boot extends Logging {
+object Boot extends Logging {
 
   /**
    * Assumes that the AKKA_HOME directory is set with /config, /classes and /lib beneath it holding files and jars.
@@ -24,13 +24,14 @@ class Boot extends Logging {
    * $AKKA_HOME/lib
    * $AKKA_HOME/config
    */
-  def main(args: Array[String]) = {
-    val HOME = System.getProperty("AKKA_HOME", "..")
+  def main(args: Array[String]): Unit = {
+    // TODO: read from env rather than jvm variables
+    val HOME = System.getProperty("AKKA_HOME", ".")
     val CLASSES = HOME + "/classes"
     val LIB = HOME + "/lib"
     val CONFIG = HOME + "/config"
 
-    log.info("Bootstrapping Akka server from AKKA_HOME=" + HOME)
+    log.info("Bootstrapping Akka server from AKKA_HOME=%s", HOME)
 
     val libs = for (f <- new File(LIB).listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL
     val urls = new File(CLASSES).toURL :: libs
diff --git a/kernel/src/main/scala/Kernel.scala b/kernel/src/main/scala/Kernel.scala
index b6b9475ba2..4073f699c2 100755
--- a/kernel/src/main/scala/Kernel.scala
+++ b/kernel/src/main/scala/Kernel.scala
@@ -30,7 +30,7 @@ import javax.management.JMException
 object Kernel extends Logging {
 
   val SERVER_URL = "localhost"
-  val HOME = System.getProperty("AKKA_HOME", "..")
+  val HOME = System.getProperty("AKKA_HOME", ".")
 
   val JERSEY_SERVER_URL = "http://" + SERVER_URL + "/"
   val JERSEY_SERVER_PORT = 9998
@@ -43,7 +43,7 @@ object Kernel extends Logging {
   val ZOO_KEEPER_SERVER_URL = SERVER_URL
   val ZOO_KEEPER_SERVER_PORT = 9898
 
-  def main(args: Array[String]) = {
+  def main(args: Array[String]): Unit = {
     //startZooKeeper
     startVoldemort
     //val threadSelector = startJersey
@@ -66,7 +66,7 @@ object Kernel extends Logging {
     val config = VoldemortConfig.loadFromVoldemortHome(HOME)
     val server = new VoldemortServer(config)
     server.start
-    log.info("Replicated persistent storage server started at s%", VOLDEMORT_SERVER_URL + ":" + VOLDEMORT_SERVER_PORT)
+    log.info("Replicated persistent storage server started at %s", VOLDEMORT_SERVER_URL + ":" + VOLDEMORT_SERVER_PORT)
   }
   
   // private[akka] def startZooKeeper = {