Merge grizzly and grizzly-jersey projects (#3329)

* Move grizzly-jersey to subfolder in grizzly project

* Update .travis.yml

.travis.yml

@@ -86,7 +86,6 @@ env:
     - "TESTDIR=Java/dropwizard"
     - "TESTDIR=Java/gemini"
     - "TESTDIR=Java/grizzly-bm"
-    - "TESTDIR=Java/grizzly-jersey"
     - "TESTDIR=Java/jawn"
     - "TESTDIR=Java/jetty"
     - "TESTDIR=Java/jlhttp"

frameworks/Java/grizzly-bm/README.md

@@ -1,6 +1,6 @@
 # Grizzly Benchmarking Test
 
-This is the Grizzly portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
+This is the Grizzly portion of a [benchmarking test suite](../) comparing a variety of web development platforms. There is a subfolder `grizzly-jersey` where the combination of these two projects is used.
 
 ### Plain text serialization test
 * [Plain text test resource](src/main/java/org/glassfish/grizzly/bm/PlainTextHttpHandler.java)

frameworks/Java/grizzly-bm/benchmark_config.json

@@ -14,10 +14,33 @@
       "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
-      "webserver": "None",
+      "webserver": "Grizzly",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "Grizzly",
+      "display_name": "grizzly",
+      "notes": "",
+      "versus": ""
+    },
+    "jersey": {
+      "setup_file": "setup-grizzly-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": ""
     }

frameworks/Java/grizzly-jersey/pom.xml → frameworks/Java/grizzly-bm/grizzly-jersey/pom.xml

@@ -14,6 +14,7 @@
   </prerequisites>
 
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <activation.version>1.1.1</activation.version>

frameworks/Java/grizzly-jersey/setup.sh → frameworks/Java/grizzly-bm/setup-grizzly-jersey.sh

@@ -2,6 +2,6 @@
 
 fw_depends mysql java maven
 
+cd grizzly-jersey
 mvn clean package
-
 java -jar target/grizzly-jersey-example.jar -dbhost ${DBHOST} &

frameworks/Java/grizzly-jersey/benchmark_config.json

@@ -1,28 +0,0 @@
-{
-  "framework": "grizzly-jersey",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "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": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "Grizzly",
-      "notes": "",
-      "versus": ""
-    }
-  }]
-}