Skip to content

Commit 4f4fbb2

Browse files
committed
fix(assembly): add id="broker" to sample configs so jetty.xml depends-on resolves
The BrokerXmlConfigStartTest loads all activemq-*.xml sample configs which import jetty.xml. Since jetty.xml now has depends-on="broker" on the invokeStart bean, the sample configs need a matching bean id.
1 parent 2c889c6 commit 4f4fbb2

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

assembly/src/release/examples/conf/activemq-demo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
- Change the brokerName attribute to something unique
4848
-->
4949

50-
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true">
50+
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true" id="broker">
5151

5252
<!--
5353
Examples of destination-specific policies using destination

assembly/src/release/examples/conf/activemq-security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</bean>
6464
-->
6565

66-
<broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" >
66+
<broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" id="broker">
6767

6868
<managementContext>
6969
<managementContext createConnector="true">

assembly/src/release/examples/conf/activemq-stomp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!--
4545
The <broker> element is used to configure the ActiveMQ broker.
4646
-->
47-
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
47+
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}" id="broker">
4848

4949
<!--
5050
For better performances use VM cursor and small memory limit.

0 commit comments

Comments
 (0)