Skip to content

Commit

Permalink
Merge pull request networknt#33 from greenlaw110/master
Browse files Browse the repository at this point in the history
Update actframework/jfinal/spark/play1/ninja dependency versions
  • Loading branch information
stevehu authored Nov 14, 2017
2 parents 37c13f1 + e38d167 commit 18204f5
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 36 deletions.
42 changes: 21 additions & 21 deletions actframework/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ActFramework is a fullstack Java web application framework with rich set of feat

### ActFramework version

The application is created on ActFramework `0.4.0-SNAPSHOT`
The application is created on ActFramework `1.4.14`

## Start the application

Expand All @@ -39,29 +39,29 @@ And you should see something like this:
/ ___ \ | (__ | |_ | |_) || __/| | | || (__ | | | || | | | | || (_| || | | <
/_/ \_\ \___| \__| |____/ \___||_| |_| \___||_| |_||_| |_| |_| \__,_||_| |_|\_\
powered by ActFramework v0.4.0-7e4c
powered by ActFramework r1.4.14-0239
version: 0.0.1-SNAPSHOT
base dir: /home/luog/p/greenlaw110/microservices-framework-benchmark/actframework/target/dist
pid: 16868
version: unknown
scan pkg: benchmark
base dir: /home/luog/tmp/p/microservices-framework-benchmark/actframework/target/dist
pid: 10748
profile: prod
mode: PROD
group:
zen: Beautiful is better than ugly.
10:41:23.624 [main] INFO o.h.v.i.u.Version - HV000001: Hibernate Validator 5.1.3.Final
10:41:23.693 [main] INFO a.Act - loading application(s) ...
10:41:23.696 [main] INFO a.Act - App starting ....
10:41:23.769 [main] WARN a.c.AppConfig - Application secret key not set! You are in the dangerous zone!!!
10:41:23.805 [main] WARN a.a.DbServiceManager - DB service not initialized: No DB plugin found
10:41:23.964 [main] WARN a.m.MailerConfig - smtp host configuration not found, will use mock smtp to send email
10:41:23.965 [main] WARN a.c.AppConfig - host is not configured. Use localhost as hostname
10:41:24.067 [main] INFO a.Act - App[Act Benchmark] loaded in 371ms
10:41:24.074 [main] INFO o.xnio - XNIO version 3.3.6.Final
10:41:24.086 [main] INFO o.x.nio - XNIO NIO Implementation Version 3.3.6.Final
10:41:24.172 [main] INFO a.Act - network client hooked on port: 8080
10:41:24.173 [main] INFO a.b.a.RunApp - it takes 1394ms to start the app
zen: Errors should never pass silently
Unless explicitly silenced.
13:56:38.217 [main] INFO a.Act - loading application(s) ...
13:56:38.221 [main] INFO a.a.App - App starting ....
13:56:38.291 [main] WARN a.c.AppConfig - Application secret key not set! You are in the dangerous zone!!!
13:56:38.329 [main] WARN a.a.DbServiceManager - DB service not initialized: No DB plugin found
13:56:38.591 [main] WARN a.m.MailerConfig - smtp host configuration not found, will use mock smtp to send email
13:56:38.591 [main] WARN a.c.AppConfig - host is not configured. Use localhost as hostname
13:56:38.723 [main] INFO a.a.App - App[Act Benchmark] loaded in 502ms
13:56:38.739 [main] INFO o.xnio - XNIO version 3.3.8.Final
13:56:38.752 [main] INFO o.x.nio - XNIO NIO Implementation Version 3.3.8.Final
13:56:38.894 [main] INFO a.Act - network client hooked on port: 8080
13:56:38.895 [main] INFO a.Act - it takes 2331ms to start the app
```

## Application endpoints
Expand Down
4 changes: 2 additions & 2 deletions actframework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>microservice.benchmark</groupId>
<artifactId>act-benchmark</artifactId>
<version>1.0.0</version>
<version>1.4.0</version>

<parent>
<groupId>org.sonatype.oss</groupId>
Expand All @@ -17,7 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<act.version>1.0.2</act.version>
<act.version>1.4.14</act.version>
<app.entry>benchmark.ActBenchmark</app.entry>
</properties>

Expand Down
5 changes: 2 additions & 3 deletions actframework/src/main/java/benchmark/ActBenchmark.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package benchmark;

import act.Version;
import act.Act;
import act.app.ActionContext;
import act.boot.app.RunApp;
import act.handler.NonBlock;
import org.osgl.http.H;
import org.osgl.mvc.annotation.GetAction;
Expand Down Expand Up @@ -43,7 +42,7 @@ public static String jsonSerialization(ActionContext context) {
* The logic is defined in the `/resources/routs.conf` file
*/
public static void main(String[] args) throws Exception {
RunApp.start("Act Benchmark", Version.appVersion(), ActBenchmark.class);
Act.start("Act Benchmark");
}

}
4 changes: 2 additions & 2 deletions jfinal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>com.jfinal</groupId>
<artifactId>jfinal</artifactId>
<version>3.0</version>
<version>3.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>com.jfinal</groupId>
<artifactId>cos</artifactId>
<version>26Dec2008</version>
<version>2017.5</version>
</dependency>

</dependencies>
Expand Down
16 changes: 12 additions & 4 deletions ninjaframework/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<dependency>
<groupId>org.ninjaframework</groupId>
<artifactId>ninja-test-utilities</artifactId>
<version>6.0.0-beta1</version>
<version>6.2.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -151,9 +151,17 @@
<groupId>org.mockito</groupId>
</exclusion>
<exclusion>
<artifactId>fluentlenium-core</artifactId>
<artifactId>fluentlenium-junit</artifactId>
<groupId>org.fluentlenium</groupId>
</exclusion>
<exclusion>
<artifactId>htmlunit-driver</artifactId>
<groupId>org.seleniumhq.selenium</groupId>
</exclusion>
<exclusion>
<artifactId>jetty-client</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion>
<exclusion>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -174,8 +182,8 @@
</dependency>
</dependencies>
<properties>
<ninja.version>6.0.0-beta1</ninja.version>
<jetty.version>9.3.11.v20160721</jetty.version>
<ninja.version>6.2.0</ninja.version>
<jetty.version>9.4.7.v20170914</jetty.version>
</properties>
</project>

4 changes: 2 additions & 2 deletions ninjaframework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<url>http://www.ninjaframework.org</url>

<properties>
<ninja.version>6.0.0-beta1</ninja.version>
<jetty.version>9.3.11.v20160721</jetty.version>
<ninja.version>6.2.0</ninja.version>
<jetty.version>9.4.7.v20170914</jetty.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion play1/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Running

Download play-1.4.x from https://downloads.typesafe.com/play/1.4.4/play-1.4.4.zip
Download play-1.5.0 from https://downloads.typesafe.com/play/1.5.0/play-1.5.0.zip

Unzip the package and add the dir into `$PATH` environment variable

Expand Down
28 changes: 28 additions & 0 deletions spark/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# [SparkJava](http://sparkjava.com) Test Bed

## Listening port

The test application is listening on port `8080`

### SparkJava version

The application is created on SparkJava `2.7.0`

## Start the application

```
mvn clean package
java -jar target/spark-0.0.1-SNAPSHOT.jar
```

## Application endpoints

### Default: `/`

It shall respond with `Hello World!` response with `content-type` set to `text/plain`

#### Benchmark command:

```
wrk -t4 -c128 -d15s http://localhost:8080 -s pipeline.lua --latency -- / 16
```
2 changes: 1 addition & 1 deletion spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
<version>2.5.2</version>
<version>2.7.0</version>
</dependency>
</dependencies>

Expand Down
1 change: 1 addition & 0 deletions spark/src/main/java/Example.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

public class Example {
public static void main(String[] args) {
port(8080);
get("/", (req, res) -> "Hello World!");
}
}

0 comments on commit 18204f5

Please sign in to comment.