From ef9c01ecee03c520f709e8a2abe81fca0aa183fd Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 28 Dec 2010 11:36:23 +0100
Subject: [PATCH] Making EmbeddedAppServer work without AKKA_HOME

---
 .../akka/actor/BootableActorLoaderService.scala    | 11 +++++------
 .../main/scala/akka/http/EmbeddedAppServer.scala   | 14 +++++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala b/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
index 0463196eaf..2288a1cba9 100644
--- a/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
+++ b/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
@@ -19,11 +19,10 @@ trait BootableActorLoaderService extends Bootable with Logging {
   val BOOT_CLASSES = config.getList("akka.boot")
   lazy val applicationLoader: Option[ClassLoader] = createApplicationClassLoader
 
-  protected def createApplicationClassLoader : Option[ClassLoader] = {
-    Some(
+  protected def createApplicationClassLoader : Option[ClassLoader] = Some({
     if (HOME.isDefined) {
-      val CONFIG = HOME.getOrElse(throwNoAkkaHomeException) + "/config"
-      val DEPLOY = HOME.getOrElse(throwNoAkkaHomeException) + "/deploy"
+      val CONFIG = HOME.get + "/config"
+      val DEPLOY = HOME.get + "/deploy"
       val DEPLOY_DIR = new File(DEPLOY)
       if (!DEPLOY_DIR.exists) {
         log.slf4j.error("Could not find a deploy directory at [{}]", DEPLOY)
@@ -47,8 +46,8 @@ trait BootableActorLoaderService extends Bootable with Logging {
       val allJars = toDeploy ::: dependencyJars
 
       new URLClassLoader(allJars.toArray,Thread.currentThread.getContextClassLoader)
-    } else Thread.currentThread.getContextClassLoader)
-  }
+    } else Thread.currentThread.getContextClassLoader
+  })
 
   abstract override def onLoad = {
     applicationLoader.foreach(_ => log.slf4j.info("Creating /deploy class-loader"))
diff --git a/akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala b/akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala
index 7fd63d8456..d881459817 100644
--- a/akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala
+++ b/akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala
@@ -11,11 +11,11 @@ import java.io.File
 import akka.actor.BootableActorLoaderService
 import akka.util.{Bootable, Logging}
 
-//import akka.comet.AkkaServlet
-
 import org.eclipse.jetty.xml.XmlConfiguration
 import org.eclipse.jetty.server.{Handler, Server}
 import org.eclipse.jetty.server.handler.{HandlerList, HandlerCollection, ContextHandler}
+import java.net.URL
+import akka.AkkaException
 
 /**
  * Handles the Akka Comet Support (load/unload)
@@ -32,17 +32,21 @@ trait EmbeddedAppServer extends Bootable with Logging {
 
   protected var server: Option[Server] = None
 
+  protected def findJettyConfigXML: Option[URL] =
+    Option(applicationLoader.getOrElse(this.getClass.getClassLoader).getResource("microkernel-server.xml")) orElse
+    HOME.map(home => new File(home + "/config/microkernel-server.xml").toURI.toURL)
+
   abstract override def onLoad = {
     super.onLoad
     if (isRestEnabled) {
       log.slf4j.info("Attempting to start Akka HTTP service")
 
+      val configuration = new XmlConfiguration(findJettyConfigXML.getOrElse(error("microkernel-server.xml not found!")))
+
       System.setProperty("jetty.port", REST_PORT.toString)
       System.setProperty("jetty.host", REST_HOSTNAME)
-      System.setProperty("jetty.home", HOME.getOrElse(throwNoAkkaHomeException) + "/deploy/root")
 
-      val configuration = new XmlConfiguration(
-        new File(HOME.getOrElse(throwNoAkkaHomeException) + "/config/microkernel-server.xml").toURI.toURL)
+      HOME.foreach( home => System.setProperty("jetty.home", home + "/deploy/root") )
 
       server = Option(configuration.configure.asInstanceOf[Server]) map { s => //Set the correct classloader to our contexts
          applicationLoader foreach { loader =>