From 0d995ec12d97071f84d23395acff44ad243699b7 Mon Sep 17 00:00:00 2001
From: Nate Chadwick <263952448+natechadwick-intsof@users.noreply.github.com>
Date: Tue, 8 Sep 2026 13:11:38 -0400
Subject: [PATCH] fix(activemq): restore
 xmlns="http://activemq.apache.org/schema/core" on <broker>

The T2.2 ActiveMQ hardening PR (#166/#167) reformatted the <broker>
element in system/Tools/jetty/defaults/etc/activemq/activemq.xml onto
multiple lines and accidentally dropped the
xmlns="http://activemq.apache.org/schema/core" attribute that was on the
element. Without that attribute, <broker> and its children (destinationPolicy,
plugins, systemUsage, transportConnectors) fall into the default
http://www.springframework.org/schema/beans namespace, and the Xerces
XSD validator (correctly) rejects the file with:

  SAXParseException; lineNumber: 32; columnNumber: 44;
  cvc-complex-type.2.4.a: Invalid content was found starting with element
  '{"http://www.springframework.org/schema/beans":broker}'.
  One of '{"http://www.springframework.org/schema/beans":description, ...
  "http://www.springframework.org/schema/beans":bean, ...}' is expected.

This breaks the in-VM ActiveMQ broker startup; every JMS listener
connection attempt (email queue, publishing queue) fails and the error
repeats 150+ times in jetty/base/logs/server.log. The XSD validator is
doing the right thing -- <broker> is declared in activemq.xsd under the
http://activemq.apache.org/schema/core target namespace, not under the
Spring beans namespace.

Pre-T2.2 (working):
  <broker useShutdownHook="false" useJmx="false" persistent="true"
          deleteAllMessagesOnStartup="true"
          xmlns="http://activemq.apache.org/schema/core"
          brokerName="localhost" dataDirectory="data/activemq-data">

Post-T2.2 (broken -- xmlns dropped during reformat):
  <broker
      useShutdownHook="false"
      useJmx="false"
      persistent="true"
      deleteAllMessagesOnStartup="false"
      ...
      dataDirectory="data/activemq-data">

The xmlns="http://activemq.apache.org/schema/core" is the only thing that
puts <broker> and its children into the ActiveMQ namespace where the
activemq.xsd expects them. Restored, plus a 12-line comment block above
the <broker> element explaining the requirement and pointing at this
issue, so a future reformat doesn't drop it again.

Refs #208

> Co-Authored by Mavis Mavis-Code using MiniMax-M3 with agent mavis.
---
 .../Tools/jetty/defaults/etc/activemq/activemq.xml   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/system/Tools/jetty/defaults/etc/activemq/activemq.xml b/system/Tools/jetty/defaults/etc/activemq/activemq.xml
index e06acc975..eef969c51 100644
--- a/system/Tools/jetty/defaults/etc/activemq/activemq.xml
+++ b/system/Tools/jetty/defaults/etc/activemq/activemq.xml
@@ -22,7 +22,19 @@ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/ac
             uri="tcp://127.0.0.1:61616"
             .../>  (DO NOT use 0.0.0.0) and a matching TLS connector.
     -->
+    <!--
+         The xmlns="http://activemq.apache.org/schema/core" on <broker> is
+         required: the activemq.xsd declares <broker> (and its children
+         destinationPolicy, plugins, systemUsage, transportConnectors) in
+         that target namespace, and elementFormDefault is 'qualified'. If
+         <broker> is not in the ActiveMQ namespace, the XSD validator falls
+         back to the Spring beans XSD (because the root <beans> element is
+         in the Spring beans namespace) and rejects <broker> with
+         cvc-complex-type.2.4.a. Do NOT remove the xmlns attribute during
+         any future reformat. Tracked in issue #208.
+    -->
     <broker
+        xmlns="http://activemq.apache.org/schema/core"
         useShutdownHook="false"
         useJmx="false"
         persistent="true"