Pārlūkot izejas kodu

update act project to act-1.8.8-rc4 (#3733)

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

* update act to 1.8.8-RC4

* update act-ebean dependency name

* update act docker files - we are using tar.gz instead of zip to package to dist package

* act-ebean2 now renamed to act-ebean, need update the configuration files

* [ci fw-only Java/act] disable ebean tests till we get it sorted out

* [ci fw-only Java/act]add back ebean tests with update act-ebean to 1.6.4-SNAPSHOT

* fix act-hibernate-pgsql-rythm dockerfile

* [ci fw-only Java/act]fix act-hibernate-pgsql-rythm dockerfile

* [ci fw-only Java/act]update to act-starter-parent-1.8.8.1
Green Luo 7 gadi atpakaļ
vecāks
revīzija
d23d90144d
23 mainītis faili ar 26 papildinājumiem un 28 dzēšanām
  1. 1 0
      frameworks/Java/act/.gitignore
  2. 1 1
      frameworks/Java/act/act-ebean-mysql-rythm.dockerfile
  3. 1 1
      frameworks/Java/act/act-ebean-mysql.dockerfile
  4. 1 1
      frameworks/Java/act/act-ebean-pgsql-rythm.dockerfile
  5. 1 1
      frameworks/Java/act/act-ebean-pgsql.dockerfile
  6. 1 1
      frameworks/Java/act/act-eclipselink-mysql-rythm.dockerfile
  7. 1 1
      frameworks/Java/act/act-eclipselink-mysql.dockerfile
  8. 1 1
      frameworks/Java/act/act-eclipselink-pgsql-rythm.dockerfile
  9. 1 1
      frameworks/Java/act/act-eclipselink-pgsql.dockerfile
  10. 1 1
      frameworks/Java/act/act-hibernate-mysql-rythm.dockerfile
  11. 1 1
      frameworks/Java/act/act-hibernate-mysql.dockerfile
  12. 1 1
      frameworks/Java/act/act-hibernate-pgsql-rythm.dockerfile
  13. 1 1
      frameworks/Java/act/act-hibernate-pgsql.dockerfile
  14. 1 1
      frameworks/Java/act/act-morphia-mongo-rythm.dockerfile
  15. 1 1
      frameworks/Java/act/act-morphia-mongo.dockerfile
  16. 1 1
      frameworks/Java/act/act.dockerfile
  17. 5 5
      frameworks/Java/act/pom.xml
  18. 0 4
      frameworks/Java/act/src/main/java/com/techempower/act/controller/HelloWorldController.java
  19. 1 1
      frameworks/Java/act/src/main/resources/conf/ebean_mysql/db.properties
  20. 1 1
      frameworks/Java/act/src/main/resources/conf/ebean_mysql_rythm/db.properties
  21. 1 1
      frameworks/Java/act/src/main/resources/conf/ebean_pgsql/db.properties
  22. 1 1
      frameworks/Java/act/src/main/resources/conf/ebean_pgsql_rythm/db.properties
  23. 1 0
      frameworks/Java/act/src/main/resources/conf/json_plaintext/routes.conf

+ 1 - 0
frameworks/Java/act/.gitignore

@@ -0,0 +1 @@
+.act.*

+ 1 - 1
frameworks/Java/act/act-ebean-mysql-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P ebean_mysql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=ebean_mysql_rythm", "-Dxio.worker_threads.max=256", "-Dmysql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-ebean-mysql.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P ebean_mysql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=ebean_mysql", "-Dxio.worker_threads.max=256", "-Dmysql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-ebean-pgsql-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P ebean_pgsql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=ebean_pgsql_rythm", "-Dxio.worker_threads.max=256", "-Dpgsql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-ebean-pgsql.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P ebean_pgsql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=ebean_pgsql", "-Dxio.worker_threads.max=256", "-Dpgsql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-eclipselink-mysql-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P eclipselink_mysql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=eclipselink_mysql_rythm", "-Dxio.worker_threads.max=256", "-Dmysql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-eclipselink-mysql.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P eclipselink_mysql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=eclipselink_mysql", "-Dxio.worker_threads.max=256", "-Dmysql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-eclipselink-pgsql-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P eclipselink_pgsql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=eclipselink_pgsql_rythm", "-Dxio.worker_threads.max=256", "-Dpgsql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-eclipselink-pgsql.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P eclipselink_pgsql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=eclipselink_pgsql", "-Dxio.worker_threads.max=256", "-Dpgsql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-hibernate-mysql-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P hibernate_mysql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=hibernate_mysql_rythm", "-Dxio.worker_threads.max=256", "-Dmysql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-hibernate-mysql.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P hibernate_mysql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=hibernate_mysql", "-Dxio.worker_threads.max=256", "-Dmysql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-hibernate-pgsql-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P hibernate_pgsql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=hibernate_pgsql_rythm", "-Dxio.worker_threads.max=256", "-Dpgsql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-hibernate-pgsql.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P hibernate_pgsql
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=hibernate_pgsql", "-Dxio.worker_threads.max=256", "-Dpgsql.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-morphia-mongo-rythm.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P mongo
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=mongo_rythm", "-Dxio.worker_threads.max=256", "-Dmongo.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act-morphia-mongo.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P mongo
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=mongo", "-Dxio.worker_threads.max=256", "-Dmongo.host=tfb-database", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

+ 1 - 1
frameworks/Java/act/act.dockerfile

@@ -4,5 +4,5 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q
 WORKDIR /act/target/dist
-RUN unzip -q *.zip
+RUN tar xzf *.tar.gz
 CMD ["java", "-server", "-Djava.security.egd=file:/dev/./urandom", "-Xms1G", "-Xmx1G", "-Xss320k", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dapp.mode=prod", "-Dapp.nodeGroup=", "-Dprofile=json_plaintext", "-Dxio.worker_threads.max=256", "-cp", "/act/target/dist/classes:/act/target/dist/lib/*", "com.techempower.act.AppEntry"]

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

@@ -22,7 +22,7 @@
   <groupId>com.techempower</groupId>
   <artifactId>actframework</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.1</version>
+  <version>1.8.8.1</version>
 
   <name>TEB ActFramework Project</name>
   <description>TEB benchmark project with ActFramework</description>
@@ -36,7 +36,7 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>act-starter-parent</artifactId>
-    <version>1.8.1.0</version>
+    <version>1.8.8.1</version>
   </parent>
 
   <properties>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.actframework</groupId>
       <artifactId>act-jpa-common</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.3</version>
     </dependency>
 
   </dependencies>
@@ -98,7 +98,7 @@
       <dependencies>
         <dependency>
           <groupId>org.actframework</groupId>
-          <artifactId>act-ebean2</artifactId>
+          <artifactId>act-ebean</artifactId>
         </dependency>
         <dependency>
           <groupId>mysql</groupId>
@@ -161,7 +161,7 @@
       <dependencies>
         <dependency>
           <groupId>org.actframework</groupId>
-          <artifactId>act-ebean2</artifactId>
+          <artifactId>act-ebean</artifactId>
         </dependency>
         <dependency>
           <groupId>org.postgresql</groupId>

+ 0 - 4
frameworks/Java/act/src/main/java/com/techempower/act/controller/HelloWorldController.java

@@ -47,10 +47,6 @@ public class HelloWorldController {
         Act.getNonblock("/json", context -> context.resp()
                 .contentType(H.Format.JSON.contentType())
                 .writeContent(JSON.toJSONString(new Message(HELLO_WORLD))));
-
-        Act.getNonblock("/plaintext", context -> context.resp()
-                .contentType(H.Format.TXT.contentType())
-                .writeContent(HELLO_WORLD));
     }
 
 }

+ 1 - 1
frameworks/Java/act/src/main/resources/conf/ebean_mysql/db.properties

@@ -2,5 +2,5 @@ mysql.host=localhost
 
 app.batch_save=false
 
-db.impl=act.db.ebean2.EbeanPlugin
+db.impl=act.db.ebean.EbeanPlugin
 db.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&useSSL=false

+ 1 - 1
frameworks/Java/act/src/main/resources/conf/ebean_mysql_rythm/db.properties

@@ -2,5 +2,5 @@ mysql.host=localhost
 
 app.batch_save=false
 
-db.impl=act.db.ebean2.EbeanPlugin
+db.impl=act.db.ebean.EbeanPlugin
 db.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&useSSL=false

+ 1 - 1
frameworks/Java/act/src/main/resources/conf/ebean_pgsql/db.properties

@@ -1,6 +1,6 @@
 pgsql.host=localhost
 
-db.impl=act.db.ebean2.EbeanPlugin
+db.impl=act.db.ebean.EbeanPlugin
 db.url=jdbc:postgresql://${pgsql.host}:5432/hello_world?loggerLevel=OFF
 db.isolationLevel=4
 app.batch.save=true

+ 1 - 1
frameworks/Java/act/src/main/resources/conf/ebean_pgsql_rythm/db.properties

@@ -2,5 +2,5 @@ pgsql.host=localhost
 
 app.batch.save=false
 
-db.impl=act.db.ebean2.EbeanPlugin
+db.impl=act.db.ebean.EbeanPlugin
 db.url=jdbc:postgresql://${pgsql.host}:5432/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&cacheRSMetadata=true

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

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