fix bug #442: correct erroneous line separators, that occur when windows-encoded files are commited from unix

This commit is contained in:
michi 2005-12-01 08:41:40 +00:00
parent f2f23f82e8
commit 11dc7d3651

View file

@ -1,79 +1,79 @@
@echo off @echo off
rem Batch file for Starting Helma with a JDK-like virtual machine. rem Batch file for Starting Helma with a JDK-like virtual machine.
rem To add jar files to the classpath, simply place them into the rem To add jar files to the classpath, simply place them into the
rem lib/ext directory of this Helma installation. rem lib/ext directory of this Helma installation.
:: Initialize variables :: Initialize variables
:: (don't touch this section) :: (don't touch this section)
set JAVA_HOME= set JAVA_HOME=
set HOP_HOME= set HOP_HOME=
set HTTP_PORT= set HTTP_PORT=
set XMLRPC_PORT= set XMLRPC_PORT=
set AJP13_PORT= set AJP13_PORT=
set RMI_PORT= set RMI_PORT=
set OPTIONS= set OPTIONS=
:: Set TCP ports for Helma servers :: Set TCP ports for Helma servers
:: (comment/uncomment to de/activate) :: (comment/uncomment to de/activate)
set HTTP_PORT=8080 set HTTP_PORT=8080
rem set XMLRPC_PORT=8081 rem set XMLRPC_PORT=8081
rem set AJP13_PORT=8009 rem set AJP13_PORT=8009
rem set RMI_PORT=5050 rem set RMI_PORT=5050
:: Uncomment to set HOP_HOME :: Uncomment to set HOP_HOME
rem set HOP_HOME=c:\program files\helma rem set HOP_HOME=c:\program files\helma
:: Uncomment to set JAVA_HOME variable :: Uncomment to set JAVA_HOME variable
rem set JAVA_HOME=c:\program files\java rem set JAVA_HOME=c:\program files\java
:: Uncomment to pass options to the Java virtual machine :: Uncomment to pass options to the Java virtual machine
rem set JAVA_OPTIONS=-server -Xmx128m rem set JAVA_OPTIONS=-server -Xmx128m
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: No user configuration needed below this line ::::::: :::::: No user configuration needed below this line :::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Setting the script path :: Setting the script path
set INSTALL_DIR=%~d0%~p0 set INSTALL_DIR=%~d0%~p0
:: Using JAVA_HOME variable if defined. Otherwise, :: Using JAVA_HOME variable if defined. Otherwise,
:: Java executable must be contained in PATH variable :: Java executable must be contained in PATH variable
if "%JAVA_HOME%"=="" goto default if "%JAVA_HOME%"=="" goto default
set JAVACMD=%JAVA_HOME%\bin\java set JAVACMD=%JAVA_HOME%\bin\java
goto end goto end
:default :default
set JAVACMD=java set JAVACMD=java
:end :end
:: Setting HOP_HOME to script path if undefined :: Setting HOP_HOME to script path if undefined
if "%HOP_HOME%"=="" ( if "%HOP_HOME%"=="" (
set HOP_HOME=%INSTALL_DIR% set HOP_HOME=%INSTALL_DIR%
) )
cd %HOP_HOME% cd %HOP_HOME%
:: Setting Helma server options :: Setting Helma server options
if not "%HTTP_PORT%"=="" ( if not "%HTTP_PORT%"=="" (
echo Starting HTTP server on port %HTTP_PORT% echo Starting HTTP server on port %HTTP_PORT%
set OPTIONS=%OPTIONS% -w %HTTP_PORT% set OPTIONS=%OPTIONS% -w %HTTP_PORT%
) )
if not "%XMLRPC_PORT%"=="" ( if not "%XMLRPC_PORT%"=="" (
echo Starting XML-RPC server on port %XMLRPC_PORT% echo Starting XML-RPC server on port %XMLRPC_PORT%
set OPTIONS=%OPTIONS% -x %XMLRPC_PORT% set OPTIONS=%OPTIONS% -x %XMLRPC_PORT%
) )
if not "%AJP13_PORT%"=="" ( if not "%AJP13_PORT%"=="" (
echo Starting AJP13 listener on port %AJP13_PORT% echo Starting AJP13 listener on port %AJP13_PORT%
set OPTIONS=%OPTIONS% -jk %AJP13_PORT% set OPTIONS=%OPTIONS% -jk %AJP13_PORT%
) )
if not "%RMI_PORT%"=="" ( if not "%RMI_PORT%"=="" (
echo Starting RMI server on port %RMI_PORT% echo Starting RMI server on port %RMI_PORT%
set OPTIONS=%OPTIONS% -p %RMI_PORT% set OPTIONS=%OPTIONS% -p %RMI_PORT%
) )
if not "%HOP_HOME%"=="" ( if not "%HOP_HOME%"=="" (
echo Serving applications from %HOP_HOME% echo Serving applications from %HOP_HOME%
set OPTIONS=%OPTIONS% -h "%HOP_HOME% set OPTIONS=%OPTIONS% -h "%HOP_HOME%
) )
:: Invoking the Java virtual machine :: Invoking the Java virtual machine
%JAVACMD% %JAVA_OPTIONS% -jar "%INSTALL_DIR%\launcher.jar" %OPTIONS% %JAVACMD% %JAVA_OPTIONS% -jar "%INSTALL_DIR%\launcher.jar" %OPTIONS%