Merge branch 'master' of http://github.com/jboner/akka

akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME

@@ -1 +0,0 @@
-se.scalablesolutions.akka.rest.ListWriter

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

@@ -269,7 +269,7 @@ class RootEndpoint extends Actor with Endpoint {
   // adopt the configured id
   if (RootActorBuiltin) self.id = RootActorID
 
-  override def preStart =
+  override def preStart() =
     _attachments = Tuple2((uri: String) => {uri eq Root}, (uri: String) => this.actor) :: _attachments
 
   def recv: Receive = {

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

@@ -182,7 +182,7 @@ trait AuthenticationActor[C <: Credentials] extends Actor {
    * Responsible for the execution flow of authentication
    *
    * Credentials are extracted and verified from the request,
-   * and a se3curity context is created for the ContainerRequest
+   * and a security context is created for the ContainerRequest
    * this should ensure good integration with current Jersey security
    */
   protected val authenticate: Receive = {

akka-http/src/test/scala/config/ConfigSpec.scala

@@ -19,7 +19,7 @@ class ConfigSpec extends WordSpec with MustMatchers {
       getString("akka.http.authenticator") must equal(Some("N/A"))
       getBool("akka.http.connection-close") must equal(Some(true))
       getString("akka.http.expired-header-name") must equal(Some("Async-Timeout"))
-      getList("akka.http.filters") must equal(List("se.scalablesolutions.akka.security.AkkaSecurityFilterFactory"))
+      getList("akka.http.filters") must equal(List("akka.security.AkkaSecurityFilterFactory"))
       getList("akka.http.resource-packages") must equal(Nil)
       getString("akka.http.hostname") must equal(Some("localhost"))
       getString("akka.http.expired-header-value") must equal(Some("expired"))