Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87F1A7A14 for ; Wed, 31 Aug 2011 06:49:54 +0000 (UTC) Received: (qmail 1871 invoked by uid 500); 31 Aug 2011 06:49:49 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1142 invoked by uid 500); 31 Aug 2011 06:49:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 1065 invoked by uid 99); 31 Aug 2011 06:49:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2011 06:49:31 +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; Wed, 31 Aug 2011 06:49:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B43E423889BB; Wed, 31 Aug 2011 06:49:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163505 - in /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution: unix-shell/bin/geronimo windows-text/bin/geronimo.bat Date: Wed, 31 Aug 2011 06:49:06 -0000 To: scm@geronimo.apache.org From: rwonly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110831064906.B43E423889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rwonly Date: Wed Aug 31 06:49:06 2011 New Revision: 1163505 URL: http://svn.apache.org/viewvc?rev=1163505&view=rev Log: GERONIMO-6134 PortOffset for o.a.karaf.shell.ssh (by default, only debug mode will set -Dkaraf.startRemoteShell=true) Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=1163505&r1=1163504&r2=1163505&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo Wed Aug 31 06:49:06 2011 @@ -358,7 +358,7 @@ elif [ "$1" = "start" ] ; then if [ -f "$JAVA_AGENT_JAR" ]; then exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ -javaagent:"$JAVA_AGENT_JAR" \ - -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true \ + -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \ -Dkaraf.home="$GERONIMO_HOME" \ -Dkaraf.base="$GERONIMO_HOME" \ @@ -370,7 +370,7 @@ elif [ "$1" = "start" ] ; then org.apache.geronimo.cli.daemon.DaemonCLI $LONG_OPT "$@" else exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ - -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true \ + -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \ -Dkaraf.home="$GERONIMO_HOME" \ -Dkaraf.base="$GERONIMO_HOME" \ @@ -386,7 +386,7 @@ elif [ "$1" = "start" ] ; then if [ -f "$JAVA_AGENT_JAR" ]; then $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ -javaagent:"$JAVA_AGENT_JAR" \ - -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true \ + -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \ -Dkaraf.home="$GERONIMO_HOME" \ -Dkaraf.base="$GERONIMO_HOME" \ @@ -404,7 +404,7 @@ elif [ "$1" = "start" ] ; then fi else $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ - -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true \ + -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \ -Dkaraf.home="$GERONIMO_HOME" \ -Dkaraf.base="$GERONIMO_HOME" \ Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat?rev=1163505&r1=1163504&r2=1163505&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat Wed Aug 31 06:49:06 2011 @@ -326,7 +326,7 @@ goto setHelpEnd @REM if it is not to print help information, open another window set _EXECJAVA=start "Geronimo Application Server" /d"%GERONIMO_HOME%\bin" %GERONIMO_WIN_START_ARGS% %_RUNJAVA% :setHelpEnd -set CONSOLE_OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true +set CONSOLE_OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false goto execCmd :doStop