geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1384485 - in /geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution: unix-shell/bin/geronimo windows-text/bin/geronimo.bat windows-text/bin/internalLauncher.bat
Date Thu, 13 Sep 2012 19:37:53 GMT
Author: gawor
Date: Thu Sep 13 19:37:52 2012
New Revision: 1384485

URL: http://svn.apache.org/viewvc?rev=1384485&view=rev
Log:
GERONIMO-6388: Fix debug command and simplify start command on Windows

Removed:
    geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/internalLauncher.bat
Modified:
    geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
    geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat

Modified: geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=1384485&r1=1384484&r2=1384485&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
(original)
+++ geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
Thu Sep 13 19:37:52 2012
@@ -285,9 +285,10 @@ if [ "$1" = "debug" ] ; then
     echo "      in another window.  Do not use Ctrl-C as that will terminate the jdb client"
     echo "      (the debugger itself) but will not stop the Geronimo process."
     shift
+    CLASSPATH="$CLASSPATH:$JAVA_AGENT_JAR"
     exec "$_RUNJDB" $JAVA_OPTS $GERONIMO_OPTS \
       -sourcepath "$JDB_SRCPATH" \
-      -Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true \
+      -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true \
       -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
       -Dorg.apache.geronimo.server.dir="$GERONIMO_SERVER" \
       -Dkaraf.home="$GERONIMO_HOME" \

Modified: geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat?rev=1384485&r1=1384484&r2=1384485&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
(original)
+++ geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
Thu Sep 13 19:37:52 2012
@@ -274,8 +274,8 @@ goto end
 :doDebug
 shift
 set _EXECJAVA=%_RUNJDB%
-set JDB=jdb
-set CONSOLE_OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
+set MODE=jdb
+set CONSOLE_OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true
 if not "%JDB_SRCPATH%" == "" goto gotJdbSrcPath
 set JDB_SRCPATH=%GERONIMO_HOME%\src
 :gotJdbSrcPath
@@ -308,7 +308,8 @@ set _EXECJAVA=%_RUNJAVA%
 goto setHelpEnd
 :setNonHelp
 @REM if it is not to print help information, open another window
-set _EXECJAVA=start /B "Geronimo Application Server" /d"%GERONIMO_HOME%\bin" %GERONIMO_WIN_START_ARGS%
internalLauncher.bat
+set _EXECJAVA=start /B "Geronimo Application Server" /d"%GERONIMO_HOME%\bin" %GERONIMO_WIN_START_ARGS%
%_RUNJAVA%
+set MODE=start
 :setHelpEnd
 set CONSOLE_OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false
 goto execCmd
@@ -338,12 +339,17 @@ if exist "%JAVA_AGENT_JAR%" set JAVA_AGE
 cmd /c exit /b 0
 
 @REM Execute Java with the applicable properties
-if not "%JDB%" == "" goto doJDB
+if "%MODE%" == "jdb" goto doJDB
+if "%MODE%" == "start" goto doStart
 %_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% %CONSOLE_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"
-Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%"
-Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed"
-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%"
-classpath "%CLASSPATH%" %MAINCLASS% %_LONG_OPT% %CMD_LINE_ARGS%
 goto end
 
 :doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -sourcepath "%JDB_SRCPATH%" %CONSOLE_OPTS%
-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%"
-Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%" -Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties"
-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext"
-Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath "%CLASSPATH%" %MAINCLASS% %CMD_LINE_ARGS%
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" %CONSOLE_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"
-Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%"
-Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed"
-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%"
-classpath "%CLASSPATH%";"%JAVA_AGENT_JAR%" %MAINCLASS% %CMD_LINE_ARGS%
+goto end
+
+:doStart
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% %CONSOLE_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"
-Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%"
-Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed"
-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%"
-classpath "%CLASSPATH%" %MAINCLASS% %_LONG_OPT% %CMD_LINE_ARGS% >> "%GERONIMO_SERVER%\var\log\geronimo.out"
2>&1
 goto end
 
 :end



Mime
View raw message