Upgrading branch to use Curacao 2.0-RC3

curacao/build.sbt

@@ -4,7 +4,7 @@ name := "curacao-benchmark"
 
 organization := "com.kolich"
 
-scalaVersion := "2.10.2"
+scalaVersion := "2.10.3"
 
 version := "1.0"
 
@@ -13,8 +13,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "com.kolich.curacao" % "curacao" % "2.0-M11" % "compile",
-  "com.kolich.curacao" % "curacao-gson" % "2.0-M11" % "compile",
+  "com.kolich.curacao" % "curacao" % "2.0-RC3" % "compile",
+  "com.kolich.curacao" % "curacao-gson" % "2.0-RC3" % "compile",
   "org.eclipse.jetty" % "jetty-webapp" % "9.1.1.v20140108" % "compile",
   "javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided",
   "org.slf4j" % "slf4j-api" % "1.7.2" % "compile",

curacao/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.2")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")

curacao/src/main/java/benchmark/Benchmarks.java

@@ -2,18 +2,18 @@ package benchmark;
 
 import benchmark.entities.HelloWorld;
 import com.kolich.curacao.annotations.Controller;
-import com.kolich.curacao.annotations.methods.GET;
+import com.kolich.curacao.annotations.methods.RequestMapping;
 import com.kolich.curacao.handlers.requests.matchers.AntPathMatcher;
 
 @Controller
 public final class Benchmarks {
 
-    @GET(value="/json", matcher=AntPathMatcher.class)
+    @RequestMapping(value="/json", matcher=AntPathMatcher.class)
     public final HelloWorld json() {
         return new HelloWorld("Hello, World!");
     }
 
-    @GET(value="/plaintext", matcher=AntPathMatcher.class)
+    @RequestMapping(value="/plaintext", matcher=AntPathMatcher.class)
     public final String plainText() {
         return "Hello, World!";
     }

curacao/src/main/java/benchmark/Bootstrap.java

@@ -1,5 +1,6 @@
 package benchmark;
 
+import com.kolich.curacao.CuracaoContextListener;
 import com.kolich.curacao.CuracaoDispatcherServlet;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -31,6 +32,7 @@ public final class Bootstrap {
         holder.setInitOrder(1); // Load on startup = true
 
         final WebAppContext context = new WebAppContext();
+        context.addEventListener(new CuracaoContextListener()); // Required
         context.setContextPath("/");
         context.setResourceBase(workingDir.getAbsolutePath());
         context.addServlet(holder, "/*");