From 17d1489c62b6bc33b77bce38eeecdc357f9c61bf Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dkulp@apache.org>
Date: Wed, 5 Feb 2014 16:08:26 -0500
Subject: [PATCH] [AMQ-5029] embedded webconsole broker does not resolve
 activemq.data system property

---
 activemq-web-console/pom.xml                              | 4 ++++
 activemq-web-console/src/main/webapp/WEB-INF/activemq.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index e5f2e94af0..771ee02584 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -78,6 +78,10 @@
               <name>webconsole.type</name>
               <value>embedded</value>
             </systemProperty>
+            <systemProperty>
+                <name>activemq.data</name>
+                <value>${project.build.directory}/activemq-data</value>
+            </systemProperty>
 
             <!--
                Use the following configuration to connect to a remote broker using JMX
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
index 4baf3b5206..7203bef1fe 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
@@ -25,6 +25,7 @@
     http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
     http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
+  <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker brokerName="web-console" useJmx="true" xmlns="http://activemq.apache.org/schema/core">