Added a <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> to all activemq configuation files so that system properties can be used in the configuration of the broker.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385689 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/test/resources/activemq.xml

@@ -16,6 +16,7 @@
 -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false">
   

activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml

@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="master" persistent="false" useJmx="false">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml

@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="slave" persistent="false" useJmx="false" masterConnectorURI="tcp://localhost:62001">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml

@@ -18,6 +18,7 @@
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false">
 

activemq-core/src/test/resources/org/apache/activemq/broker/spring.xml

@@ -17,8 +17,9 @@
 
 <!-- START SNIPPET: spring -->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
 <beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <!-- an embedded broker -->
 
   <bean id="broker" class="org.apache.activemq.broker.BrokerService" 

activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml

@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <usageManager id="memory-manager" limit="1048576"/> <!--  1 meg limit -->
   

activemq-core/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml

@@ -16,6 +16,7 @@
 -->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <bean id="policy" class="org.apache.activemq.filter.DummyPolicy">
     <property name="entries">

activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml

@@ -17,6 +17,8 @@
 
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <!-- remote broker -->
 
   <bean id="remotebroker" class="org.apache.activemq.broker.BrokerService" 

activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml

@@ -17,6 +17,8 @@
 
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <!-- remote broker -->
 
   <bean id="remotebroker" class="org.apache.activemq.broker.BrokerService" 

activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml

@@ -17,6 +17,8 @@
 
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <!-- remote broker -->
 
   <bean id="remotebroker" class="org.apache.activemq.broker.BrokerService" 

activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml

@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
 <broker brokerName="localBroker" persistent="true" useShutdownHook="false">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml

@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="remoteBroker" persistent="true" useShutdownHook="false">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml

@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="slowConsumerBroker" persistent="true" useShutdownHook="false">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml

@@ -18,6 +18,7 @@
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false" persistent="false">
 

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml

@@ -18,6 +18,7 @@
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false">
 

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml

@@ -18,6 +18,7 @@
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false">
 

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml

@@ -19,6 +19,7 @@
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0"
   xmlns:s="http://xbean.org/spring/">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false">
 

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml

@@ -18,6 +18,7 @@
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false">
 

activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml

@@ -19,7 +19,9 @@
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
 
-  <broker persistent="false">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+  <broker persistent="false" brokerName="${brokername}">
 
     <!--  lets define the dispatch policy -->
     <destinationPolicy>

activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml

@@ -19,10 +19,12 @@
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <broker useJmx="true">
 
     <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="foo" />
+      <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/foo" />
     </persistenceAdapter>
 
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml

@@ -17,6 +17,8 @@
 
 <beans xmlns="http://activemq.org/config/1.0">
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <!-- for easier integration with the JUnit tests, lets not start the broker when the ApplicationContext starts -->
   <broker useJmx="true" start="false">
     <destinationPolicy>
@@ -37,7 +39,7 @@
 
 
     <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="../data" />
+      <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/data" />
     </persistenceAdapter>
 
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml

@@ -19,6 +19,8 @@
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <broker useJmx="true">
 
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml

@@ -18,6 +18,7 @@
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false">
 

activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml

@@ -19,6 +19,8 @@
 <!-- START SNIPPET: xbean -->
 <beans xmlns="http://activemq.org/config/1.0">
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <broker useJmx="true">
 	<managementContext>
 	   <managementContext connectorPort="2011" jmxDomainName="test.domain"/>

activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml

@@ -19,6 +19,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
+
   <!-- an embedded broker -->
 
   <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">