Skip to content

fix(spring/jetty): add depends-on for Jetty to start only when the broker is available #1922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jbonofre wants to merge 1 commit into from
Closed

fix(spring/jetty): add depends-on for Jetty to start only when the broker is available #1922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assembly/src/release/conf/activemq.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 6 additions & 2 deletions assembly/src/release/conf/jetty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion assembly/src/release/examples/conf/activemq-demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion assembly/src/release/examples/conf/activemq-security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion assembly/src/release/examples/conf/activemq-stomp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down