Merging in master

akka-http/src/main/scala/akka/http/ListWriter.scala

@@ -1,42 +0,0 @@
-/**
- * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
- */
-package akka.http
-
-import akka.serialization.Serializer
-
-import java.io.OutputStream
-import javax.ws.rs.core.{MultivaluedMap, MediaType}
-import javax.ws.rs.ext.{MessageBodyWriter, Provider}
-import javax.ws.rs.Produces
-
-/**
- * Writes Lists of JSON serializable objects.
- */
-@Provider
-@Produces(Array("application/json"))
-class ListWriter extends MessageBodyWriter[List[_]] {
-
-  def isWriteable(aClass: Class[_],
-                  aType: java.lang.reflect.Type,
-                  annotations: Array[java.lang.annotation.Annotation],
-                  mediaType: MediaType) =
-    classOf[List[_]].isAssignableFrom(aClass) || aClass == ::.getClass
-
-  def getSize(list: List[_],
-              aClass: Class[_],
-              aType: java.lang.reflect.Type,
-              annotations: Array[java.lang.annotation.Annotation],
-              mediaType: MediaType) =
-    -1L
-
-  def writeTo(list: List[_],
-              aClass: Class[_],
-              aType: java.lang.reflect.Type,
-              annotations: Array[java.lang.annotation.Annotation],
-              mediaType: MediaType,
-              stringObjectMultivaluedMap: MultivaluedMap[String, Object],
-              outputStream: OutputStream): Unit =
-    if (list.isEmpty) outputStream.write(" ".getBytes)
-    else outputStream.write(Serializer.ScalaJSON.toBinary(list))
-}

akka-http/src/main/scala/akka/http/Mist.scala

@@ -5,7 +5,7 @@
 package akka.http
 
 import akka.actor.{ActorRegistry, ActorRef, Actor}
-import akka.actor.EventHandler
+import akka.event.EventHandler
 
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import javax.servlet.http.HttpServlet

akka-http/src/main/scala/akka/http/Servlet30Context.scala

@@ -7,7 +7,7 @@ package akka.http
 import javax.servlet. {AsyncContext, AsyncListener, AsyncEvent};
 import Types._
 
-import akka.actor.EventHandler
+import akka.event.EventHandler
 
 /**
  * @author Garrick Evans

akka-http/src/main/scala/akka/security/Security.scala

@@ -23,7 +23,7 @@
 package akka.security
 
 import akka.actor.{Scheduler, Actor, ActorRef, ActorRegistry, IllegalActorStateException}
-import akka.actor.EventHandler
+import akka.event.EventHandler
 import akka.actor.Actor._
 import akka.config.Config
 

akka-http/src/main/scala/akka/servlet/Initializer.scala

@@ -1,33 +0,0 @@
-/**
- * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
- */
-
-package akka.servlet
-
-import akka.remote.BootableRemoteActorService
-import akka.actor.BootableActorLoaderService
-import akka.config.Config
-import akka.util.{ Bootable, AkkaLoader }
-
-import javax.servlet.{ServletContextListener, ServletContextEvent}
-
- /**
-  * This class can be added to web.xml mappings as a listener to start and postStop Akka.
-  *
-  *<web-app>
-  * ...
-  *  <listener>
-  *    <listener-class>akka.servlet.Initializer</listener-class>
-  *  </listener>
-  * ...
-  *</web-app>
-  */
-class Initializer extends ServletContextListener {
-   lazy val loader = new AkkaLoader
-
-   def contextDestroyed(e: ServletContextEvent): Unit =
-     loader.shutdown
-
-   def contextInitialized(e: ServletContextEvent): Unit =
-     loader.boot(true, new BootableActorLoaderService with BootableRemoteActorService)
- }