Browse Source

Hexagon: Minimize template to improve 'fortunes' test performance (#7277)

* Fix error with URLs in JEE servers

* Clean up

* Avoid classpath URLs

* Fix template loading error

* Fix template loading error

* Chores

* Fix template loading error

* Delete MongoDB DB support

Storage support in Hexagon will be moved outside the Toolkit, and so, it will be left outside the benchmark.

* Fix runtime problem

* Update Hexagon version

* Make Jackson Blackbird module optional

* Add variation with Blackbird module enabled

* Upgrade Hexagon version

* Enable blackbird Jackson module by default

* Update dependencies

* Use Hexagon version 2.0.0-B1 (and a little cleanup)

* Use Hexagon version 2.0.0-B1 (and a little cleanup)

* Use Tomcat instead Resin to test JEE integration

* Remove unused environment variable

* Clean Tomcat dockerfile

* Minor improvements

* Minor improvements

* Update to release version

* Update to the latest Hexagon release

* Add Netty adapter test

* Remove Gradle Wrapper

* Update version

* Update version

* Minimize template

* Skip Hexagon checks in the container
Juanjo Aguililla 3 years ago
parent
commit
1a545e1305

+ 10 - 0
frameworks/Kotlin/hexagon/build.gradle

@@ -44,3 +44,13 @@ dependencies {
     // providedCompile excludes the dependency only in the WAR, not in the distribution
     providedCompile("org.eclipse.jetty:jetty-webapp:$jettyVersion") { exclude module: "slf4j-api" }
 }
+
+task("minimizeTemplate") {
+    doLast {
+        File template = file("$buildDir/resources/main/fortunes.pebble.html")
+        List<String> lines = template.readLines().collect { it.trim() }
+        template.write(lines.join(""))
+    }
+}
+
+assemble.dependsOn("minimizeTemplate")

+ 1 - 0
frameworks/Kotlin/hexagon/hexagon-netty.dockerfile

@@ -17,6 +17,7 @@ ENV DBSTORE postgresql
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV WEBENGINE netty
 ENV PROJECT hexagon
+ENV DISABLE_CHECKS true
 
 COPY --from=gradle_build /hexagon/build/install/$PROJECT /opt/$PROJECT
 

+ 1 - 0
frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile

@@ -15,6 +15,7 @@ RUN gradle --quiet
 FROM tomcat:10.0.14-jre17-temurin
 ENV DBSTORE postgresql
 ENV POSTGRESQL_DB_HOST tfb-database
+ENV DISABLE_CHECKS true
 
 COPY --from=gradle_build /hexagon/build/libs/ROOT.war /usr/local/tomcat/webapps/ROOT.war
 EXPOSE 8080

+ 1 - 0
frameworks/Kotlin/hexagon/hexagon.dockerfile

@@ -17,6 +17,7 @@ ENV DBSTORE postgresql
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV WEBENGINE jetty
 ENV PROJECT hexagon
+ENV DISABLE_CHECKS true
 
 COPY --from=gradle_build /hexagon/build/install/$PROJECT /opt/$PROJECT