Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 18960 invoked from network); 12 Jul 2010 12:40:58 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Jul 2010 12:40:58 -0000 Received: (qmail 88293 invoked by uid 500); 12 Jul 2010 12:40:57 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 88225 invoked by uid 500); 12 Jul 2010 12:40:56 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 88218 invoked by uid 99); 12 Jul 2010 12:40:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jul 2010 12:40:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jul 2010 12:40:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8887B238896F; Mon, 12 Jul 2010 12:39:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r963264 - /activemq/trunk/assembly/src/release/bin/activemq Date: Mon, 12 Jul 2010 12:39:29 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100712123929.8887B238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Mon Jul 12 12:39:29 2010 New Revision: 963264 URL: http://svn.apache.org/viewvc?rev=963264&view=rev Log: https://issues.apache.org/activemq/browse/AMQ-2453 - fixing classpath so we can run something like '/activemq console xbean:conf/activemq-stomp.xml' Modified: activemq/trunk/assembly/src/release/bin/activemq Modified: activemq/trunk/assembly/src/release/bin/activemq URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=963264&r1=963263&r2=963264&view=diff ============================================================================== --- activemq/trunk/assembly/src/release/bin/activemq (original) +++ activemq/trunk/assembly/src/release/bin/activemq Mon Jul 12 12:39:29 2010 @@ -295,7 +295,7 @@ if [ "$OSTYPE" = "cygwin" ];then fi # Set default classpath -ACTIVEMQ_CLASSPATH="${ACTIVEMQ_CONFIG_DIR}/;${ACTIVEMQ_CLASSPATH}" +ACTIVEMQ_CLASSPATH="${ACTIVEMQ_CONFIG_DIR};${ACTIVEMQ_CLASSPATH}" # ------------------------------------------------------------------------ @@ -333,7 +333,7 @@ invokeJar(){ fi # Execute java binary if [ -n "$PIDFILE" ] && [ "$PIDFILE" != "stop" ];then - $DOIT_PREFIX "cd $ACTIVEMQ_CONFIG_DIR; $JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \ + $DOIT_PREFIX "$JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \ -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \ -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \ -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \ @@ -344,7 +344,7 @@ invokeJar(){ echo \"INFO: pidfile created : '$PIDFILE' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX RET="$?" elif [ -n "$PIDFILE" ] && [ "$PIDFILE" == "stop" ];then - $DOIT_PREFIX "cd $ACTIVEMQ_CONFIG_DIR; $JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \ + $DOIT_PREFIX "$JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \ -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \ -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \ -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \ @@ -352,7 +352,7 @@ invokeJar(){ -jar \"${ACTIVEMQ_HOME}/bin/run.jar\" $COMMANDLINE_ARGS &" RET="$?" else - $DOIT_PREFIX "cd $ACTIVEMQ_CONFIG_DIR; $JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \ + $DOIT_PREFIX "$JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \ -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \ -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \ -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \ @@ -590,4 +590,4 @@ case "$1" in ;; *) invoke_task -esac \ No newline at end of file +esac