activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r991184 - in /activemq/trunk/assembly/src/release: bin/activemq bin/activemq.bat conf/jetty.xml
Date Tue, 31 Aug 2010 13:27:48 GMT
Author: dejanb
Date: Tue Aug 31 13:27:47 2010
New Revision: 991184

URL: http://svn.apache.org/viewvc?rev=991184&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2881 - activemq home and base properties

Modified:
    activemq/trunk/assembly/src/release/bin/activemq
    activemq/trunk/assembly/src/release/bin/activemq.bat
    activemq/trunk/assembly/src/release/conf/jetty.xml

Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=991184&r1=991183&r2=991184&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Tue Aug 31 13:27:47 2010
@@ -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
+
 
 
 # ------------------------------------------------------------------------

Modified: activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=991184&r1=991183&r2=991184&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq.bat Tue Aug 31 13:27:47 2010
@@ -82,8 +82,9 @@ REM SET ACTIVEMQ_DEBUG_OPTS="-agentlib:y
 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 %*
 

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=991184&r1=991183&r2=991184&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Tue Aug 31 13:27:47 2010
@@ -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>



Mime
View raw message