Author: andygumbrecht
Date: Mon Dec 6 10:54:06 2010
New Revision: 1042568
URL: http://svn.apache.org/viewvc?rev=1042568&view=rev
Log:
Updated a more robust self discovering openejb.bat, and simple start/stop
helper batches.
Also resolves the issue of spaces in directory names, which came up today on
the user list.
Added:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Start.bat
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Stop.bat
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat
Added:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Start.bat
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Start.bat?rev=1042568&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Start.bat
(added)
+++
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Start.bat
Mon Dec 6 10:54:06 2010
@@ -0,0 +1,16 @@
+...@echo off
+
+...@if not "%ECHO%" == "" echo %ECHO%
+...@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set DIRNAME=.\
+)
+
+pushd "%DIRNAME%"
+
+cd ..
+
+cmd /C ".\bin\openejb.bat start"
\ No newline at end of file
Added:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Stop.bat
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Stop.bat?rev=1042568&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Stop.bat
(added)
+++
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/Stop.bat
Mon Dec 6 10:54:06 2010
@@ -0,0 +1,16 @@
+...@echo off
+
+...@if not "%ECHO%" == "" echo %ECHO%
+...@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set DIRNAME=.\
+)
+
+pushd "%DIRNAME%"
+
+cd ..
+
+cmd /C ".\bin\openejb.bat stop"
\ No newline at end of file
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=1042568&r1=1042567&r2=1042568&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 Dec 6 10:54:06 2010
@@ -1,4 +1,5 @@
@echo off
+CLS
REM================================================
REM Licensed to the Apache Software Foundation (ASF) under one or more
REM contributor license agreements. See the NOTICE file distributed with
@@ -18,22 +19,56 @@ REM ____________________________________
REM $Rev$ $Date$
REM================================================
-SETLOCAL
+...@echo off
+rem -------------------------------------------------------------------------
+rem Manager Bootstrap Script for Windows
+rem -------------------------------------------------------------------------
+
+...@if not "%ECHO%" == "" echo %ECHO%
+...@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set "DIRNAME=.\"
+)
+
+pushd "%DIRNAME%
+
+REM echo Path is: "%DIRNAME%"
+set OPENEJB_HOME=.
+
+cd ..
-set OPENEJB_CORE_JAR=%OPENEJB_HOME%/lib/openejb-core-${version}.jar
-set OPENEJB_JAVAAGENT_JAR=%OPENEJB_HOME%/lib/openejb-javaagent-${version}.jar
+set "OPENEJB_HOME=%CD%"
-rem find OPENEJB_HOME if it does not exist due to either an invalid value
passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%OPENEJB_CORE_JAR%" goto openejbHomeSet
+REM echo OPENEJB_HOME is: %OPENEJB_HOME%
+
+set OPENEJB_CORE_JAR="%OPENEJB_HOME%\lib\openejb-core-*.jar"
+set OPENEJB_JAVAAGENT_JAR="%OPENEJB_HOME%\lib\openejb-javaagent-*.jar"
+
+for %%a in (%OPENEJB_CORE_JAR%) do (
+ set OPENEJB_CORE_JAR="%%a"
+)
+
+for %%a in (%OPENEJB_JAVAAGENT_JAR%) do (
+ set OPENEJB_JAVAAGENT_JAR="%%a"
+)
+
+REM echo OPENEJB_CORE_JAR is: %OPENEJB_CORE_JAR%
+REM echo OPENEJB_JAVAAGENT_JAR is: %OPENEJB_JAVAAGENT_JAR%
+
+if exist %OPENEJB_CORE_JAR% goto openejbHomeSet
:noOpenEJBHome
-echo OPENEJB_HOME is set incorrectly or OpenEJB could not be located. Please
set OPENEJB_HOME.
+echo OPENEJB_HOME is set incorrectly or OpenEJB could not be located. Please
set "%OPENEJB_HOME%".
goto EOF
:openejbHomeSet
set OPTIONS=-Dopenejb.home=%OPENEJB_HOME%
+REM echo %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar
%OPENEJB_CORE_JAR% %*
+
java %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR%
%*
:EOF
