From 69a971f9e9be779f49901db900ac68297128906a Mon Sep 17 00:00:00 2001
From: Nate Chadwick <263952448+natechadwick-intsof@users.noreply.github.com>
Date: Tue, 8 Sep 2026 12:43:21 -0400
Subject: [PATCH] fix(jetty): vendor patched upstream/etc/jetty.xml to silence
 Ignored arg warning

The bundled Jetty 9.4.58.v20250814 distribution's upstream/etc/jetty.xml
emits one WARN per startup:

  WARN  [org.eclipse.jetty.xml.XmlConfiguration] Ignored arg
    <Arg name="threadpool"><Ref refid="threadPool"/></Arg>
    in file:///.../upstream/etc/jetty.xml

Root cause: org.eclipse.jetty.server.Server in 9.4.58 has a single
ThreadPool-typed constructor parameter named 'pool' (not 'threadpool'),
and the compiled bytecode does not carry the MethodParameters attribute
(verified with `javap -p -v`). Jetty's XmlConfiguration matches <Arg
name="..."> to constructor parameters by name; with no parameter name
available at runtime, the arg is logged as ignored and the Server() no-arg
constructor is used instead, creating a default QueuedThreadPool.

The line is benign in the sense that startup succeeds and the server runs
the same QueuedThreadPool it would have anyway, but the WARN is noisy and
the root cause is real (the upstream file's name does not match the
constructor's parameter name in 9.4.58+).

This change vendors a patched copy of upstream/etc/jetty.xml at
system/Tools/jetty/upstream/etc/jetty.xml, with the offending <Arg> line
replaced by a comment block explaining the why and pointing back to this
issue. The antrun copy task in modules/perc-jetty/pom.xml (phase
process-resources, third sub-task) overlays system/Tools/jetty/ onto
${assembly-directory} after the upstream Jetty distribution is unpacked, so
the vendored file wins. The pattern matches the existing
system/Tools/jetty/upstream/lib/jetty-webapp-9.4.26.v20200117.jar
vendoring for the CMS-6724 fix.

Side finding (NOT changed in this fix): because the <Arg> was being
ignored, the threadpool Jetty module's custom-configured threadPool bean
(minThreads=10, maxThreads=200, idleTimeout=60000, ...) was not actually
bound to the Server. The Server is silently using a default
QueuedThreadPool (minThreads=8, maxThreads=200). If the threadpool
module's config should take effect, the right XML change is to drop the
name attribute (<Arg><Ref refid="threadPool"/></Arg>) so XmlConfiguration
matches by position. That's a deliberate behavior change and is tracked
as a follow-up opportunity in the issue body.

Refs #206

> Co-Authored by Mavis Mavis-Code using MiniMax-M3 with agent mavis.
---
 system/Tools/jetty/upstream/etc/jetty.xml | 131 ++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 system/Tools/jetty/upstream/etc/jetty.xml

diff --git a/system/Tools/jetty/upstream/etc/jetty.xml b/system/Tools/jetty/upstream/etc/jetty.xml
new file mode 100644
index 0000000000..f3f94bce7b
--- /dev/null
+++ b/system/Tools/jetty/upstream/etc/jetty.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
+
+<!-- =============================================================== -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- https://jetty.org/documentation/current/            -->
+<!--                                                                 -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in. See start.ini file for the default         -->
+<!-- configuration files.                                            -->
+<!--                                                                 -->
+<!-- For a description of the configuration mechanism, see the       -->
+<!-- output of:                                                      -->
+<!--   java -jar start.jar -?                                        -->
+<!-- =============================================================== -->
+
+<!-- =============================================================== -->
+<!-- Configure a Jetty Server instance with an ID "Server"           -->
+<!-- Other configuration files may also configure the "Server"       -->
+<!-- ID, in which case they are adding configuration to the same     -->
+<!-- instance.  If other configuration have a different ID, they     -->
+<!-- will create and configure another instance of Jetty.            -->
+<!-- Consult the javadoc of o.e.j.server.Server for all              -->
+<!-- configuration that may be set here.                             -->
+<!-- =============================================================== -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+    <!--
+         Upstream Jetty 9.4.58 ships the line <Arg name="threadpool"><Ref
+         refid="threadPool"/></Arg> here. It is silently ignored at runtime because
+         the Server class's only ThreadPool constructor parameter is named 'pool'
+         (not 'threadpool') and the bytecode does not carry MethodParameters, so
+         XmlConfiguration cannot match the name to the constructor. This produces
+         one WARN per startup: "Ignored arg <Arg name="threadpool">...".
+
+         The line is removed here (and the file is vendored from
+         system/Tools/jetty/upstream/etc/jetty.xml via the antrun copy task in
+         modules/perc-jetty/pom.xml) so the Server falls back to its no-arg
+         constructor and a default QueuedThreadPool. The threadpool module's
+         custom-configured threadPool bean is created but not bound to the
+         Server; restoring that binding is a separate, deliberate change
+         (drop the name attribute, e.g. <Arg><Ref refid="threadPool"/></Arg>).
+
+         Tracked in issue #206.
+    -->
+
+    <Call name="addBean">
+      <Arg><Ref refid="byteBufferPool"/></Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Add shared Scheduler instance                               -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler">
+          <Arg name="name"><Property name="jetty.scheduler.name"/></Arg>
+          <Arg name="daemon" type="boolean"><Property name="jetty.scheduler.daemon" default="false" /></Arg>
+          <Arg name="threads" type="int"><Property name="jetty.scheduler.threads" default="-1" /></Arg>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Http Configuration.                                         -->
+    <!-- This is a common configuration instance used by all         -->
+    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
+    <!-- It configures the non wire protocol aspects of the HTTP     -->
+    <!-- semantic.                                                   -->
+    <!--                                                             -->
+    <!-- This configuration is only defined here and is used by      -->
+    <!-- reference from other XML files such as jetty-http.xml,      -->
+    <!-- jetty-https.xml and other configuration files which         -->
+    <!-- instantiate the connectors.                                 -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
+    <!-- for all configuration that may be set here.                 -->
+    <!-- =========================================================== -->
+    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
+      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8443" /></Set>
+      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
+      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
+      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
+      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
+      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
+      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
+      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="1024" /></Set>
+      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
+      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
+      <Set name="blockingTimeout"><Property deprecated="jetty.httpConfig.blockingTimeout" name="jetty.httpConfig.blockingTimeout.DEPRECATED" default="-1"/></Set>
+      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
+      <Set name="requestCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.requestCookieCompliance" deprecated="jetty.httpConfig.cookieCompliance" default="RFC6265"/></Arg></Call></Set>
+      <Set name="responseCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.responseCookieCompliance" default="RFC6265"/></Arg></Call></Set>
+      <Set name="multiPartFormDataCompliance"><Call class="org.eclipse.jetty.server.MultiPartFormDataCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.multiPartFormDataCompliance" default="RFC7578"/></Arg></Call></Set>
+      <Set name="relativeRedirectAllowed"><Property name="jetty.httpConfig.relativeRedirectAllowed" default="false"/></Set>
+    </New>
+
+    <!-- =========================================================== -->
+    <!-- Set the default handler structure for the Server            -->
+    <!-- A handler collection is used to pass received requests to   -->
+    <!-- both the ContextHandlerCollection, which selects the next   -->
+    <!-- handler by context path and virtual host, and the           -->
+    <!-- DefaultHandler, which handles any requests not handled by   -->
+    <!-- the context handlers.                                       -->
+    <!-- Other handlers may be added to the "Handlers" collection,   -->
+    <!-- for example the jetty-requestlog.xml file adds the          -->
+    <!-- RequestLogHandler after the default handler                 -->
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.eclipse.jetty.server.Handler">
+           <Item>
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+
+    <!-- =========================================================== -->
+    <!-- extra server options                                        -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
+    <Set name="stopTimeout"><Property name="jetty.server.stopTimeout" default="5000"/></Set>
+    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
+    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
+
+</Configure>