Browse Source

new version demands moving folders around

MTD 10 years ago
parent
commit
792beac722

+ 1 - 4
frameworks/Java/jawn/README.md

@@ -13,10 +13,7 @@ Or use the included wrapper:
 ```
 ./gradlew run
 ```
-Point your browser at `localhost:8081/json`
-
-The framework use an embedded server, that runs on port `8081` in order to
-not interfere with potentially running webcontainers.
+Point your browser at `localhost:8080/json`
 
 ### A couple of commands to get going with the benchmark framework
 

+ 1 - 1
frameworks/Java/jawn/build.gradle

@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
 	// Framework
-	compile 'net.javapla.jawn:jawn-server-undertow:0.8.9-b01'
+	compile 'net.javapla.jawn:jawn-server-undertow:0.8.9-b02'
 	//compile project(':jawn-server'), project(':jawn-server-undertow'), project(':jawn-server-jetty')
 
 	

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

@@ -30,7 +30,7 @@ public class Database implements ApplicationDatabaseBootstrap {
         
         
         connections
-            .environment(Modes.prod)
+            .environment(Modes.PROD)
             .jdbc()
             .driver("com.mysql.jdbc.Driver")
             .url(dbUrl + jdbcParams)
@@ -40,7 +40,7 @@ public class Database implements ApplicationDatabaseBootstrap {
             .minPoolSize(256);
         
         connections
-            .environment(Modes.dev)
+            .environment(Modes.DEV)
             .jdbc()
             .driver("com.mysql.jdbc.Driver")
             .url("jdbc:mysql://192.168.100.11/hello_world?" + jdbcParams)

+ 5 - 5
frameworks/Java/jawn/src/main/java/app/controllers/DbController.java

@@ -2,14 +2,14 @@ package app.controllers;
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import com.google.inject.Inject;
-
+import net.javapla.jawn.core.Controller;
+import net.javapla.jawn.core.Param;
 import app.db.DbManager;
 import app.models.World;
-import net.javapla.jawn.core.ApplicationController;
-import net.javapla.jawn.core.Param;
 
-public class DbController extends ApplicationController {
+import com.google.inject.Inject;
+
+public class DbController extends Controller {
 
     private static final int NUMBER_OF_ROWS = 10_000;
     

+ 2 - 2
frameworks/Java/jawn/src/main/java/app/controllers/FortunesController.java

@@ -3,13 +3,13 @@ package app.controllers;
 import java.util.Collections;
 import java.util.List;
 
-import net.javapla.jawn.core.ApplicationController;
+import net.javapla.jawn.core.Controller;
 import app.db.DbManager;
 import app.models.Fortune;
 
 import com.google.inject.Inject;
 
-public class FortunesController extends ApplicationController {
+public class FortunesController extends Controller {
 
     @Inject
     private DbManager db;

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

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

+ 0 - 0
frameworks/Java/jawn/webapp/WEB-INF/views/fortunes/index.st → frameworks/Java/jawn/webapp/views/fortunes/index.st


+ 0 - 0
frameworks/Java/jawn/webapp/WEB-INF/views/index.html.st → frameworks/Java/jawn/webapp/views/index.html.st