From 29a901b5157de17ab9e6958646d3c0b22365f136 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 4 Oct 2010 14:08:55 +0200 Subject: [PATCH] Moving EmbeddedAppServer to akka-http and closing #451 --- .../src/main/scala/EmbeddedAppServer.scala | 2 +- akka-kernel/src/main/scala/Kernel.scala | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename {akka-kernel => akka-http}/src/main/scala/EmbeddedAppServer.scala (98%) diff --git a/akka-kernel/src/main/scala/EmbeddedAppServer.scala b/akka-http/src/main/scala/EmbeddedAppServer.scala similarity index 98% rename from akka-kernel/src/main/scala/EmbeddedAppServer.scala rename to akka-http/src/main/scala/EmbeddedAppServer.scala index 9afcfbe572..580f3430db 100644 --- a/akka-kernel/src/main/scala/EmbeddedAppServer.scala +++ b/akka-http/src/main/scala/EmbeddedAppServer.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2010 Scalable Solutions AB */ -package se.scalablesolutions.akka.kernel +package se.scalablesolutions.akka.http import javax.ws.rs.core.UriBuilder import javax.servlet.ServletConfig diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala index 646ca34bcc..0f7619dc67 100644 --- a/akka-kernel/src/main/scala/Kernel.scala +++ b/akka-kernel/src/main/scala/Kernel.scala @@ -9,6 +9,7 @@ import se.scalablesolutions.akka.remote.BootableRemoteActorService import se.scalablesolutions.akka.actor.BootableActorLoaderService import se.scalablesolutions.akka.camel.CamelService import se.scalablesolutions.akka.config.Config +import se.scalablesolutions.akka.http.EmbeddedAppServer object Main { def main(args: Array[String]) = Kernel.boot