From 17241e1d70eab86c210752f7e8b00bab502877dc Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 29 Apr 2010 17:42:06 +0200
Subject: [PATCH] Moved Grizzly logic to Kernel and renamed it to
 EmbeddedAppServer

---
 .../src/main/scala/EmbeddedAppServer.scala                   | 5 +++--
 akka-kernel/src/main/scala/Kernel.scala                      | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename akka-http/src/main/scala/BootableCometActorService.scala => akka-kernel/src/main/scala/EmbeddedAppServer.scala (94%)

diff --git a/akka-http/src/main/scala/BootableCometActorService.scala b/akka-kernel/src/main/scala/EmbeddedAppServer.scala
similarity index 94%
rename from akka-http/src/main/scala/BootableCometActorService.scala
rename to akka-kernel/src/main/scala/EmbeddedAppServer.scala
index 6d9444d5f7..dc52076a81 100644
--- a/akka-http/src/main/scala/BootableCometActorService.scala
+++ b/akka-kernel/src/main/scala/EmbeddedAppServer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
  
-package se.scalablesolutions.akka.comet
+package se.scalablesolutions.akka.kernel
 
 import com.sun.grizzly.http.SelectorThread
 import com.sun.grizzly.http.servlet.ServletAdapter
@@ -12,11 +12,12 @@ import javax.ws.rs.core.UriBuilder
 
 import se.scalablesolutions.akka.actor.BootableActorLoaderService
 import se.scalablesolutions.akka.util.{Bootable, Logging}
+import se.scalablesolutions.akka.comet.AkkaServlet
 
 /**
  * Handles the Akka Comet Support (load/unload)
  */
-trait BootableCometActorService extends Bootable with Logging {
+trait EmbeddedAppServer extends Bootable with Logging {
   self : BootableActorLoaderService =>
   
   import se.scalablesolutions.akka.config.Config._
diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala
index 9243c8486f..0a10681960 100644
--- a/akka-kernel/src/main/scala/Kernel.scala
+++ b/akka-kernel/src/main/scala/Kernel.scala
@@ -6,7 +6,6 @@ package se.scalablesolutions.akka.kernel
 
 import se.scalablesolutions.akka.servlet.AkkaLoader
 import se.scalablesolutions.akka.remote.BootableRemoteActorService
-import se.scalablesolutions.akka.comet.BootableCometActorService
 import se.scalablesolutions.akka.actor.BootableActorLoaderService
 import se.scalablesolutions.akka.camel.service.CamelService
 import se.scalablesolutions.akka.config.Config
@@ -25,9 +24,8 @@ object Kernel extends AkkaLoader {
    * Boots up the Kernel with default bootables
    */
   def boot: Unit = boot(true, 
-    new BootableActorLoaderService 
+    new EmbeddedAppServer with BootableActorLoaderService 
     with BootableRemoteActorService 
-    with BootableCometActorService
     with CamelService)
 
   //For testing purposes only