geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
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 GMT
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



Mime
View raw message