Fixed issue orientechnologies#1322 adding -Djava.awt.headless=true to…

… all .bat and -sh
pellyadolfo · May 10, 2013 · 56bce13 · 56bce13
1 parent 77bcad4
commit 56bce13
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 21 deletions.
diff --git a/distributed/script/aserver.bat b/distributed/script/aserver.bat
@@ -70,7 +70,7 @@ set LOG_FILE_LEVEL=fine
 set WWW_PATH=%ORIENTDB_HOME%/www
 REM UNCOMMENT BELOW TO DISABLE THE CACHE
 set ORIENTDB_SETTINGS=-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.strategy=1
-set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError
+set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true
 
 call %JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% %ORIENTDB_SETTINGS% -Djava.util.logging.config.file="%LOG_FILE%" -Dorientdb.config.file="%CONFIG_FILE%" -Dorientdb.www.path="%WWW_PATH%" -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;" com.orientechnologies.orient.server.OServerMain %CMD_LINE_ARGS%
 

diff --git a/distributed/script/aserver.sh b/distributed/script/aserver.sh
@@ -55,6 +55,6 @@ LOG_FILE_LEVEL=fine
 WWW_PATH=$ORIENTDB_HOME/www
 #UNCOMMENT BELOW TO DISABLE THE CACHE
 ORIENTDB_SETTINGS=-Dcache.level1.enabled=false
-JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError
+JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
 
 java -server $JAVA_OPTS $JAVA_OPTS_SCRIPT $ORIENTDB_SETTINGS -Djava.util.logging.config.file="$LOG_FILE" -Dorientdb.config.file="$CONFIG_FILE" -Dorientdb.www.path="$WWW_PATH" -Dorientdb.build.number="@BUILD@" -cp "$ORIENTDB_HOME/lib/orientdb-server-@[email protected]:$ORIENTDB_HOME/lib/*" com.orientechnologies.orient.server.OServerMain
diff --git a/distributed/script/dserver.bat b/distributed/script/dserver.bat
@@ -70,7 +70,7 @@ set LOG_FILE_LEVEL=fine
 set WWW_PATH=%ORIENTDB_HOME%/www
 REM UNCOMMENT BELOW TO DISABLE THE CACHE
 set ORIENTDB_SETTINGS=-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.strategy=1
-set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError
+set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true
 
 call %JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% %ORIENTDB_SETTINGS% -Djava.util.logging.config.file="%LOG_FILE%" -Dorientdb.config.file="%CONFIG_FILE%" -Dorientdb.www.path="%WWW_PATH%" -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;" com.orientechnologies.orient.server.OServerMain %CMD_LINE_ARGS%
 

diff --git a/distributed/script/dserver.sh b/distributed/script/dserver.sh
@@ -55,6 +55,6 @@ LOG_FILE_LEVEL=fine
 WWW_PATH=$ORIENTDB_HOME/www
 #UNCOMMENT BELOW TO DISABLE THE CACHE
 ORIENTDB_SETTINGS=-Dcache.level1.enabled=false
-JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError
+JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
 
 java -server $JAVA_OPTS $JAVA_OPTS_SCRIPT $ORIENTDB_SETTINGS -Djava.util.logging.config.file="$LOG_FILE" -Dorientdb.config.file="$CONFIG_FILE" -Dorientdb.www.path="$WWW_PATH" -Dorientdb.build.number="@BUILD@" -cp "$ORIENTDB_HOME/lib/orientdb-server-@[email protected]:$ORIENTDB_HOME/lib/*" com.orientechnologies.orient.server.OServerMain
diff --git a/graphdb/script/console.bat b/graphdb/script/console.bat
@@ -38,7 +38,7 @@ goto setArgs
 
 :doneSetArgs
 
-set ORIENTDB_SETTINGS=-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=%ORIENTDB_HOME%\config\orientdb-client-log.properties
+set ORIENTDB_SETTINGS=-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=%ORIENTDB_HOME%\config\orientdb-client-log.properties -Djava.awt.headless=true
 call %JAVA% -client %ORIENTDB_SETTINGS% -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;" com.orientechnologies.orient.graph.console.OGremlinConsole %CMD_LINE_ARGS%
 
 :end
