Browse Source

Move Java/grizzly-jersey variant under Java/grizzly (#4534)

* Move Java/grizzly-jersey variant under Java/grizzly

* fix hug dockerfile name
Nate 6 years ago
parent
commit
827c69cd38
21 changed files with 25 additions and 31 deletions
  1. 0 1
      .travis.yml
  2. 0 27
      frameworks/Java/grizzly-jersey/benchmark_config.json
  3. 22 0
      frameworks/Java/grizzly/benchmark_config.json
  4. 2 2
      frameworks/Java/grizzly/grizzly-jersey.dockerfile
  5. 0 0
      frameworks/Java/grizzly/pom-jersey.xml
  6. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/Common.java
  7. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/DbResource.java
  8. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/FortunesResource.java
  9. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/JerseyWebServer.java
  10. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/JsonMessageBodyWriter.java
  11. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/JsonResource.java
  12. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/MustacheViewProcessor.java
  13. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/PlaintextResource.java
  14. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/ServerHeaderFilter.java
  15. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/SessionFactoryProvider.java
  16. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/domain/Fortune.java
  17. 0 0
      frameworks/Java/grizzly/src-jersey/main/java/hello/domain/World.java
  18. 0 0
      frameworks/Java/grizzly/src-jersey/main/resources/fortunes.mustache
  19. 0 0
      frameworks/Java/grizzly/src-jersey/main/resources/hibernate.cfg.xml
  20. 1 1
      frameworks/Python/hug/benchmark_config.json
  21. 0 0
      frameworks/Python/hug/hug.dockerfile

+ 0 - 1
.travis.yml

@@ -52,7 +52,6 @@ env:
     - "TESTDIR=Java/gemini"
     - "TESTDIR=Java/gemini"
     - "TESTDIR=Java/greenlightning"
     - "TESTDIR=Java/greenlightning"
     - "TESTDIR=Java/grizzly"
     - "TESTDIR=Java/grizzly"
-    - "TESTDIR=Java/grizzly-jersey"
     - "TESTDIR=Java/helidon"
     - "TESTDIR=Java/helidon"
     - "TESTDIR=Java/httpserver"
     - "TESTDIR=Java/httpserver"
     - "TESTDIR=Java/jawn"
     - "TESTDIR=Java/jawn"

+ 0 - 27
frameworks/Java/grizzly-jersey/benchmark_config.json

@@ -1,27 +0,0 @@
-{
-  "framework": "grizzly-jersey",
-  "tests": [{
-    "default": {
-      "json_url": "/json",
-      "db_url": "/db?single=true",
-      "query_url": "/db?queries=",
-      "fortune_url": "/fortunes",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "Grizzly",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Full",
-      "platform": "JAX-RS",
-      "webserver": "Grizzly",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "grizzly",
-      "notes": "",
-      "versus": ""
-    }
-  }]
-}

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

@@ -19,6 +19,28 @@
       "display_name": "grizzly",
       "display_name": "grizzly",
       "notes": "",
       "notes": "",
       "versus": ""
       "versus": ""
+    },
+    "jersey": {
+      "json_url": "/json",
+      "db_url": "/db?single=true",
+      "query_url": "/db?queries=",
+      "fortune_url": "/fortunes",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "Grizzly",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Full",
+      "platform": "JAX-RS",
+      "webserver": "Grizzly",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "grizzly",
+      "notes": "",
+      "versus": ""
     }
     }
   }]
   }]
 }
 }

+ 2 - 2
frameworks/Java/grizzly-jersey/grizzly-jersey.dockerfile → frameworks/Java/grizzly/grizzly-jersey.dockerfile

@@ -1,7 +1,7 @@
 FROM maven:3.5.3-jdk-10-slim as maven
 FROM maven:3.5.3-jdk-10-slim as maven
 WORKDIR /grizzly-jersey
 WORKDIR /grizzly-jersey
-COPY pom.xml pom.xml
-COPY src src
+COPY pom-jersey.xml pom.xml
+COPY src-jersey src
 RUN mvn package -q
 RUN mvn package -q
 
 
 FROM openjdk:10-jre-slim
 FROM openjdk:10-jre-slim

+ 0 - 0
frameworks/Java/grizzly-jersey/pom.xml → frameworks/Java/grizzly/pom-jersey.xml


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/Common.java → frameworks/Java/grizzly/src-jersey/main/java/hello/Common.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/DbResource.java → frameworks/Java/grizzly/src-jersey/main/java/hello/DbResource.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/FortunesResource.java → frameworks/Java/grizzly/src-jersey/main/java/hello/FortunesResource.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/JerseyWebServer.java → frameworks/Java/grizzly/src-jersey/main/java/hello/JerseyWebServer.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/JsonMessageBodyWriter.java → frameworks/Java/grizzly/src-jersey/main/java/hello/JsonMessageBodyWriter.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/JsonResource.java → frameworks/Java/grizzly/src-jersey/main/java/hello/JsonResource.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/MustacheViewProcessor.java → frameworks/Java/grizzly/src-jersey/main/java/hello/MustacheViewProcessor.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/PlaintextResource.java → frameworks/Java/grizzly/src-jersey/main/java/hello/PlaintextResource.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/ServerHeaderFilter.java → frameworks/Java/grizzly/src-jersey/main/java/hello/ServerHeaderFilter.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/SessionFactoryProvider.java → frameworks/Java/grizzly/src-jersey/main/java/hello/SessionFactoryProvider.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/domain/Fortune.java → frameworks/Java/grizzly/src-jersey/main/java/hello/domain/Fortune.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/java/hello/domain/World.java → frameworks/Java/grizzly/src-jersey/main/java/hello/domain/World.java


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/resources/fortunes.mustache → frameworks/Java/grizzly/src-jersey/main/resources/fortunes.mustache


+ 0 - 0
frameworks/Java/grizzly-jersey/src/main/resources/hibernate.cfg.xml → frameworks/Java/grizzly/src-jersey/main/resources/hibernate.cfg.xml


+ 1 - 1
frameworks/Python/hug/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "hug",
   "framework": "hug",
   "tests": [
   "tests": [
     {
     {
-      "uwsgi": {
+      "default": {
         "plaintext_url": "/plaintext",
         "plaintext_url": "/plaintext",
         "port": 8080,
         "port": 8080,
         "approach": "Realistic",
         "approach": "Realistic",

+ 0 - 0
frameworks/Python/hug/hug-uwsgi.dockerfile → frameworks/Python/hug/hug.dockerfile