!htp rename akka.http.routing package to akka.http.server

akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala

@@ -13,7 +13,7 @@ import scala.reflect.ClassTag
 import org.scalatest.Suite
 import akka.actor.ActorSystem
 import akka.stream.FlowMaterializer
-import akka.http.routing._
+import akka.http.server._
 import akka.http.unmarshalling._
 import akka.http.model._
 import headers.Host

akka-http-testkit/src/main/scala/akka/http/testkit/RouteTestResultComponent.scala

@@ -12,7 +12,7 @@ import scala.concurrent.{ Await, ExecutionContext }
 import akka.stream.FlowMaterializer
 import akka.stream.scaladsl.Flow
 import akka.http.model.HttpEntity.ChunkStreamPart
-import akka.http.routing._
+import akka.http.server._
 import akka.http.model._
 
 trait RouteTestResultComponent {

akka-http-testkit/src/test/scala/akka/http/testkit/ScalatestRouteTestSpec.scala

@@ -11,7 +11,7 @@ import akka.testkit.TestProbe
 import akka.util.Timeout
 import akka.pattern.ask
 import akka.http.model.headers.RawHeader
-import akka.http.routing._
+import akka.http.server._
 import akka.http.model._
 import StatusCodes._
 import HttpMethods._

akka-http-tests/src/test/scala/akka/http/server/BasicRouteSpecs.scala

@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.http.model.HttpMethods._
-import akka.http.routing.PathMatchers.{ Segment, IntNumber }
+import akka.http.server.PathMatchers.{ Segment, IntNumber }
 
 class BasicRouteSpecs extends RoutingSpec {
 

akka-http-tests/src/test/scala/akka/http/server/RoutingSpec.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import org.scalatest.{ WordSpec, Suite, Matchers }
 import akka.http.model.HttpResponse

akka-http-tests/src/test/scala/akka/http/server/TestServer.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.duration._

akka-http-tests/src/test/scala/akka/http/server/directives/BasicDirectivesSpec.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 class BasicDirectivesSpec extends RoutingSpec {

akka-http-tests/src/test/scala/akka/http/server/directives/MethodDirectivesSpec.scala

@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.directives
+package akka.http.server.directives
 
 import akka.http.model.{ StatusCodes, HttpMethods }
-import akka.http.routing._
+import akka.http.server._
 
 class MethodDirectivesSpec extends RoutingSpec {
 

akka-http-tests/src/test/scala/akka/http/server/directives/PathDirectivesSpec.scala

@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.directives
+package akka.http.server.directives
 
-import akka.http.routing._
+import akka.http.server._
 
 class PathDirectivesSpec extends RoutingSpec {
   val echoUnmatchedPath = unmatchedPath { echoComplete }

akka-http-tests/src/test/scala/akka/http/server/directives/RouteDirectivesSpec.scala

@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.directives
+package akka.http.server.directives
 
 import org.scalatest.FreeSpec
 
 import scala.concurrent.Promise
 import akka.http.marshalling._
-import akka.http.routing._
+import akka.http.server._
 import akka.http.model._
 import akka.http.util._
 import headers._

akka-http/src/main/boilerplate/akka/http/server/util/AppendOneInstances.scala.template

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 private[util] abstract class AppendOneInstances {
   type Aux[P, S, Out0] = AppendOne[P, S] { type Out = Out0 }

akka-http/src/main/boilerplate/akka/http/server/util/ApplyConverterInstances.scala.template

@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
-import akka.http.routing.Route
+import akka.http.server.Route
 
 private[util] abstract class ApplyConverterInstances {
   [#implicit def hac1[[#T1#]] = new ApplyConverter[Tuple1[[#T1#]]] {

akka-http/src/main/boilerplate/akka/http/server/util/ConstructFromTupleInstances.scala.template

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 trait ConstructFromTupleInstances {
   [#implicit def instance1[[#T1#], R](construct: ([#T1#]) => R): ConstructFromTuple[Tuple1[[#T1#]], R] =

akka-http/src/main/boilerplate/akka/http/server/util/HeadTailInstances.scala.template

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 private[util] abstract class HeadTailInstances {
   type Aux[L, H0, T0] = HeadTail[L] { type H = H0; type T = T0 }

akka-http/src/main/scala/akka/http/marshalling/MultipartMarshallers.scala

@@ -10,7 +10,7 @@ import akka.actor.ActorRefFactory
 import akka.parboiled2.util.Base64
 import akka.stream.{ FlattenStrategy, FlowMaterializer }
 import akka.stream.scaladsl.Flow
-import akka.http.rendering.BodyPartRenderer
+import akka.http.engine.rendering.BodyPartRenderer
 import akka.http.util.actorSystem
 import akka.http.model._
 import MediaTypes._

akka-http/src/main/scala/akka/http/server/Directive.scala

@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
-import akka.http.routing.directives.RouteDirectives
+import akka.http.server.directives.RouteDirectives
-import akka.http.routing.util._
+import akka.http.server.util._
 
 trait ConjunctionMagnet[L] {
   type Out

akka-http/src/main/scala/akka/http/server/Directives.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import directives._
 

akka-http/src/main/scala/akka/http/server/ExceptionHandler.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.concurrent.ExecutionContext
 import scala.util.control.NonFatal

akka-http/src/main/scala/akka/http/server/PathMatcher.scala

@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import java.util.UUID
 import scala.util.matching.Regex
 import scala.annotation.tailrec
-import akka.http.routing.util.{ Tuple, Join }
+import akka.http.server.util.{ Tuple, Join }
 import akka.http.model.Uri.Path
 import akka.http.util._
 import directives.NameReceptacle

akka-http/src/main/scala/akka/http/server/Rejection.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.http.model._
 import akka.http.model.headers.{ ByteRange, HttpEncoding }
@@ -124,7 +124,7 @@ case class UnacceptedResponseContentTypeRejection(supported: Seq[ContentType]) e
 case class UnacceptedResponseEncodingRejection(supported: HttpEncoding) extends Rejection
 
 /**
- * Rejection created by an [[akka.http.routing.authentication.HttpAuthenticator]].
+ * Rejection created by an [[akka.http.server.authentication.HttpAuthenticator]].
  * Signals that the request was rejected because the user could not be authenticated. The reason for the rejection is
  * specified in the cause.
  */

akka-http/src/main/scala/akka/http/server/RejectionHandler.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.concurrent.ExecutionContext
 import akka.http.model._

akka-http/src/main/scala/akka/http/server/RequestContext.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.collection.immutable
 import scala.concurrent.ExecutionContext

akka-http/src/main/scala/akka/http/server/RequestContextImpl.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.collection.immutable
 import scala.concurrent.ExecutionContext

akka-http/src/main/scala/akka/http/server/RouteConcatenation.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 trait RouteConcatenation {
 

akka-http/src/main/scala/akka/http/server/RouteResult.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.http.model.HttpResponse
 

akka-http/src/main/scala/akka/http/server/RoutingSettings.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import com.typesafe.config.Config
 import akka.actor.ActorRefFactory

akka-http/src/main/scala/akka/http/server/RoutingSetup.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.concurrent.ExecutionContext
 import akka.actor.{ ActorSystem, ActorContext }

akka-http/src/main/scala/akka/http/server/ScalaRoutingDSL.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.stream.FlowMaterializer
 

akka-http/src/main/scala/akka/http/server/StandardRoute.scala

@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
-import akka.http.routing.util.Tuple
+import akka.http.server.util.Tuple
 
 /**
  * A Route that can be implicitly converted into a Directive (fitting any signature).

akka-http/src/main/scala/akka/http/server/directives/BasicDirectives.scala

@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import scala.collection.immutable
-import akka.http.routing.util.Tuple
+import akka.http.server.util.Tuple
 import akka.http.model._
 
 trait BasicDirectives {

akka-http/src/main/scala/akka/http/server/directives/ExecutionDirectives.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 trait ExecutionDirectives {
@@ -10,7 +10,7 @@ trait ExecutionDirectives {
 
   /**
    * Transforms exceptions thrown during evaluation of its inner route using the given
-   * [[akka.http.routing.ExceptionHandler]].
+   * [[akka.http.server.ExceptionHandler]].
    */
   def handleExceptions(handler: ExceptionHandler): Directive0 =
     mapInnerRoute { inner ⇒
@@ -26,7 +26,7 @@ trait ExecutionDirectives {
 
   /**
    * Transforms rejections produced by its inner route using the given
-   * [[akka.http.routing.RejectionHandler]].
+   * [[akka.http.server.RejectionHandler]].
    */
   def handleRejections(handler: RejectionHandler): Directive0 =
     mapRequestContext { ctx ⇒

akka-http/src/main/scala/akka/http/server/directives/MethodDirectives.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import akka.http.model.HttpMethod

akka-http/src/main/scala/akka/http/server/directives/NameReceptacle.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import akka.http.unmarshalling.{ FromStringOptionDeserializer ⇒ FSOD, Deserializer }

akka-http/src/main/scala/akka/http/server/directives/PathDirectives.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction with ToNameReceptacleEnhancements {
@@ -11,7 +11,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   import PathMatcher._
 
   /**
-   * Consumes a leading slash from the unmatched path of the [[akka.http.routing.RequestContext]]
+   * Consumes a leading slash from the unmatched path of the [[akka.http.server.RequestContext]]
    * before applying the given matcher. The matcher has to match the remaining path completely
    * or leave only a single trailing slash.
    * If matched the value extracted by the PathMatcher is extracted on the directive level.
@@ -19,14 +19,14 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   def path[L](pm: PathMatcher[L]): Directive[L] = pathPrefix(pm ~ PathEnd)
 
   /**
-   * Consumes a leading slash from the unmatched path of the [[akka.http.routing.RequestContext]]
+   * Consumes a leading slash from the unmatched path of the [[akka.http.server.RequestContext]]
    * before applying the given matcher. The matcher has to match a prefix of the remaining path.
    * If matched the value extracted by the PathMatcher is extracted on the directive level.
    */
   def pathPrefix[L](pm: PathMatcher[L]): Directive[L] = rawPathPrefix(Slash ~ pm)
 
   /**
-   * Applies the given matcher directly to the unmatched path of the [[akka.http.routing.RequestContext]]
+   * Applies the given matcher directly to the unmatched path of the [[akka.http.server.RequestContext]]
    * (i.e. without implicitly consuming a leading slash).
    * The matcher has to match a prefix of the remaining path.
    * If matched the value extracted by the PathMatcher is extracted on the directive level.
@@ -40,13 +40,13 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Checks whether the unmatchedPath of the [[akka.http.routing.RequestContext]] has a prefix matched by the
+   * Checks whether the unmatchedPath of the [[akka.http.server.RequestContext]] has a prefix matched by the
    * given PathMatcher. In analogy to the `pathPrefix` directive a leading slash is implied.
    */
   def pathPrefixTest[L](pm: PathMatcher[L]): Directive[L] = rawPathPrefixTest(Slash ~ pm)
 
   /**
-   * Checks whether the unmatchedPath of the [[akka.http.routing.RequestContext]] has a prefix matched by the
+   * Checks whether the unmatchedPath of the [[akka.http.server.RequestContext]] has a prefix matched by the
    * given PathMatcher. However, as opposed to the `pathPrefix` directive the matched path is not
    * actually "consumed".
    */
@@ -59,7 +59,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Rejects the request if the unmatchedPath of the [[akka.http.routing.RequestContext]] does not have a suffix
+   * Rejects the request if the unmatchedPath of the [[akka.http.server.RequestContext]] does not have a suffix
    * matched the given PathMatcher. If matched the value extracted by the PathMatcher is extracted
    * and the matched parts of the path are consumed.
    * Note that, for efficiency reasons, the given PathMatcher must match the desired suffix in reversed-segment
@@ -74,7 +74,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Checks whether the unmatchedPath of the [[akka.http.routing.RequestContext]] has a suffix matched by the
+   * Checks whether the unmatchedPath of the [[akka.http.server.RequestContext]] has a suffix matched by the
    * given PathMatcher. However, as opposed to the pathSuffix directive the matched path is not
    * actually "consumed".
    * Note that, for efficiency reasons, the given PathMatcher must match the desired suffix in reversed-segment
@@ -89,7 +89,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Rejects the request if the unmatchedPath of the [[akka.http.routing.RequestContext]] is non-empty,
+   * Rejects the request if the unmatchedPath of the [[akka.http.server.RequestContext]] is non-empty,
    * or said differently: only passes on the request to its inner route if the request path
    * has been matched completely.
    */

akka-http/src/main/scala/akka/http/server/directives/RouteDirectives.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import akka.http.marshalling.ToResponseMarshallable

akka-http/src/main/scala/akka/http/server/package.scala

@@ -6,7 +6,7 @@ package akka.http
 
 import akka.http.util.Deferrable
 
-package object routing {
+package object server {
 
   type Route = RequestContext ⇒ Deferrable[RouteResult]
   type RouteGenerator[T] = T ⇒ Route

akka-http/src/main/scala/akka/http/server/util/ApplyConverter.scala

@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
-import akka.http.routing._
+import akka.http.server._
 
 /**
  * ApplyConverter allows generic conversion of functions of type `(T1, T2, ...) => Route` to

akka-http/src/main/scala/akka/http/server/util/ConstructFromTuple.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 trait ConstructFromTuple[T, R] {
   def apply(t: T): R

akka-http/src/main/scala/akka/http/server/util/Join.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 /**
  * `Join` is implicit evidence that tuples `P` and `S` can be joined into tuple `Out`

akka-http/src/main/scala/akka/http/server/util/Tuple.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 /**
  * Phantom type providing implicit evidence that a given type is a Tuple or Unit.

akka-http/src/main/scala/akka/http/server/util/Tupler.scala

@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 /**
  * Provides a way to convert a value into an Tuple.
@@ -23,7 +23,7 @@ object Tupler extends LowerPriorityTupler {
     }
 }
 
-private[routing] abstract class LowerPriorityTupler {
+private[server] abstract class LowerPriorityTupler {
   implicit def forAnyRef[T] =
     new Tupler[T] {
       type Out = Tuple1[T]

akka-http/src/main/scala/akka/http/unmarshalling/Deserializer.scala

@@ -4,7 +4,7 @@
 
 package akka.http.unmarshalling
 
-import akka.http.routing
+import akka.http.server
 
 import scala.concurrent.{ ExecutionContext, Future }
 
@@ -27,8 +27,8 @@ object Deserializer extends FromStringDeserializers {
       }
     }
 
-  implicit def liftFromStringDeserializer[T: FromStringDeserializer]: FromStringOptionDeserializer[T] = routing.FIXME
+  implicit def liftFromStringDeserializer[T: FromStringDeserializer]: FromStringOptionDeserializer[T] = server.FIXME
-  implicit def liftFromStringDeserializerConversion[T](f: FromStringDeserializer[T]): FromStringOptionDeserializer[T] = routing.FIXME
+  implicit def liftFromStringDeserializerConversion[T](f: FromStringDeserializer[T]): FromStringOptionDeserializer[T] = server.FIXME
 }
 
 trait DeserializationError extends RuntimeException
@@ -39,7 +39,7 @@ case class UnsupportedContentType(errorMessage: String) extends DeserializationE
 case class MalformedContent(errorMessage: String, cause: Option[Throwable] = None) extends DeserializationError
 
 trait FromStringDeserializers {
-  implicit def String2IntConverter: FromStringDeserializer[Int] = routing.FIXME
+  implicit def String2IntConverter: FromStringDeserializer[Int] = server.FIXME
-  def HexInt: FromStringDeserializer[Int] = routing.FIXME
+  def HexInt: FromStringDeserializer[Int] = server.FIXME
 }
 object FromStringDeserializers extends FromStringDeserializers

akka-http/src/main/scala/akka/http/unmarshalling/MultipartUnmarshallers.scala

@@ -8,7 +8,7 @@ import org.reactivestreams.Publisher
 import akka.actor.ActorRefFactory
 import akka.stream.FlowMaterializer
 import akka.stream.scaladsl.Flow
-import akka.http.parsing.BodyPartParser
+import akka.http.engine.parsing.BodyPartParser
 import akka.http.model._
 import akka.http.util._
 import MediaRanges._