Merge pull request #1892 from blee-techempower/blee-curacao

Fix curacao dependecies and related issues

frameworks/Java/curacao/build.sbt

@@ -9,12 +9,12 @@ scalaVersion := "2.10.3"
 version := "1.0"
 
 resolvers ++= Seq(
-  "markkolich.github.io repo" at "http://markkolich.github.io/repo"
+  "markkolich.github.io repo" at "http://markkolich.github.io/repo/"
 )
 
 libraryDependencies ++= Seq(
-  "com.kolich.curacao" % "curacao" % "2.9-M1" % "compile",
-  "com.kolich.curacao" % "curacao-gson" % "2.9-M1" % "compile",
+  "curacao" % "curacao" % "4.0.0" % "compile",
+  "curacao" % "curacao-gson" % "4.0.0" % "compile",
   "org.eclipse.jetty" % "jetty-webapp" % "9.2.9.v20150224" % "compile",
   "javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided",
   "org.slf4j" % "slf4j-api" % "1.7.2" % "compile",

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

@@ -1,19 +1,19 @@
 package benchmark;
 
 import benchmark.entities.HelloWorld;
-import com.kolich.curacao.annotations.Controller;
-import com.kolich.curacao.annotations.RequestMapping;
-import com.kolich.curacao.mappers.request.matchers.AntPathMatcher;
+import curacao.annotations.Controller;
+import curacao.annotations.RequestMapping;
+import curacao.mappers.request.matchers.CuracaoAntPathMatcher;
 
 @Controller
 public final class Benchmarks {
 
-    @RequestMapping(value="/json", matcher=AntPathMatcher.class)
+    @RequestMapping(value="/json", matcher=CuracaoAntPathMatcher.class)
     public final HelloWorld json() {
         return new HelloWorld("Hello, World!");
     }
 
-    @RequestMapping(value="/plaintext", matcher=AntPathMatcher.class)
+    @RequestMapping(value="/plaintext", matcher=CuracaoAntPathMatcher.class)
     public final String plainText() {
         return "Hello, World!";
     }

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

@@ -1,7 +1,7 @@
 package benchmark;
 
-import com.kolich.curacao.CuracaoContextListener;
-import com.kolich.curacao.CuracaoDispatcherServlet;
+import curacao.CuracaoContextListener;
+import curacao.CuracaoDispatcherServlet;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.webapp.WebAppContext;

frameworks/Java/curacao/src/main/java/benchmark/entities/HelloWorld.java

@@ -3,7 +3,7 @@ package benchmark.entities;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
-import com.kolich.curacao.gson.GsonAppendableCuracaoEntity;
+import curacao.gson.GsonAppendableCuracaoEntity;
 
 public final class HelloWorld extends GsonAppendableCuracaoEntity {