activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1328073 - in /activemq/trunk/assembly/src/release/bin: linux-x86-32/wrapper.conf linux-x86-64/wrapper.conf macosx/wrapper.conf win32/wrapper.conf
Date Thu, 19 Apr 2012 18:37:59 GMT
Author: tabish
Date: Thu Apr 19 18:37:59 2012
New Revision: 1328073

URL: http://svn.apache.org/viewvc?rev=1328073&view=rev
Log:
further work for: https://issues.apache.org/jira/browse/AMQ-3248 update the wrapper.conf files
to properly make use of the conf and data env vars

Modified:
    activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf
    activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf
    activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
    activemq/trunk/assembly/src/release/bin/win32/wrapper.conf

Modified: activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf?rev=1328073&r1=1328072&r2=1328073&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf Thu Apr 19 18:37:59
2012
@@ -22,6 +22,8 @@
 #wrapper.debug=TRUE
 set.default.ACTIVEMQ_HOME=../..
 set.default.ACTIVEMQ_BASE=../..
+set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
+set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
 wrapper.working.dir=.
 
 # Java Application
@@ -47,13 +49,13 @@ wrapper.java.additional.1=-Dactivemq.hom
 wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
 wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
 wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
-wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
-wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_CONF%/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_CONF%/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
-wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_BASE%/conf
-wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_BASE%/data
+wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_CONF%
+wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_DATA%
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
@@ -87,7 +89,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_DATA%/wrapper.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM

Modified: activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf?rev=1328073&r1=1328072&r2=1328073&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf Thu Apr 19 18:37:59
2012
@@ -22,6 +22,8 @@
 #wrapper.debug=TRUE
 set.default.ACTIVEMQ_HOME=../..
 set.default.ACTIVEMQ_BASE=../..
+set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
+set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
 wrapper.working.dir=.
 
 # Java Application
@@ -47,13 +49,13 @@ wrapper.java.additional.1=-Dactivemq.hom
 wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
 wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
 wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
-wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
-wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_CONF%/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_CONF%/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
-wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_BASE%/conf
-wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_BASE%/data
+wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_CONF%
+wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_DATA%
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
@@ -87,7 +89,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_DATA%/wrapper.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM

Modified: activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf?rev=1328073&r1=1328072&r2=1328073&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf Thu Apr 19 18:37:59 2012
@@ -22,6 +22,8 @@
 #wrapper.debug=TRUE
 set.default.ACTIVEMQ_HOME=../..
 set.default.ACTIVEMQ_BASE=../..
+set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
+set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
 wrapper.working.dir=.
 
 # Java Application
@@ -47,13 +49,13 @@ wrapper.java.additional.1=-Dactivemq.hom
 wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
 wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
 wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
-wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
-wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_CONF%/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_CONF%/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
-wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_BASE%/conf
-wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_BASE%/data
+wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_CONF%
+wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_DATA%
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
@@ -87,7 +89,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_DATA%/wrapper.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM

Modified: activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf?rev=1328073&r1=1328072&r2=1328073&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/win32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/win32/wrapper.conf Thu Apr 19 18:37:59 2012
@@ -22,6 +22,8 @@
 # wrapper.debug=TRUE
 set.default.ACTIVEMQ_HOME=../..
 set.default.ACTIVEMQ_BASE=../..
+set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
+set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
 wrapper.working.dir=.
 
 # Java Application
@@ -47,13 +49,13 @@ wrapper.java.additional.1=-Dactivemq.hom
 wrapper.java.additional.2=-Dactivemq.base="%ACTIVEMQ_BASE%"
 wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
 wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
-wrapper.java.additional.5=-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks"
-wrapper.java.additional.6=-Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_CONF%/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_CONF%/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
-wrapper.java.additional.10=-Dactivemq.conf="%ACTIVEMQ_BASE%/conf"
-wrapper.java.additional.11=-Dactivemq.data="%ACTIVEMQ_BASE%/data"
+wrapper.java.additional.10=-Dactivemq.conf="%ACTIVEMQ_CONF%"
+wrapper.java.additional.11=-Dactivemq.data="%ACTIVEMQ_DATA%"
 
 # Uncomment to enable remote jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
@@ -87,7 +89,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_DATA%/wrapper.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM



Mime
View raw message