You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/02/06 03:58:17 UTC
[2/4] git commit: [AMQ-5029] embedded webconsole broker does not
resolve activemq.data system property
[AMQ-5029] embedded webconsole broker does not resolve activemq.data system property
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/17d1489c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/17d1489c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/17d1489c
Branch: refs/heads/trunk
Commit: 17d1489c62b6bc33b77bce38eeecdc357f9c61bf
Parents: 3321f99
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Feb 5 16:08:26 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Feb 5 16:08:26 2014 -0500
----------------------------------------------------------------------
activemq-web-console/pom.xml | 4 ++++
activemq-web-console/src/main/webapp/WEB-INF/activemq.xml | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/17d1489c/activemq-web-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index e5f2e94..771ee02 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
http://git-wip-us.apache.org/repos/asf/activemq/blob/17d1489c/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
----------------------------------------------------------------------
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 4baf3b5..7203bef 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">