Browse Source

upgraded to version 0.8.10

MTD 9 years ago
parent
commit
fc22b03efa

+ 2 - 2
frameworks/Java/jawn/benchmark_config.json

@@ -13,7 +13,7 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "java-web-planet",
+      "framework": "jawn",
       "language": "Java",
       "orm": "Raw",
       "platform": "Servlet",
@@ -22,7 +22,7 @@
       "database_os": "Linux",
       "display_name": "jawn",
       "notes": "",
-      "versus": ""
+      "versus": "servlet"
     }
   }]
 }

+ 2 - 3
frameworks/Java/jawn/build.gradle

@@ -19,12 +19,11 @@ repositories {
 
 dependencies {
 	// Framework
-	compile 'net.javapla.jawn:jawn-server-undertow:0.8.9-b02'
-	//compile project(':jawn-server'), project(':jawn-server-undertow'), project(':jawn-server-jetty')
+	compile 'net.javapla.jawn:jawn-server-undertow:0.8.10'
 
 	
 	// Database
-	compile 'mysql:mysql-connector-java:5.1.36'
+	compile 'mysql:mysql-connector-java:5.1.37'
 	
 	//Logging 
 	runtime group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.3' exclude group: 'org.slf4j'

+ 3 - 3
frameworks/Java/jawn/setup.sh

@@ -2,8 +2,8 @@
 
 fw_depends java8
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/java/app/config/Database.java
+./gradlew clean
 
-./gradlew clean --daemon
+sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/java/app/config/Database.java
 
-./gradlew run -Pargs=production
+./gradlew run --refresh-dependencies -Pargs=production

+ 2 - 1
frameworks/Java/jawn/source_code

@@ -9,7 +9,8 @@
 ./jawn/src/main/java/app/controllers
 ./jawn/src/main/java/app/controllers/DbController.java
 ./jawn/src/main/java/app/controllers/FortunesController.java
-./jawn/src/main/java/app/controllers/IndexController.java
+./jawn/src/main/java/app/controllers/JsonController.java
+./jawn/src/main/java/app/controllers/PlaintextController.java
 ./jawn/src/main/java/app/db
 ./jawn/src/main/java/app/db/DbManager.java
 ./jawn/src/main/java/app/db/DbModule.java

+ 4 - 7
frameworks/Java/jawn/src/main/java/app/UndertowMain.java

@@ -13,15 +13,12 @@ public class UndertowMain {
         if (args.length > 0) environment = args[0];
         System.setProperty("JAWN_ENV", environment);
         
-        if (args.length > 1)  System.setProperty("DBHOST", args[1]);
-        
         ServerConfig config = new ServerConfig();
         
-        config.setContextPath("/");
-        config.setPort(8080);
-        config.setWebappPath("webapp");
-        config.setServerPerformance(PERFORMANCE_MODE.HIGHEST);
-        if (args.length > 2) config.setHost(args[2]);
+        config.setContextPath("/")
+            .setPort(8080)
+            .setWebappPath("webapp")
+            .setServerPerformance(PERFORMANCE_MODE.HIGHEST);
         
         UndertowServer server = new UndertowServer();
         server.setupAndStartServer(config);

+ 1 - 1
frameworks/Java/jawn/src/main/java/app/config/Database.java

@@ -42,7 +42,7 @@ public class Database implements ApplicationDatabaseBootstrap {
             .environment(Modes.DEV)
             .jdbc()
             .driver("com.mysql.jdbc.Driver")
-            .url("jdbc:mysql://192.168.100.11/hello_world?" + jdbcParams)
+            .url("jdbc:mysql://172.16.0.16/hello_world?" + jdbcParams)
             .user("benchmarkdbuser")
             .password("benchmarkdbpass");
     }

+ 2 - 3
frameworks/Java/jawn/src/main/java/app/config/Routing.java

@@ -3,15 +3,14 @@ package app.config;
 import net.javapla.jawn.core.spi.ApplicationRoutes;
 import net.javapla.jawn.core.spi.Routes;
 import app.controllers.DbController;
-import app.controllers.IndexController;
 
 
 public class Routing implements ApplicationRoutes {
     
     @Override
     public void router(Routes routes) {
-        routes.GET().route("/json").to(IndexController.class, "json");
-        routes.GET().route("/plaintext").to(IndexController.class, "plaintext");
+//        routes.GET().route("/json").to(IndexController.class, "json");
+//        routes.GET().route("/plaintext").to(IndexController.class, "plaintext");
         routes.GET().route("/queries").to(DbController.class, "queries");
         routes.GET().route("/updates").to(DbController.class, "updates");
     }

+ 0 - 15
frameworks/Java/jawn/src/main/java/app/controllers/IndexController.java

@@ -1,15 +0,0 @@
-package app.controllers;
-
-import net.javapla.jawn.core.Controller;
-import app.models.Message;
-
-public class IndexController extends Controller {
-
-    public void getJson() {
-        respond().json(new Message("Hello, World!"));
-    }
-    
-    public void getPlaintext() {
-        respond().text("Hello, World!");
-    }
-}

+ 12 - 0
frameworks/Java/jawn/src/main/java/app/controllers/JsonController.java

@@ -0,0 +1,12 @@
+package app.controllers;
+
+import app.models.Message;
+import net.javapla.jawn.core.Controller;
+
+public class JsonController extends Controller {
+
+    private static final String message = "Hello, World!";
+    public void index() {
+        respond().json(new Message(message));
+    }
+}

+ 12 - 0
frameworks/Java/jawn/src/main/java/app/controllers/PlaintextController.java

@@ -0,0 +1,12 @@
+package app.controllers;
+
+import net.javapla.jawn.core.Controller;
+
+public class PlaintextController extends Controller {
+
+    private static final String message = "Hello, World!";
+    private static final byte[] bytemessage = message.getBytes();
+    public void index() {
+        respond().text(bytemessage);
+    }
+}