svn commit: r916901 - in /geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin: geronimo.bat internalLauncher.bat

[ca...@apache.org]

Author: caijunj
Date: Sat Feb 27 03:06:54 2010
New Revision: 916901

URL: http://svn.apache.org/viewvc?rev=916901&view=rev
Log:
GERONIMO-5159 - Add pause when startup.bat fails on Windows

Added:
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat   (with props)
Modified:
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat

Modified: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat?rev=916901&r1=916900&r2=916901&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat (original)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat Sat Feb 27 03:06:54 2010
@@ -276,7 +276,7 @@
 @REM use long format of startup progress to be consistent with
 @REM the unix version of the start processing
 set _LONG_OPT=--long
-set _EXECJAVA=start "Geronimo" %GERONIMO_WIN_START_ARGS% %_RUNJAVA%
+set _EXECJAVA=start "Geronimo" %GERONIMO_WIN_START_ARGS% internalLauncher.bat
 goto execCmd
 
 :doStop

Added: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat?rev=916901&view=auto
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat (added)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat Sat Feb 27 03:06:54 2010
@@ -0,0 +1,25 @@
+@REM
+@REM  Licensed to the Apache Software Foundation (ASF) under one or more
+@REM  contributor license agreements.  See the NOTICE file distributed with
+@REM  this work for additional information regarding copyright ownership.
+@REM  The ASF licenses this file to You under the Apache License, Version 2.0
+@REM  (the "License"); you may not use this file except in compliance with
+@REM  the License.  You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an "AS IS" BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
+
+@REM ---------------------------------------------------------------------------
+@REM $Rev$ $Date$ 
+@REM ---------------------------------------------------------------------------
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
+
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
+if not %errorlevel% == 0 pause
+exit %errorlevel%

Propchange: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/internalLauncher.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain