Browse Source

Up'ing Curcao toolkit version to 2.0-M11

Mark Kolich 11 years ago
parent
commit
f590f79a87

+ 2 - 2
curacao/build.sbt

@@ -13,8 +13,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "com.kolich.curacao" % "curacao" % "2.0-M10" % "compile",
-  "com.kolich.curacao" % "curacao-gson" % "2.0-M10" % "compile",
+  "com.kolich.curacao" % "curacao" % "2.0-M11" % "compile",
+  "com.kolich.curacao" % "curacao-gson" % "2.0-M11" % "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",

+ 3 - 2
curacao/src/main/java/benchmark/Benchmarks.java

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

+ 10 - 1
curacao/src/main/java/benchmark/Bootstrap.java

@@ -11,11 +11,20 @@ import java.nio.file.Paths;
 
 public final class Bootstrap {
 
+    private static final int DEFAULT_SERVER_LISTEN_PORT = 8080;
+
     public static void main(final String[] args) throws Exception {
 
         final File workingDir = getWorkingDir();
 
-        final Server server = new Server(8080);
+        int port;
+        try {
+            port = Integer.parseInt(args[0]);
+        } catch (Exception e) {
+            port = DEFAULT_SERVER_LISTEN_PORT;
+        }
+
+        final Server server = new Server(port);
 
         final ServletHolder holder = new ServletHolder(CuracaoDispatcherServlet.class);
         holder.setAsyncSupported(true); // Async supported = true