Author: gertv
Date: Mon Feb 23 21:32:13 2009
New Revision: 747142
URL: http://svn.apache.org/viewvc?rev=747142&view=rev
Log:
SMX4-226: Avoid use of ActiveMQ ShutDownHook for embedded broker
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
servicemix/smx4/features/trunk/branding/ (props changed)
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml?rev=747142&r1=747141&r2=747142&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
(original)
+++
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
Mon Feb 23 21:32:13 2009
@@ -27,7 +27,7 @@
<!-- Allows us to use system properties as variables in this configuration
file -->
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="${name}" dataDirectory="${servicemix.base}/data/activemq/${name}">
+ <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="${name}" dataDirectory="${servicemix.base}/data/activemq/${name}"
useShutdownHook="false">
<!-- Destination specific policies using destination names or
wildcards -->
<destinationPolicy>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml?rev=747142&r1=747141&r2=747142&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
Mon Feb 23 21:32:13 2009
@@ -27,7 +27,7 @@
<!-- Allows us to use system properties as variables in this configuration
file -->
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="default" dataDirectory="${servicemix.base}/data/activemq/default">
+ <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="default" dataDirectory="${servicemix.base}/data/activemq/default"
useShutdownHook="false">
<!-- Destination specific policies using destination names or
wildcards -->
<destinationPolicy>
Propchange: servicemix/smx4/features/trunk/branding/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 23 21:32:13 2009
@@ -0,0 +1 @@
+target
