Browse Source

Merge branch 'act-ci' into actframework

Gelin Luo 8 years ago
parent
commit
d26ae89224

+ 1 - 1
frameworks/Java/act/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-mvn clean package
+mvn -U clean package
 cd target/dist
 cd target/dist
 unzip *.zip
 unzip *.zip
 ./start
 ./start

+ 1 - 1
frameworks/Java/act/setup.sh

@@ -2,7 +2,7 @@
 
 
 fw_depends mysql postgresql mongodb java maven
 fw_depends mysql postgresql mongodb java maven
 
 
-mvn clean package
+mvn -U clean package
 cd target/dist
 cd target/dist
 unzip *.zip
 unzip *.zip
 
 

+ 3 - 8
frameworks/Java/act/src/main/java/com/techempower/act/controller/HelloController.java

@@ -5,22 +5,17 @@ import org.osgl.mvc.annotation.GetAction;
 import org.osgl.mvc.annotation.SessionFree;
 import org.osgl.mvc.annotation.SessionFree;
 
 
 import javax.inject.Singleton;
 import javax.inject.Singleton;
+import java.io.File;
 
 
 @Singleton
 @Singleton
 final class HelloController extends Controller.Util {
 final class HelloController extends Controller.Util {
 
 
     private static final String HELLO_WORLD = "Hello, World!";
     private static final String HELLO_WORLD = "Hello, World!";
 
 
-	@GetAction("/json")
+    @GetAction("/json")
     @SessionFree
     @SessionFree
     public void json() throws Exception {
     public void json() throws Exception {
-        json(new Message("Hello, World!"));
-    }
-
-    @GetAction("/plaintext")
-    @SessionFree
-    public void plaintext() {
-        text(HELLO_WORLD);
+        json(new Message(HELLO_WORLD));
     }
     }
 
 
     public static final class Message {
     public static final class Message {

+ 1 - 2
frameworks/Java/act/src/main/resources/conf/prod/app.properties

@@ -1,3 +1,2 @@
 http.port=8080
 http.port=8080
-cli.port=8081
-
+cli.port=8081

+ 1 - 0
frameworks/Java/act/src/main/resources/routes.conf

@@ -0,0 +1 @@
+GET /plaintext echo: Hello, World!