Return-Path: 
 <scm-return-38033-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 33931 invoked from network); 20 Aug 2009 03:05:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 20 Aug 2009 03:05:43 -0000
Received: (qmail 49041 invoked by uid 500); 20 Aug 2009 03:06:02 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 48955 invoked by uid 500); 20 Aug 2009 03:06:02 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 48944 invoked by uid 99); 20 Aug 2009 03:06:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Aug 2009 03:06:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Aug 2009 03:06:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EF732238887A; Thu, 20 Aug 2009 03:05:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r806029 - in
 /geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources:
 activemq-template.xml activemq.xml
Date: Thu, 20 Aug 2009 03:05:39 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090820030539.EF732238887A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>
     -->