From 97fae5174b4cd6c0887d48d85f8b93c63157ca85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jb.onofre@dremio.com>
Date: Tue, 14 Apr 2026 07:18:56 +0200
Subject: [PATCH] fix(spring/jetty): add depends-one on Jetty to start only
 when the broker is available

---
 assembly/src/release/conf/activemq.xml                   | 2 +-
 assembly/src/release/conf/jetty.xml                      | 8 ++++++--
 assembly/src/release/examples/conf/activemq-demo.xml     | 2 +-
 assembly/src/release/examples/conf/activemq-security.xml | 2 +-
 assembly/src/release/examples/conf/activemq-stomp.xml    | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 9f32bd90f59..ba794162938 100644
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -31,7 +31,7 @@
     <!--
         The <broker> element is used to configure the ActiveMQ broker.
     -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
+    <broker id="broker" xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
 
         <destinationPolicy>
             <policyMap>
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index cb3d281ea35..3b36eaa7d5e 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -15,6 +15,10 @@
         An embedded servlet engine for serving up the Admin consoles, REST and Ajax APIs and
         some demos Include this file in your configuration to enable ActiveMQ web components
         e.g. <import resource="jetty.xml"/>
+
+        Note: the broker element in your configuration must have id="broker" set so that
+        the Jetty server starts only after the broker is fully available.
+        e.g. <broker id="broker" xmlns="http://activemq.apache.org/schema/core" ...>
     -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
@@ -208,8 +212,8 @@
         </property>
     </bean>
     
-    <bean id="invokeStart" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean" 
-        depends-on="configureJetty, invokeConnectors">
+    <bean id="invokeStart" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"
+        depends-on="configureJetty, invokeConnectors, broker">
         <property name="targetObject" ref="Server" />
         <property name="targetMethod" value="start" />      
     </bean>
diff --git a/assembly/src/release/examples/conf/activemq-demo.xml b/assembly/src/release/examples/conf/activemq-demo.xml
index a6954cf2f10..642a56446f3 100644
--- a/assembly/src/release/examples/conf/activemq-demo.xml
+++ b/assembly/src/release/examples/conf/activemq-demo.xml
@@ -47,7 +47,7 @@
           - Change the brokerName attribute to something unique
     -->
 
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true">
+    <broker id="broker" xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true">
 
         <!--
             Examples of destination-specific policies using destination
diff --git a/assembly/src/release/examples/conf/activemq-security.xml b/assembly/src/release/examples/conf/activemq-security.xml
index 3d34dde557f..8f6bc5854e9 100644
--- a/assembly/src/release/examples/conf/activemq-security.xml
+++ b/assembly/src/release/examples/conf/activemq-security.xml
@@ -63,7 +63,7 @@
   </bean> 
   -->
 
-  <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" >
+  <broker id="broker" useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" >
 
     <managementContext>
         <managementContext createConnector="true">
diff --git a/assembly/src/release/examples/conf/activemq-stomp.xml b/assembly/src/release/examples/conf/activemq-stomp.xml
index 0fe5b11c2b7..597d8bcc7bd 100644
--- a/assembly/src/release/examples/conf/activemq-stomp.xml
+++ b/assembly/src/release/examples/conf/activemq-stomp.xml
@@ -44,7 +44,7 @@
     <!--
         The <broker> element is used to configure the ActiveMQ broker.
     -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
+    <broker id="broker" xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
 
         <!--
             For better performances use VM cursor and small memory limit.