update to act-1.1.1, act-ebean2-1.0.3 (#2688)

frameworks/Java/act/pom.xml

@@ -7,18 +7,18 @@
 
     <groupId>com.techempower</groupId>
     <artifactId>actframework</artifactId>
-    <version>1.0.4</version>
+    <version>1.1.0</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.0.7</act.version>
-        <act-morphia.version>1.0.3</act-morphia.version>
-        <act-ebean.version>1.1.0</act-ebean.version>
-        <mysql.version>6.0.6</mysql.version>
-        <postgres-jdbc.version>42.0.0</postgres-jdbc.version>
+        <act.version>1.1.1</act.version>
+        <act-morphia.version>1.1.0</act-morphia.version>
+        <act-ebean2.version>1.0.3</act-ebean2.version>
+        <mysql.version>5.1.41</mysql.version>
+        <postgres-jdbc.version>9.4.1212</postgres-jdbc.version>
         <HikariCP.version>2.6.1</HikariCP.version>
         <app.entry>com.techempower.act.AppEntry</app.entry>
     </properties>
@@ -41,8 +41,8 @@
         </dependency>
         <dependency>
             <groupId>org.actframework</groupId>
-            <artifactId>act-ebean</artifactId>
-            <version>${act-ebean.version}</version>
+            <artifactId>act-ebean2</artifactId>
+            <version>${act-ebean2.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

frameworks/Java/act/src/main/java/com/techempower/act/controller/WorldControllerBase.java

@@ -3,8 +3,8 @@ package com.techempower.act.controller;
 import act.app.conf.AutoConfig;
 import act.controller.Controller;
 import act.db.Dao;
-import com.avaje.ebean.annotation.Transactional;
 import com.techempower.act.domain.IWorld;
+import io.ebean.annotation.Transactional;
 import org.osgl.$;
 import org.osgl.mvc.annotation.GetAction;
 import org.osgl.mvc.result.Result;

frameworks/Java/act/src/main/java/com/techempower/act/mysql/controller/FortuneController.java

@@ -8,7 +8,7 @@ import javax.inject.Singleton;
 
 @Controller("mysql")
 @Singleton
-public class FortuneController extends com.techempower.act.controller.FortuneControllerBase<Fortune,act.db.ebean.EbeanQuery<Fortune>,Fortune.Dao> {
+public class FortuneController extends com.techempower.act.controller.FortuneControllerBase<Fortune,act.db.ebean2.EbeanQuery<Fortune>,Fortune.Dao> {
     @Inject
     public FortuneController(Fortune.Dao worldDao) {
         super(worldDao);

frameworks/Java/act/src/main/java/com/techempower/act/mysql/domain/Fortune.java

@@ -2,7 +2,7 @@ package com.techempower.act.mysql.domain;
 
 
 import act.db.DB;
-import act.db.ebean.EbeanDao;
+import act.db.ebean2.EbeanDao;
 
 import javax.persistence.Entity;
 

frameworks/Java/act/src/main/java/com/techempower/act/mysql/domain/World.java

@@ -2,7 +2,7 @@ package com.techempower.act.mysql.domain;
 
 
 import act.db.DB;
-import act.db.ebean.EbeanDao;
+import act.db.ebean2.EbeanDao;
 
 import javax.persistence.Entity;
 

frameworks/Java/act/src/main/java/com/techempower/act/pgsql/controller/FortuneController.java

@@ -8,7 +8,7 @@ import javax.inject.Singleton;
 
 @Controller("pgsql")
 @Singleton
-public class FortuneController extends com.techempower.act.controller.FortuneControllerBase<Fortune,act.db.ebean.EbeanQuery<Fortune>,Fortune.Dao> {
+public class FortuneController extends com.techempower.act.controller.FortuneControllerBase<Fortune,act.db.ebean2.EbeanQuery<Fortune>,Fortune.Dao> {
     @Inject
     public FortuneController(Fortune.Dao worldDao) {
         super(worldDao);

frameworks/Java/act/src/main/java/com/techempower/act/pgsql/domain/Fortune.java

@@ -2,7 +2,7 @@ package com.techempower.act.pgsql.domain;
 
 
 import act.db.DB;
-import act.db.ebean.EbeanDao;
+import act.db.ebean2.EbeanDao;
 
 import javax.persistence.Entity;
 

frameworks/Java/act/src/main/java/com/techempower/act/pgsql/domain/World.java

@@ -2,7 +2,7 @@ package com.techempower.act.pgsql.domain;
 
 
 import act.db.DB;
-import act.db.ebean.EbeanDao;
+import act.db.ebean2.EbeanDao;
 
 import javax.persistence.Entity;
 

frameworks/Java/act/src/main/java/com/techempower/act/sql/controller/SqlWorldControllerBase.java

@@ -1,10 +1,10 @@
 package com.techempower.act.sql.controller;
 
-import act.db.ebean.EbeanDao;
-import act.db.ebean.EbeanQuery;
-import com.avaje.ebean.Transaction;
+import act.db.ebean2.EbeanDao;
+import act.db.ebean2.EbeanQuery;
 import com.techempower.act.controller.WorldControllerBase;
 import com.techempower.act.sql.domain.World;
+import io.ebean.Transaction;
 
 import javax.persistence.PersistenceException;
 import java.util.ArrayList;

frameworks/Java/act/src/main/resources/conf/common/db.properties

@@ -3,22 +3,24 @@ db.instances=mongo,mysql,pgsql
 mongo.host=localhost
 
 db.mongo.impl=act.db.morphia.MorphiaPlugin
-db.mongo.uri=mongodb://${mongo.host}/hello_world
+db.mongo.uri=mongodb://${mongo.host}/hello_world?maxPoolSize=256
 
 mysql.host=localhost
 
-db.mysql.impl=act.db.ebean.EbeanPlugin
+db.mysql.impl=act.db.ebean2.EbeanPlugin
 db.mysql.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC
 db.mysql.username=benchmarkdbuser
 db.mysql.password=benchmarkdbpass
 db.mysql.maxConnections=256
+db.mysql.minConnections=128
 db.mysql.useServerPrepStmts=true
 
 pgsql.host=localhost
 
-db.pgsql.impl=act.db.ebean.EbeanPlugin
+db.pgsql.impl=act.db.ebean2.EbeanPlugin
 db.pgsql.url=jdbc:postgresql://${pgsql.host}:5432/hello_world
 db.pgsql.username=benchmarkdbuser
 db.pgsql.password=benchmarkdbpass
-db.pgsql.namingconvention=com.avaje.ebean.config.MatchingNamingConvention
 db.pgsql.maxConnections=256
+db.pgsql.minConnections=128
+db.pgsql.useServerPrepStmts=true

frameworks/Java/act/src/main/resources/logback.xml

@@ -11,7 +11,7 @@
         </encoder>
     </appender>
 
-    <logger name="act" level="INFO" additivity="false">
+    <logger name="act" level="OFF" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>