jooby: rename jooby2 folder (#5314)

- with jooby-1.x out, renaming the folder to just jooby
- make undertow the default test

.travis.yml

@@ -60,7 +60,7 @@ env:
     - "TESTDIR=Java/javalin"
     - "TESTDIR=Java/jetty"
     - "TESTDIR=Java/jlhttp"
-    - "TESTDIR=Java/jooby2"
+    - "TESTDIR=Java/jooby"
     - "TESTDIR=Java/light-java"
     - "TESTDIR=Java/micronaut"
     - "TESTDIR=Java/minijax"

frameworks/Java/jooby2/benchmark_config.json → frameworks/Java/jooby/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "jooby2",
+  "framework": "jooby",
   "tests": [{
     "default": {
       "json_url": "/json",
@@ -11,20 +11,20 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "framework": "jooby 2.x",
+      "framework": "Jooby.x",
       "language": "Java",
       "flavor": "None",
-      "platform": "Netty",
+      "platform": "Undertow",
       "database": "Postgres",
       "database_os": "Linux",
       "orm": "Raw",
       "webserver": "None",
       "os": "Linux",
-      "notes": "Jooby 2 using Netty",
-      "display_name": "jooby2-netty",
-      "versus": "netty"
+      "notes": "Jooby using Undertow",
+      "display_name": "jooby-undertow",
+      "versus": "undertow"
     },
-    "mvc": {
+    "netty": {
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "db_url": "/db",
@@ -34,20 +34,20 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "framework": "jooby 2.x",
+      "framework": "Jooby.x",
       "language": "Java",
       "flavor": "None",
-      "platform": "Undertow",
+      "platform": "Netty",
       "database": "Postgres",
       "database_os": "Linux",
       "orm": "Raw",
       "webserver": "None",
       "os": "Linux",
-      "notes": "Jooby 2 MVC using Undertow",
-      "display_name": "jooby2-mvc",
-      "versus": "undertow"
+      "notes": "Jooby using Netty",
+      "display_name": "jooby-netty",
+      "versus": "netty"
     },
-    "undertow": {
+    "mvc": {
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "db_url": "/db",
@@ -57,7 +57,7 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "framework": "jooby 2.x",
+      "framework": "Jooby.x",
       "language": "Java",
       "flavor": "None",
       "platform": "Undertow",
@@ -66,8 +66,8 @@
       "orm": "Raw",
       "webserver": "None",
       "os": "Linux",
-      "notes": "Jooby 2 using Undertow",
-      "display_name": "jooby2-undertow",
+      "notes": "Jooby MVC using Undertow",
+      "display_name": "jooby-mvc",
       "versus": "undertow"
     },
     "jetty": {
@@ -80,7 +80,7 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "framework": "jooby 2.x",
+      "framework": "Jooby.x",
       "language": "Java",
       "flavor": "None",
       "platform": "Jetty",
@@ -89,8 +89,8 @@
       "orm": "Raw",
       "webserver": "None",
       "os": "Linux",
-      "notes": "Jooby 2 using Jetty",
-      "display_name": "jooby2-jetty",
+      "notes": "Jooby using Jetty",
+      "display_name": "jooby-jetty",
       "versus": "jetty"
     },
     "pgclient": {
@@ -101,7 +101,7 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "framework": "jooby 2.x",
+      "framework": "Jooby.x",
       "language": "Java",
       "flavor": "None",
       "platform": "Undertow",
@@ -110,8 +110,8 @@
       "orm": "Raw",
       "webserver": "None",
       "os": "Linux",
-      "notes": "Jooby 2 with Reactive PG client",
-      "display_name": "jooby2-pgclient",
+      "notes": "Jooby with Reactive PG client",
+      "display_name": "jooby-pgclient",
       "versus": "undertow"
     }
   }]

frameworks/Java/jooby2/jooby2-jetty.dockerfile → frameworks/Java/jooby/jooby-jetty.dockerfile

@@ -1,12 +1,12 @@
 FROM maven:3.6.1-jdk-11-slim as maven
-WORKDIR /jooby2
+WORKDIR /jooby
 COPY pom.xml pom.xml
 COPY src src
 COPY public public
 RUN mvn package -q -P jetty
 
 FROM openjdk:11.0.3-jdk-slim
-WORKDIR /jooby2
-COPY --from=maven /jooby2/target/jooby-2x.jar app.jar
+WORKDIR /jooby
+COPY --from=maven /jooby/target/jooby.jar app.jar
 COPY conf conf
 CMD ["java", "-server", "-Xms4g", "-Xmx4g", "-XX:+AggressiveOpts", "-XX:-UseBiasedLocking", "-XX:+UseStringDeduplication", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Java/jooby2/jooby2-mvc.dockerfile → frameworks/Java/jooby/jooby-mvc.dockerfile

@@ -1,12 +1,12 @@
 FROM maven:3.6.1-jdk-11-slim as maven
-WORKDIR /jooby2
+WORKDIR /jooby
 COPY pom.xml pom.xml
 COPY src src
 COPY public public
 RUN mvn package -q -P undertow
 
 FROM openjdk:11.0.3-jdk-slim
-WORKDIR /jooby2
-COPY --from=maven /jooby2/target/jooby-2x.jar app.jar
+WORKDIR /jooby
+COPY --from=maven /jooby/target/jooby.jar app.jar
 COPY conf conf
 CMD ["java", "-server", "-Xms4g", "-Xmx4g", "-XX:+AggressiveOpts", "-XX:-UseBiasedLocking", "-XX:+UseStringDeduplication", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-cp", "app.jar", "com.techempower.MvcApp"]

frameworks/Java/jooby2/jooby2.dockerfile → frameworks/Java/jooby/jooby-netty.dockerfile

@@ -1,12 +1,12 @@
 FROM maven:3.6.1-jdk-11-slim as maven
-WORKDIR /jooby2
+WORKDIR /jooby
 COPY pom.xml pom.xml
 COPY src src
 COPY public public
 RUN mvn package -q -P netty
 
 FROM openjdk:11.0.3-jdk-slim
-WORKDIR /jooby2
-COPY --from=maven /jooby2/target/jooby-2x.jar app.jar
+WORKDIR /jooby
+COPY --from=maven /jooby/target/jooby.jar app.jar
 COPY conf conf
 CMD ["java", "-server", "-Xms4g", "-Xmx4g", "-XX:+AggressiveOpts", "-XX:-UseBiasedLocking", "-XX:+UseStringDeduplication", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Java/jooby2/jooby2-pgclient.dockerfile → frameworks/Java/jooby/jooby-pgclient.dockerfile

@@ -1,12 +1,12 @@
 FROM maven:3.6.1-jdk-11-slim as maven
-WORKDIR /jooby2
+WORKDIR /jooby
 COPY pom.xml pom.xml
 COPY src src
 COPY public public
 RUN mvn package -q -P netty
 
 FROM openjdk:11.0.3-jdk-slim
-WORKDIR /jooby2
-COPY --from=maven /jooby2/target/jooby-2x.jar app.jar
+WORKDIR /jooby
+COPY --from=maven /jooby/target/jooby.jar app.jar
 COPY conf conf
 CMD ["java", "-server", "-Xms4g", "-Xmx4g", "-XX:+AggressiveOpts", "-XX:-UseBiasedLocking", "-XX:+UseStringDeduplication", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-cp", "app.jar", "com.techempower.ReactivePg"]

frameworks/Java/jooby2/jooby2-undertow.dockerfile → frameworks/Java/jooby/jooby.dockerfile

@@ -1,12 +1,12 @@
 FROM maven:3.6.1-jdk-11-slim as maven
-WORKDIR /jooby2
+WORKDIR /jooby
 COPY pom.xml pom.xml
 COPY src src
 COPY public public
 RUN mvn package -q -P undertow
 
 FROM openjdk:11.0.3-jdk-slim
-WORKDIR /jooby2
-COPY --from=maven /jooby2/target/jooby-2x.jar app.jar
+WORKDIR /jooby
+COPY --from=maven /jooby/target/jooby.jar app.jar
 COPY conf conf
 CMD ["java", "-server", "-Xms4g", "-Xmx4g", "-XX:+AggressiveOpts", "-XX:-UseBiasedLocking", "-XX:+UseStringDeduplication", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Java/jooby2/pom.xml → frameworks/Java/jooby/pom.xml

@@ -10,7 +10,7 @@
     <version>2.3.0</version>
   </parent>
 
-  <artifactId>jooby2</artifactId>
+  <artifactId>jooby</artifactId>
   <groupId>com.techempower</groupId>
   <version>2.0</version>
 
@@ -75,7 +75,7 @@
   </dependencies>
 
   <build>
-    <finalName>jooby-2x</finalName>
+    <finalName>jooby</finalName>
     <plugins>
       <plugin>
         <groupId>com.fizzed</groupId>