Browse Source

[ci fw-only Java/act] update to act-1.4 (#2895)

* add act-ebean-pgsql-rythm to compare rythm vs mustache template engine

* update to act-1.4

* WIP

* disable beetlsql test for now

* turn off logging
Green Luo 8 years ago
parent
commit
6b9a388b40

+ 0 - 22
frameworks/Java/act/benchmark_config.json

@@ -106,28 +106,6 @@
       "notes": "",
       "versus": "undertow"
     },
-    "beetlsql-pg": {
-      "setup_file": "setup",
-      "db_url": "/beetlsql/db",
-      "query_url": "/beetlsql/queries?queries=",
-      "fortune_url": "/beetlsql/fortunes",
-      "update_url": "/beetlsql/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "actframework",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Full",
-      "platform": "Undertow",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "act-beetlsql-pgsql",
-      "notes": "",
-      "versus": "undertow"
-    },
     "jdbc-pg": {
       "setup_file": "setup",
       "db_url": "/jdbc/db",

+ 14 - 14
frameworks/Java/act/pom.xml

@@ -7,23 +7,23 @@
 
     <groupId>com.techempower</groupId>
     <artifactId>actframework</artifactId>
-    <version>1.1.1</version>
+    <version>1.4.2</version>
     <name>ActFramework Test</name>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <act.version>1.1.2</act.version>
-        <act-morphia.version>1.1.0</act-morphia.version>
-        <act-sql-common.version>1.0.3</act-sql-common.version>
-        <act-ebean2.version>1.0.4</act-ebean2.version>
-        <mysql.version>5.1.41</mysql.version>
-        <postgres-jdbc.version>9.4.1212</postgres-jdbc.version>
+        <act.version>1.4.2</act.version>
+        <act-morphia.version>1.2.0</act-morphia.version>
+        <act-sql-common.version>1.1.1</act-sql-common.version>
+        <act-ebean2.version>1.1.2</act-ebean2.version>
+        <mysql.version>6.0.6</mysql.version>
+        <postgres-jdbc.version>42.1.1</postgres-jdbc.version>
         <HikariCP.version>2.6.1</HikariCP.version>
         <act-mustache.version>1.0.0</act-mustache.version>
-        <act-beetlsql.version>1.1.0</act-beetlsql.version>
-        <beetlsql.version>2.8.9</beetlsql.version>
+        <act-beetlsql.version>1.2.1</act-beetlsql.version>
+        <beetlsql.version>2.8.22</beetlsql.version>
         <app.entry>com.techempower.act.AppEntry</app.entry>
     </properties>
 
@@ -68,16 +68,16 @@
             <artifactId>act-mustache</artifactId>
             <version>${act-mustache.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.actframework</groupId>
-            <artifactId>act-beetlsql</artifactId>
-            <version>${act-beetlsql.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.ibeetl</groupId>
             <artifactId>beetlsql</artifactId>
             <version>${beetlsql.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.actframework</groupId>
+            <artifactId>act-beetlsql</artifactId>
+            <version>${act-beetlsql.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.actframework</groupId>
             <artifactId>act-sql-common</artifactId>

+ 2 - 2
frameworks/Java/act/src/main/resources/conf/local/db.properties

@@ -1,2 +1,2 @@
-db.mysql.maxConnections=128
-db.pgsql.maxConnections=128
+db.mysql.maxConnections=10
+db.pgsql.maxConnections=10

+ 21 - 1
frameworks/Java/act/src/main/resources/logback.xml

@@ -15,8 +15,28 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
+    <logger name="act.Act" level="OFF" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <!--<logger name="act.route" level="OFF" additivity="false">-->
+        <!--<appender-ref ref="STDOUT" />-->
+    <!--</logger>-->
+
+    <!--<logger name="act.event" level="OFF" additivity="false">-->
+        <!--<appender-ref ref="STDOUT" />-->
+    <!--</logger>-->
+
+    <!--<logger name="act.job" level="OFF" additivity="false">-->
+        <!--<appender-ref ref="STDOUT" />-->
+    <!--</logger>-->
+
+    <!--<logger name="act.db" level="OFF" additivity="false">-->
+        <!--<appender-ref ref="STDOUT" />-->
+    <!--</logger>-->
+
     <logger name="metric" level="OFF">
-        <appender-ref ref="METRIC_FILE" />
+        <appender-ref ref="STDOUT" />
     </logger>
 
     <!-- By default, the level of the root level is set to DEBUG -->