From 3ef117fd3da218411c83c2690ceaf176cc8f3aea Mon Sep 17 00:00:00 2001
From: objectiser <gary@brownuk.com>
Date: Wed, 12 Mar 2014 12:21:01 +0000
Subject: [PATCH] RTGOV-385 Pass activemq username and password from Karaf
 config file

---
 .../OSGI-INF/blueprint/epn-jms-activemq.xml          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/event-processor-network/epn-jms-activemq/src/main/resources/OSGI-INF/blueprint/epn-jms-activemq.xml b/modules/event-processor-network/epn-jms-activemq/src/main/resources/OSGI-INF/blueprint/epn-jms-activemq.xml
index b9fa9bdd..40e2db2c 100644
--- a/modules/event-processor-network/epn-jms-activemq/src/main/resources/OSGI-INF/blueprint/epn-jms-activemq.xml
+++ b/modules/event-processor-network/epn-jms-activemq/src/main/resources/OSGI-INF/blueprint/epn-jms-activemq.xml
@@ -1,7 +1,15 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
+    <cm:property-placeholder persistent-id="org.overlord.rtgov.epn.jms.activemq">
+    	<cm:default-properties>
+			<cm:property name="username" value="karaf"/>
+			<cm:property name="password" value="karaf"/>
+		</cm:default-properties>
+	</cm:property-placeholder>
+
     <service interface="org.overlord.rtgov.epn.EPNManager">
     
     	<!-- TODO: 'destroy-method' does not seem to be supported -->
@@ -15,8 +23,8 @@
         	don't really want to include credentials in the file, so might need to
         	obtain from config service? -->
         	
-        	<property name="username" value="karaf" />
-        	<property name="password" value="karaf" />
+        	<property name="username" value="${username}" />
+        	<property name="password" value="${password}" />
         	<property name="initConsumers" value="true" />        	
         </bean>
     </service>