Author: chirino
Date: Wed Jun 14 19:43:40 2006
New Revision: 414441

URL: http://svn.apache.org/viewvc?rev=414441&view=rev
Log:
Applied http://issues.apache.org/activemq/browse/AMQ-699

Modified:
    incubator/activemq/trunk/assembly/project.xml
    incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
    incubator/activemq/trunk/assembly/src/release/conf/log4j.properties

Modified: incubator/activemq/trunk/assembly/project.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/project.xml?rev=414441&r1=414440&r2=414441&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/project.xml (original)
+++ incubator/activemq/trunk/assembly/project.xml Wed Jun 14 19:43:40 2006
@@ -86,7 +86,7 @@
 
    
     <dependency>
-      <groupId>activemq</groupId>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
       <version>${pom.currentVersion}</version>
       <type>jar</type>

Modified: incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=414441&r1=414440&r2=414441&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq.xml Wed Jun 14 19:43:40 2006
@@ -1,21 +1,24 @@
 <!-- START SNIPPET: example -->
 <beans>
+
+  <!-- Allows us to use system properties as variables in this configuration file -->
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
   <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
   
     <!--  Use the following to set the broker memory limit (in bytes)
-  	<memoryManager>  
-	  	<usageManager id="memory-manager" limit="1048576"/>
-  	</memoryManager>
-  	-->
-  	
-	<!-- Use the following to configure how ActiveMQ is exposed in JMX
-	<managementContext>
-	   <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
-	</managementContext>
-	-->
+    <memoryManager>  
+        <usageManager id="memory-manager" limit="1048576"/>
+    </memoryManager>
+    -->
+    
+    <!-- Use the following to configure how ActiveMQ is exposed in JMX
+    <managementContext>
+       <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
+    </managementContext>
+    -->
 
-	<!-- In ActiveMQ 4, you can setup destination policies -->  
+    <!-- In ActiveMQ 4, you can setup destination policies -->  
     <destinationPolicy>
       <policyMap><policyEntries>
         
@@ -33,7 +36,7 @@
   
   
     <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data"/>
+        <journaledJDBC journalLogFiles="5" dataDirectory="${activemq.home}/activemq-data"/>
       <!-- To use a different datasource, use the following syntax : -->
       <!-- 
       <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/>

Modified: incubator/activemq/trunk/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/log4j.properties?rev=414441&r1=414440&r2=414441&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/log4j.properties (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/log4j.properties Wed Jun 14 19:43:40 2006
@@ -18,7 +18,7 @@
 
 # File appender
 log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.file=../data/activemq.log
+log4j.appender.out.file=${activemq.home}/data/activemq.log
 log4j.appender.out.maxFileSize=1024KB
 log4j.appender.out.maxBackupIndex=5
 log4j.appender.out.append=true