diff --git a/akka-http/src/main/scala/akka/http/ListWriter.scala b/akka-http/src/main/scala/akka/http/ListWriter.scala deleted file mode 100644 index 3f1123d4d8..0000000000 --- a/akka-http/src/main/scala/akka/http/ListWriter.scala +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (C) 2009-2011 Scalable Solutions AB - */ -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)) -} diff --git a/akka-http/src/main/scala/akka/servlet/Initializer.scala b/akka-http/src/main/scala/akka/servlet/Initializer.scala deleted file mode 100644 index a259a7fd34..0000000000 --- a/akka-http/src/main/scala/akka/servlet/Initializer.scala +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (C) 2009-2011 Scalable Solutions AB - */ - -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. - * - * - * ... - * - * akka.servlet.Initializer - * - * ... - * - */ -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) - }