svn commit: r962519 - in /activemq/trunk/assembly/src/release: bin/activemq conf/jetty.xml

[de...@apache.org]

Author: dejanb
Date: Fri Jul  9 13:26:40 2010
New Revision: 962519

URL: http://svn.apache.org/viewvc?rev=962519&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2818 - jetty.realm not found

Modified:
    activemq/trunk/assembly/src/release/bin/activemq
    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=962519&r1=962518&r2=962519&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Fri Jul  9 13:26:40 2010
@@ -444,7 +444,7 @@ invoke_start(){
 # - $ACTIVEMQ_SUNJMX_START : options for JMX settings
 # - $ACTIVEMQ_SSL_OPTS     : options for SSL encryption
 
-invoke_fgstart(){
+invoke_console(){
     if ( checkRunning );then
       echo "ERROR: ActiveMQ is already running"
       exit 1
@@ -454,7 +454,7 @@ invoke_fgstart(){
     fi
     ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SUNJMX_START $ACTIVEMQ_SSL_OPTS"
 
-    COMMANDLINE_ARGS="start $(echo $COMMANDLINE_ARGS|sed 's,^fgstart,,')"
+    COMMANDLINE_ARGS="start $(echo $COMMANDLINE_ARGS|sed 's,^console,,')"
     echo "INFO: Starting in foreground, this is just for debugging purposes (stop process by pressing CTRL+C)"
     invokeJar
     exit "$?" 
@@ -544,7 +544,7 @@ show_help() {
   cat << EOF
 Tasks provided by the sysv init script:
     restart         - stop running instance (is there is one), start new instance
-    fgstart         - start daemon in foreground, usful for debugging purposes
+    console         - start broker in foreground, useful for debugging purposes
     status          - check if activemq process is running
     setup           - create the specified configuration file for this init script
                       (see next usage section)
@@ -582,8 +582,8 @@ case "$1" in
   start)    
     invoke_start
     ;;
-  fgstart)
-    invoke_fgstart
+  console)
+    invoke_console
     ;;
   stop)    
     invoke_stop

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=962519&r1=962518&r2=962519&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Fri Jul  9 13:26:40 2010
@@ -22,7 +22,7 @@
 
     <bean id="securityLoginService" class="org.eclipse.jetty.security.HashLoginService">
         <property name="name" value="ActiveMQRealm" />
-        <property name="config" value="jetty-realm.properties" />
+        <property name="config" value="${activemq.base}/conf/jetty-realm.properties" />
     </bean>
 
     <bean id="securityConstraint" class="org.eclipse.jetty.http.security.Constraint">