Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 7128 invoked from network); 19 Nov 2007 13:52:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Nov 2007 13:52:15 -0000 Received: (qmail 76495 invoked by uid 500); 19 Nov 2007 13:52:02 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 76473 invoked by uid 500); 19 Nov 2007 13:52:02 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 76464 invoked by uid 99); 19 Nov 2007 13:52:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2007 05:52:02 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2007 13:52:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 183A51A9832; Mon, 19 Nov 2007 05:51:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r596297 - in /openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources: openejb openejb.bat Date: Mon, 19 Nov 2007 13:51:52 -0000 To: commits@openejb.apache.org From: jlaskowski@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071119135154.183A51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jlaskowski Date: Mon Nov 19 05:51:49 2007 New Revision: 596297 URL: http://svn.apache.org/viewvc?rev=596297&view=rev Log: OPENEJB-722 Add OPENEJB_OPTS to pass additional runtime options (useful for debugging) Modified: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat Modified: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb?rev=596297&r1=596296&r2=596297&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb (original) +++ openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb Mon Nov 19 05:51:49 2007 @@ -80,7 +80,4 @@ OPENEJB_JAVAAGENT_JAR="$OPENEJB_HOME/lib/openejb-javaagent-${version}.jar" -java -javaagent:$OPENEJB_JAVAAGENT_JAR -jar $OPENEJB_CORE_JAR "$@" - -# Standard debug options -#java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:$OPENEJB_JAVAAGENT_JAR -jar $OPENEJB_CORE_JAR "$@" +java $OPENEJB_OPTS -javaagent:$OPENEJB_JAVAAGENT_JAR -jar $OPENEJB_CORE_JAR "$@" Modified: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat?rev=596297&r1=596296&r2=596297&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat (original) +++ openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat Mon Nov 19 05:51:49 2007 @@ -79,25 +79,25 @@ REM================================================ :VALIDATE shift - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% validate %1 %2 %3 %4 %5 %6 %7 %8 %9 + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% validate %1 %2 %3 %4 %5 %6 %7 %8 %9 goto EOF REM================================================ :DEPLOY shift - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% deploy %1 %2 %3 %4 %5 %6 %7 %8 %9 + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% deploy %1 %2 %3 %4 %5 %6 %7 %8 %9 goto EOF REM================================================ :START_SERVER shift - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% start %1 %2 %3 %4 %5 %6 %7 %8 %9 + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% start %1 %2 %3 %4 %5 %6 %7 %8 %9 goto EOF REM================================================ :STOP_SERVER shift - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% stop %1 %2 %3 %4 %5 %6 %7 %8 %9 + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% stop %1 %2 %3 %4 %5 %6 %7 %8 %9 goto EOF REM================================================ @@ -107,44 +107,44 @@ REM================================================ :TEST_INTRAVM - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% test local + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% test local if /I %P2% EQU _ goto TEST_SERVER goto EOF REM================================================ :TEST_SERVER - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% test remote + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% test remote goto EOF REM================================================ :HELP_TEST - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% test --help + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% test --help goto EOF REM================================================ :HELP_DEPLOY - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% deploy --help + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% deploy --help goto EOF REM================================================ :HELP_VALIDATE - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% validate --help + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% validate --help goto EOF REM================================================ :HELP_START - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% start --help + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% start --help goto EOF REM================================================ :HELP_STOP - java -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% stop --help + java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% stop --help goto EOF