#9145 fix ee8,ee9 and core stats modules

Signed-off-by: Ludovic Orban <[email protected]>

jetty-core/jetty-server/src/main/config/modules/stats.mod

@@ -8,17 +8,10 @@ server
 
 [depend]
 server
-servlet
-
-[lib]
-lib/jetty-util-ajax-${jetty.version}.jar
 
 [xml]
 etc/jetty-stats.xml
 
-[ini]
-jetty.webapp.addServerClasses+=,-org.eclipse.jetty.ee9.servlet.StatisticsServlet
-
 [ini-template]
 
 ## If the Graceful shutdown should wait for async requests as well as the currently dispatched ones.

jetty-ee8/jetty-ee8-nested/src/main/config/etc/ee8-jetty-stats.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+
+<!-- =============================================================== -->
+<!-- Mixin the Statistics Handler                                    -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Call name="insertHandler">
+    <Arg>
+      <New id="StatsHandler" class="org.eclipse.jetty.ee8.nested.StatisticsHandler">
+        <Set name="gracefulShutdownWaitsForRequests"><Property name="jetty.statistics.gracefulShutdownWaitsForRequests" default="true"/></Set>
+      </New>
+    </Arg>
+  </Call>
+  <Call name="addBeanToAllConnectors">
+    <Arg>
+      <New class="org.eclipse.jetty.io.ConnectionStatistics"/>
+    </Arg>
+  </Call>
+</Configure>

jetty-ee8/jetty-ee8-nested/src/main/config/modules/ee8-stats.mod

@@ -0,0 +1,25 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enables detailed statistics collection for the server.
+
+[environment]
+ee8
+
+[depend]
+server
+ee8-servlet
+
+[lib]
+lib/jetty-util-ajax-${jetty.version}.jar
+
+[xml]
+etc/ee8-jetty-stats.xml
+
+[ini]
+jetty.webapp.addServerClasses+=,-org.eclipse.jetty.ee8.servlet.StatisticsServlet
+
+[ini-template]
+
+## If the Graceful shutdown should wait for async requests as well as the currently dispatched ones.
+# jetty.statistics.gracefulShutdownWaitsForRequests=true

jetty-ee9/jetty-ee9-nested/src/main/config/etc/ee9-jetty-stats.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+
+<!-- =============================================================== -->
+<!-- Mixin the Statistics Handler                                    -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Call name="insertHandler">
+    <Arg>
+      <New id="StatsHandler" class="org.eclipse.jetty.ee9.nested.StatisticsHandler">
+        <Set name="gracefulShutdownWaitsForRequests"><Property name="jetty.statistics.gracefulShutdownWaitsForRequests" default="true"/></Set>
+      </New>
+    </Arg>
+  </Call>
+  <Call name="addBeanToAllConnectors">
+    <Arg>
+      <New class="org.eclipse.jetty.io.ConnectionStatistics"/>
+    </Arg>
+  </Call>
+</Configure>

jetty-ee9/jetty-ee9-nested/src/main/config/modules/ee9-stats.mod

@@ -0,0 +1,25 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enables detailed statistics collection for the server.
+
+[environment]
+ee9
+
+[depend]
+server
+ee9-servlet
+
+[lib]
+lib/jetty-util-ajax-${jetty.version}.jar
+
+[xml]
+etc/ee9-jetty-stats.xml
+
+[ini]
+jetty.webapp.addServerClasses+=,-org.eclipse.jetty.ee9.servlet.StatisticsServlet
+
+[ini-template]
+
+## If the Graceful shutdown should wait for async requests as well as the currently dispatched ones.
+# jetty.statistics.gracefulShutdownWaitsForRequests=true