From commits-return-9154-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Sep 02 07:15:56 2008 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 27656 invoked from network); 2 Sep 2008 07:15:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Sep 2008 07:15:56 -0000 Received: (qmail 59833 invoked by uid 500); 2 Sep 2008 07:15:55 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 59806 invoked by uid 500); 2 Sep 2008 07:15:54 -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 59797 invoked by uid 99); 2 Sep 2008 07:15:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 00:15:54 -0700 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; Tue, 02 Sep 2008 07:15:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0FE0B23889F3; Tue, 2 Sep 2008 00:15:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691131 - /activemq/trunk/assembly/src/release/bin/activemq Date: Tue, 02 Sep 2008 07:15:35 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080902071536.0FE0B23889F3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Tue Sep 2 00:15:35 2008 New Revision: 691131 URL: http://svn.apache.org/viewvc?rev=691131&view=rev Log: applied patch for https://issues.apache.org/activemq/browse/AMQ-1887 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=691131&r1=691130&r2=691131&view=diff ============================================================================== --- activemq/trunk/assembly/src/release/bin/activemq (original) +++ activemq/trunk/assembly/src/release/bin/activemq Tue Sep 2 00:15:35 2008 @@ -140,11 +140,15 @@ # Set default classpath ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;"$ACTIVEMQ_CLASSPATH -# Uncomment to enable YourKit profiling -#ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent" +# Optionally enable YourKit debugging +if [ "x$YOURKIT_DEBUG" != "x" ]; then + ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent" +fi -# Uncomment to enable remote debugging -#ACTIVEMQ_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" +# Optionally enable remote debugging +if [ "x$ACTIVEMQ_DEBUG" != "x" ]; then + ACTIVEMQ_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" +fi if [ -n "$CYGHOME" ]; then exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar" start $@