Author: dejanb
Date: Thu Nov 25 10:05:57 2010
New Revision: 1038976
URL: http://svn.apache.org/viewvc?rev=1038976&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-3054 - add property placeholder
to activemq-jdbc.xml
Modified:
activemq/trunk/assembly/src/sample-conf/activemq-jdbc.xml
Modified: activemq/trunk/assembly/src/sample-conf/activemq-jdbc.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/activemq-jdbc.xml?rev=1038976&r1=1038975&r2=1038976&view=diff
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/activemq-jdbc.xml (original)
+++ activemq/trunk/assembly/src/sample-conf/activemq-jdbc.xml Thu Nov 25
10:05:57 2010
@@ -33,7 +33,14 @@
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-2.0.xsd
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd">
-
+
+ <!-- Allows us to use system properties as variables in this configuration
file -->
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <value>file:${activemq.base}/conf/credentials.properties</value>
+ </property>
+ </bean>
+
<broker useJmx="false" brokerName="jdbcBroker"
xmlns="http://activemq.apache.org/schema/core">
<persistenceAdapter>
<jdbcPersistenceAdapter dataDirectory="${activemq.base}/data"
dataSource="#derby-ds"/>