From fdfc5efe5ab18d2a4a4fe402f1b3db8cc3ba1668 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 31 Aug 2010 13:27:47 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-2881 - activemq
 home and base properties

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@991184 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/bin/activemq     |  5 +++++
 assembly/src/release/bin/activemq.bat |  5 +++--
 assembly/src/release/conf/jetty.xml   | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 8265e8a07e..b2d1d9ef2e 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -295,7 +295,12 @@ if [ "$OSTYPE" = "cygwin" ];then
 fi
 
 # Set default classpath
+# Add instance conf dir before AMQ install conf dir to pick up instance-specific classpath entries first
 ACTIVEMQ_CLASSPATH="${ACTIVEMQ_CONFIG_DIR};${ACTIVEMQ_CLASSPATH}"
+if [ "${ACTIVEMQ_BASE}" != "${ACTIVEMQ_HOME}" ]; then
+    ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;${ACTIVEMQ_CLASSPATH}"
+fi
+
 
 
 # ------------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq.bat b/assembly/src/release/bin/activemq.bat
index 53c7345deb..6097e22892 100755
--- a/assembly/src/release/bin/activemq.bat
+++ b/assembly/src/release/bin/activemq.bat
@@ -82,8 +82,9 @@ REM SET ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
 REM Uncomment to enable remote debugging
 REM SET ACTIVEMQ_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
 
-REM Setup ActiveMQ Classpath. Default is the conf directory.
-set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_BASE%/conf;%ACTIVEMQ_CLASSPATH%
+REM Setup ActiveMQ Classpath. 
+REM Add instance conf dir before AMQ install conf dir to pick up instance-specific classpath entries first
+set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_BASE%/conf;%ACTIVEMQ_HOME%/conf;%ACTIVEMQ_CLASSPATH%
 
 "%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" start %*
 
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 2f9bc83a6b..752dcbd47a 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -50,22 +50,22 @@
                     <list>
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/admin" />
-                            <property name="resourceBase" value="${activemq.base}/webapps/admin" />
+                            <property name="resourceBase" value="${activemq.home}/webapps/admin" />
                             <property name="logUrlOnStart" value="true" />
                         </bean>
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/camel" />
-                            <property name="resourceBase" value="${activemq.base}/webapps/camel" />
+                            <property name="resourceBase" value="${activemq.home}/webapps/camel" />
                             <property name="logUrlOnStart" value="true" />
                         </bean>
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/demo" />
-                            <property name="resourceBase" value="${activemq.base}/webapps/demo" />
+                            <property name="resourceBase" value="${activemq.home}/webapps/demo" />
                             <property name="logUrlOnStart" value="true" />
                         </bean>
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/fileserver" />
-                            <property name="resourceBase" value="${activemq.base}/webapps/fileserver" />
+                            <property name="resourceBase" value="${activemq.home}/webapps/fileserver" />
                             <property name="logUrlOnStart" value="true" />
                             <property name="parentLoaderPriority" value="true" />
                         </bean>
@@ -76,7 +76,7 @@
                                     <value>index.html</value>
                                 </list>
                             </property>
-                            <property name="resourceBase" value="${activemq.base}/webapps/" />
+                            <property name="resourceBase" value="${activemq.home}/webapps/" />
                         </bean>
                         <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler">
                             <property name="serveIcon" value="false" />
@@ -114,4 +114,4 @@
 
     </bean>
 
-</beans>
\ No newline at end of file
+</beans>