diff --git a/graphdb/script/console.sh b/graphdb/script/console.sh
@@ -23,7 +23,7 @@ PRGDIR=`dirname "$PRG"`
 [ -f "$ORIENTDB_HOME"/lib/orientdb-tools-@[email protected] ] || ORIENTDB_HOME=`cd "$PRGDIR/.." ; pwd`
 export ORIENTDB_HOME
 
-ORIENTDB_SETTINGS="-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=$ORIENTDB_HOME/config/orientdb-client-log.properties"
+ORIENTDB_SETTINGS="-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=$ORIENTDB_HOME/config/orientdb-client-log.properties -Djava.awt.headless=true"
 #JAVA_OPTS=-Xmx1024m
 
 java -client $JAVA_OPTS $ORIENTDB_SETTINGS -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" -cp "$ORIENTDB_HOME/lib/orientdb-tools-@[email protected]:$ORIENTDB_HOME/lib/*" com.orientechnologies.orient.graph.console.OGremlinConsole $*
diff --git a/server/script/server.exe b/server/script/server.exe
diff --git a/server/script/server.ini b/server/script/server.ini
diff --git a/server/script/shutdown.bat b/server/script/shutdown.bat
@@ -43,7 +43,7 @@ if NOT exist "%CONFIG_FILE%" set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-ser
 set LOG_FILE=%ORIENTDB_HOME%/config/orientdb-server-log.properties
 set LOG_LEVEL=warning
 set WWW_PATH=%ORIENTDB_HOME%/www
-REM set JAVA_OPTS=-Xms1024m -Xmx1024m
+set JAVA_OPTS=-Djava.awt.headless=true
 
 call %JAVA% -client %JAVA_OPTS% -Dorientdb.config.file="%CONFIG_FILE%" -cp "%ORIENTDB_HOME%\lib\orientdb-tools-@[email protected];%ORIENTDB_HOME%\lib\*" com.orientechnologies.orient.server.OServerShutdownMain %CMD_LINE_ARGS%
 

diff --git a/server/script/shutdown.sh b/server/script/shutdown.sh
@@ -40,7 +40,7 @@ fi
 LOG_FILE=$ORIENTDB_HOME/config/orientdb-server-log.properties
 LOG_LEVEL=warning
 WWW_PATH=$ORIENTDB_HOME/www
-#JAVA_OPTS=-Xms1024m -Xmx1024m
+JAVA_OPTS=-Djava.awt.headless=true
 
 java -client $JAVA_OPTS -Dorientdb.config.file="$CONFIG_FILE" -cp "$ORIENTDB_HOME/lib/orientdb-tools-@[email protected]:$ORIENTDB_HOME/lib/*" com.orientechnologies.orient.server.OServerShutdownMain $*
 

diff --git a/tools/script/console.bat b/tools/script/console.bat
@@ -38,7 +38,7 @@ goto setArgs
 
 :doneSetArgs
 
-set ORIENTDB_SETTINGS=-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=%ORIENTDB_HOME%\config\orientdb-client-log.properties
+set ORIENTDB_SETTINGS=-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=%ORIENTDB_HOME%\config\orientdb-client-log.properties -Djava.awt.headless=true
 call %JAVA% -client %ORIENTDB_SETTINGS% -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;" com.orientechnologies.orient.console.OConsoleDatabaseApp %CMD_LINE_ARGS%
 
 :end
diff --git a/tools/script/console.sh b/tools/script/console.sh
@@ -23,7 +23,7 @@ PRGDIR=`dirname "$PRG"`
 [ -f "$ORIENTDB_HOME"/lib/orientdb-tools-@[email protected] ] || ORIENTDB_HOME=`cd "$PRGDIR/.." ; pwd`
 export ORIENTDB_HOME
 
-ORIENTDB_SETTINGS="-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=$ORIENTDB_HOME/config/orientdb-client-log.properties"
+ORIENTDB_SETTINGS="-Dcache.level1.enabled=false -Dcache.level2.enabled=false -Djava.util.logging.config.file=$ORIENTDB_HOME/config/orientdb-client-log.properties -Djava.awt.headless=true"
 #JAVA_OPTS=-Xmx1024m
 
 java -client $JAVA_OPTS $ORIENTDB_SETTINGS -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" -cp "$ORIENTDB_HOME/lib/orientdb-tools-@[email protected]:$ORIENTDB_HOME/lib/*" com.orientechnologies.orient.console.OConsoleDatabaseApp $*