Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ED9E39204 for ; Thu, 19 Jan 2012 14:34:06 +0000 (UTC) Received: (qmail 9908 invoked by uid 500); 19 Jan 2012 14:34:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 9833 invoked by uid 500); 19 Jan 2012 14:34:06 -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 9826 invoked by uid 99); 19 Jan 2012 14:34:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2012 14:34:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 19 Jan 2012 14:34:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 184182388993 for ; Thu, 19 Jan 2012 14:33:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1233403 - in /activemq/trunk/assembly/src/release/bin: activemq activemq.bat Date: Thu, 19 Jan 2012 14:33:42 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120119143343.184182388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Thu Jan 19 14:33:42 2012 New Revision: 1233403 URL: http://svn.apache.org/viewvc?rev=1233403&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3667 - Use 1G heap by default and UseDedicatedTaskRunner=false, more production ready. done Modified: activemq/trunk/assembly/src/release/bin/activemq activemq/trunk/assembly/src/release/bin/activemq.bat Modified: activemq/trunk/assembly/src/release/bin/activemq URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1233403&r1=1233402&r2=1233403&view=diff ============================================================================== --- activemq/trunk/assembly/src/release/bin/activemq (original) +++ activemq/trunk/assembly/src/release/bin/activemq Thu Jan 19 14:33:42 2012 @@ -136,7 +136,7 @@ JAVACMD="auto" # Set jvm memory configuration if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then - ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx1G" + ACTIVEMQ_OPTS_MEMORY="-Xms1G -Xmx1G" fi # Uncomment to enable audit logging @@ -233,7 +233,7 @@ if [ "$CONFIG_LOAD" != "yes" ];then fi if [ -z "$ACTIVEMQ_OPTS" ] ; then - ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties" + ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties" fi # create configuration if requested Modified: activemq/trunk/assembly/src/release/bin/activemq.bat URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=1233403&r1=1233402&r2=1233403&view=diff ============================================================================== --- activemq/trunk/assembly/src/release/bin/activemq.bat (original) +++ activemq/trunk/assembly/src/release/bin/activemq.bat Thu Jan 19 14:33:42 2012 @@ -71,7 +71,7 @@ echo. if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME% -if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xms256M -Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties +if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xms1G -Xmx1G -Djava.util.logging.config.file=logging.properties if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false