* Fixed typo in start.bat preventing it from running
* Removed -server and -Xmx256m options from JAVA_OPTIONS string in start.sh and start.bat to prevent errors when server JVM is not installed (memory setting is not faulty but not necessary for desktop installations either)
This commit is contained in:
parent
3d3bfe7ee0
commit
70dfe34b2f
2 changed files with 6 additions and 6 deletions
|
@ -42,7 +42,7 @@ rem set CONFIGFILE=./etc/jetty.xml
|
|||
rem set HOP_HOME="c:\program files\helma"
|
||||
rem set JAVA_HOME="c:\program files\java"
|
||||
|
||||
set JAVA_OPTIONS="-server -Xmx256m -Djava.awt.headless=true -Dfile.encoding=utf-8"
|
||||
set JAVA_OPTIONS=-Djava.awt.headless=true -Dfile.encoding=utf-8
|
||||
|
||||
set INSTALL_DIR=%~d0%~p0
|
||||
|
||||
|
@ -58,10 +58,10 @@ if "%HOP_HOME%"=="" (
|
|||
)
|
||||
cd %HOP_HOME%
|
||||
|
||||
if not "%CONFIG_FILE%"="" (
|
||||
echo Using configuration file %CONFIG_FILE%
|
||||
set OPTION=%OPTIONS% -c %CONFIG_FILE%
|
||||
goto java
|
||||
if not "%CONFIG_FILE%"=="" (
|
||||
echo Using configuration file %CONFIG_FILE%
|
||||
set OPTION=%OPTIONS% -c %CONFIG_FILE%
|
||||
goto java
|
||||
)
|
||||
if not "%HTTP_PORT%"=="" (
|
||||
echo Starting HTTP server on port %HTTP_PORT%
|
||||
|
|
|
@ -33,7 +33,7 @@ HTTP_PORT=8080
|
|||
#JAVA_HOME=/usr/lib/java
|
||||
#HOP_HOME=/usr/local/helma
|
||||
|
||||
JAVA_OPTIONS="-server -Xmx256m -Djava.awt.headless=true -Dfile.encoding=utf-8"
|
||||
JAVA_OPTIONS="-Djava.awt.headless=true -Dfile.encoding=utf-8"
|
||||
|
||||
if [ "$JAVA_HOME" ]; then
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
|
|
Loading…
Add table
Reference in a new issue