Merge changes develop_2.9

atmosphere/src/main/ls/2.2.0.json

@@ -0,0 +1,25 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-atmosphere",
+  "version" : "2.2.0",
+  "description" : "Atmosphere integration for scalatra",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka", "atmosphere", "comet", "sse", "websocket" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "com.typesafe.akka",
+    "name" : "akka-actor",
+    "version" : "2.0.5"
+  }, {
+    "organization" : "org.atmosphere",
+    "name" : "atmosphere-runtime",
+    "version" : "1.0.9"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

auth/src/main/ls/2.2.0.json

@@ -0,0 +1,21 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-auth",
+  "version" : "2.2.0",
+  "description" : "Scalatra authentication module",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka", "auth" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "net.iharder",
+    "name" : "base64",
+    "version" : "2.3.8"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

commands/src/main/ls/2.2.0.json

@@ -0,0 +1,37 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-commands",
+  "version" : "2.2.0",
+  "description" : "Data binding and validation with scalaz for Scalatra",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka", "validation" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "commons-validator",
+    "name" : "commons-validator",
+    "version" : "1.4.0"
+  }, {
+    "organization" : "io.backchat.inflector",
+    "name" : "scala-inflector",
+    "version" : "1.3.5"
+  }, {
+    "organization" : "org.scalaz",
+    "name" : "scalaz-core",
+    "version" : "6.0.4"
+  }, {
+    "organization" : "joda-time",
+    "name" : "joda-time",
+    "version" : "2.1"
+  }, {
+    "organization" : "org.joda",
+    "name" : "joda-convert",
+    "version" : "1.2"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

common/src/main/ls/2.2.0.json

@@ -0,0 +1,21 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-common",
+  "version" : "2.2.0",
+  "description" : "scalatra-common",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "org.eclipse.jetty.orbit",
+    "name" : "javax.servlet",
+    "version" : "3.0.0.v201112011016"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

core/src/main/ls/2.2.0.json

@@ -0,0 +1,49 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra",
+  "version" : "2.2.0",
+  "description" : "The core Scalatra framework",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "org.eclipse.jetty.orbit",
+    "name" : "javax.servlet",
+    "version" : "3.0.0.v201112011016"
+  }, {
+    "organization" : "org.clapper",
+    "name" : "grizzled-slf4j",
+    "version" : "0.6.10"
+  }, {
+    "organization" : "org.scalatra.rl",
+    "name" : "rl",
+    "version" : "0.4.2"
+  }, {
+    "organization" : "com.googlecode.juniversalchardet",
+    "name" : "juniversalchardet",
+    "version" : "1.0.3"
+  }, {
+    "organization" : "eu.medsea.mimeutil",
+    "name" : "mime-util",
+    "version" : "2.1.3"
+  }, {
+    "organization" : "joda-time",
+    "name" : "joda-time",
+    "version" : "2.1"
+  }, {
+    "organization" : "org.joda",
+    "name" : "joda-convert",
+    "version" : "1.2"
+  }, {
+    "organization" : "com.typesafe.akka",
+    "name" : "akka-actor",
+    "version" : "2.0.5"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

akka/src/test/scala/org/scalatra/akka/AkkaSupportAfterFilterForFiltersSpec.scala → core/src/test/scala/org/scalatra/AkkaSupportAfterFilterForFiltersSpec.scala

@@ -1,12 +1,11 @@
-package org.scalatra.akka
+package org.scalatra
 
 import org.scalatra.test.specs2.MutableScalatraSpec
-import org.scalatra.ScalatraFilter
-import akka.actor.ActorSystem
 import scala.concurrent.Future
+import _root_.akka.actor.ActorSystem
 
 
-class AkkaSupportAfterFilterFilter extends ScalatraFilter with AkkaSupport {
+class AkkaSupportAfterFilterFilter extends ScalatraFilter with FutureSupport {
   val system = ActorSystem()
   var actionTime: Long = _
   var afterTime: Long = _

akka/src/test/scala/org/scalatra/akka/AkkaSupportAfterFilterSpec.scala → core/src/test/scala/org/scalatra/AkkaSupportAfterFilterSpec.scala

@@ -1,12 +1,11 @@
-package org.scalatra.akka
+package org.scalatra
 
 import org.scalatra.test.specs2.MutableScalatraSpec
-import org.scalatra.ScalatraServlet
-import akka.actor.ActorSystem
 import scala.concurrent.Future
+import _root_.akka.actor.ActorSystem
 
 
-class AkkaSupportAfterFilterServlet extends ScalatraServlet with AkkaSupport {
+class AkkaSupportAfterFilterServlet extends ScalatraServlet with FutureSupport {
   val system = ActorSystem()
   var actionTime: Long = _
   var afterTime: Long = _

akka/src/test/scala/org/scalatra/akka/AkkaSupportSpec.scala → core/src/test/scala/org/scalatra/AkkaSupportSpec.scala

@@ -1,5 +1,4 @@
 package org.scalatra
-package akka
 
 import _root_.akka.actor._
 import scala.concurrent.Await
@@ -12,23 +11,23 @@ import test.specs2.MutableScalatraSpec
 import scala.util.control.ControlThrowable
 import runtime.NonLocalReturnControl
 
-class AkkaSupportServlet extends ScalatraServlet with AkkaSupport {
+class AkkaSupportServlet extends ScalatraServlet with FutureSupport {
   val system = ActorSystem()
   protected implicit val executor = system.dispatcher
   override def asyncTimeout = 2 seconds
-  
+
   asyncGet("/working") {
     "the-working-reply"
   }
-    
+
   asyncGet("/timeout") {
     Thread.sleep((asyncTimeout plus 1.second).toMillis)
   }
-  
+
   asyncGet("/fail") {
     throw new RuntimeException
   }
-    
+
   asyncGet("/halt") {
     halt(419)
   }
@@ -45,9 +44,9 @@ class AkkaSupportServlet extends ScalatraServlet with AkkaSupport {
     case e => "caught"
   }
 
-  override def destroy() { 
+  override def destroy() {
     super.destroy()
-    system.shutdown() 
+    system.shutdown()
   }
 }
 
@@ -62,7 +61,7 @@ class AkkaSupportSpec extends MutableScalatraSpec {
         body must_== "the-working-reply"
       }
     }
-    
+
     "respond with timeout if no timely reply from the actor" in {
       get("/timeout") {
         status must_== 504

fileupload/src/main/ls/2.2.0.json

@@ -0,0 +1,25 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-fileupload",
+  "version" : "2.2.0",
+  "description" : "Commons-Fileupload integration with Scalatra",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "commons-fileupload",
+    "name" : "commons-fileupload",
+    "version" : "1.2.2"
+  }, {
+    "organization" : "commons-io",
+    "name" : "commons-io",
+    "version" : "2.4"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

jetty/src/main/ls/2.2.0.json

@@ -0,0 +1,25 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-jetty",
+  "version" : "2.2.0",
+  "description" : "Embedded Jetty server for Scalatra apps",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "org.eclipse.jetty.orbit",
+    "name" : "javax.servlet",
+    "version" : "3.0.0.v201112011016"
+  }, {
+    "organization" : "org.eclipse.jetty",
+    "name" : "jetty-servlet",
+    "version" : "8.1.8.v20121106"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}

json/src/main/ls/2.2.0.json

@@ -0,0 +1,29 @@
+{
+  "organization" : "org.scalatra",
+  "name" : "scalatra-json",
+  "version" : "2.2.0",
+  "description" : "JSON support for Scalatra",
+  "site" : "http://www.scalatra.org/",
+  "tags" : [ "web", "sinatra", "scalatra", "akka", "json", "json4s" ],
+  "docs" : "http://www.scalatra.org/guides/",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "org.json4s",
+    "name" : "json4s-jackson",
+    "version" : "3.1.0"
+  }, {
+    "organization" : "org.json4s",
+    "name" : "json4s-native",
+    "version" : "3.1.0"
+  }, {
+    "organization" : "org.json4s",
+    "name" : "json4s-core",
+    "version" : "3.1.0"
+  } ],
+  "scalas" : [ "2.9.2" ],
+  "licenses" : [ {
+    "name" : "BSD",
+    "url" : "http://github.com/scalatra/scalatra/raw/HEAD/LICENSE"
+  } ],
+  "sbt" : false
+}