You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/08/20 05:05:39 UTC
svn commit: r806029 - in
/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources:
activemq-template.xml activemq.xml
Author: xuhaihong
Date: Thu Aug 20 03:05:39 2009
New Revision: 806029
URL: http://svn.apache.org/viewvc?rev=806029&view=rev
Log:
Update the placeholder we use in the ActiveMQ configuration file
Modified:
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml?rev=806029&r1=806028&r2=806029&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml Thu Aug 20 03:05:39 2009
@@ -32,7 +32,7 @@
<!-- Allows us to use system properties as variables in this configuration file-->
<bean class="org.apache.geronimo.activemq.GeronimoPropertyPlaceholderConfigurer">
<property name="locations">
- <!--<value>file://${activemq.base}/conf/credentials.properties</value>-->
+ <!--<value>file://${activemq.home}/conf/credentials.properties</value>-->
<value>${activemq.geronimo.home.url}/var/config/config-substitutions.properties</value>
</property>
</bean>
@@ -109,7 +109,7 @@
persistence.
<persistenceAdapter>
- <journaledJDBC dataDirectory="${activemq.base}/data/${activemq.brokerName}" dataSource="#postgres-ds"/>
+ <journaledJDBC dataDirectory="${activemq.home}/data/${activemq.brokerName}" dataSource="#postgres-ds"/>
</persistenceAdapter>
-->
@@ -129,9 +129,9 @@
http://activemq.apache.org/how-do-i-use-ssl.html
<sslContext>
- <sslContext keyStore="file:${activemq.base}/conf/${activemq.brokerName}/broker.ks"
+ <sslContext keyStore="file:${activemq.home}/conf/${activemq.brokerName}/broker.ks"
keyStorePassword="password"
- trustStore="file:${activemq.base}/conf/${activemq.brokerName}/broker.ts"
+ trustStore="file:${activemq.home}/conf/${activemq.brokerName}/broker.ts"
trustStorePassword="password"/>
</sslContext>
-->
@@ -237,9 +237,9 @@
</connectors>
<handlers>
- <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
- <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
- <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
+ <webAppContext contextPath="/admin" resourceBase="${activemq.home}/webapps/admin" logUrlOnStart="true"/>
+ <webAppContext contextPath="/demo" resourceBase="${activemq.home}/webapps/demo" logUrlOnStart="true"/>
+ <webAppContext contextPath="/fileserver" resourceBase="${activemq.home}/webapps/fileserver" logUrlOnStart="true"/>
</handlers>
</jetty>
-->
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml?rev=806029&r1=806028&r2=806029&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml Thu Aug 20 03:05:39 2009
@@ -32,7 +32,7 @@
<!-- Allows us to use system properties as variables in this configuration file-->
<bean class="org.apache.geronimo.activemq.GeronimoPropertyPlaceholderConfigurer">
<property name="locations">
- <!--<value>file://${activemq.base}/conf/credentials.properties</value>-->
+ <!--<value>file://${activemq.home}/conf/credentials.properties</value>-->
<value>${activemq.geronimo.home.url}/var/config/config-substitutions.properties</value>
</property>
</bean>
@@ -109,7 +109,7 @@
persistence.
<persistenceAdapter>
- <journaledJDBC dataDirectory="${activemq.base}/data/${activemq.brokerName}" dataSource="#postgres-ds"/>
+ <journaledJDBC dataDirectory="${activemq.home}/data/${activemq.brokerName}" dataSource="#postgres-ds"/>
</persistenceAdapter>
-->
@@ -129,9 +129,9 @@
http://activemq.apache.org/how-do-i-use-ssl.html
<sslContext>
- <sslContext keyStore="file:${activemq.base}/conf/${activemq.brokerName}/broker.ks"
+ <sslContext keyStore="file:${activemq.home}/conf/${activemq.brokerName}/broker.ks"
keyStorePassword="password"
- trustStore="file:${activemq.base}/conf/${activemq.brokerName}/broker.ts"
+ trustStore="file:${activemq.home}/conf/${activemq.brokerName}/broker.ts"
trustStorePassword="password"/>
</sslContext>
-->
@@ -238,9 +238,9 @@
</connectors>
<handlers>
- <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
- <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
- <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
+ <webAppContext contextPath="/admin" resourceBase="${activemq.home}/webapps/admin" logUrlOnStart="true"/>
+ <webAppContext contextPath="/demo" resourceBase="${activemq.home}/webapps/demo" logUrlOnStart="true"/>
+ <webAppContext contextPath="/fileserver" resourceBase="${activemq.home}/webapps/fileserver" logUrlOnStart="true"/>
</handlers>
</jetty>
-->