Skip to content

Commit 3171357

Browse files
lvcalvca
committed
Cleaned scripts
1 parent 6d4c26b commit 3171357

4 files changed

Lines changed: 80 additions & 74 deletions

File tree

‎distributed/script/dserver.bat‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
@echo off
22
rem
3-
rem Copyright (c) 2009-2012 Luca Garulli @www.orientechnologies.com
3+
rem Copyright (c) 1999-2012 Luca Garulli @www.orientechnologies.com
44
rem
55

6-
echo .
7-
echo .` `
8-
echo , `:.
9-
echo `,` ,:`
10-
echo .,. :,,
11-
echo .,, ,,,
12-
echo . .,.::::: ````
13-
echo ,` .::,,,,::.,,,,,,`;; .:
14-
echo `,. ::,,,,,,,:.,,.` ` .:
15-
echo ,,:,:,,,,,,,,::. ` ` `` .:
16-
echo ,,:.,,,,,,,,,: `::, ,, ::,::` : :,::` ::::
17-
echo ,:,,,,,,,,,,::,: ,, :. : :: : .:
18-
echo :,,,,,,,,,,:,:: ,, : : : : .:
19-
echo ` :,,,,,,,,,,:,::, ,, .:::::::: : : .:
20-
echo `,...,,:,,,,,,,,,: .:,. ,, ,, : : .:
21-
echo .,,,,::,,,,,,,: `: , ,, : ` : : .:
22-
echo ...,::,,,,::.. `: .,, :, : : : .:
23-
echo ,::::,,,. `: ,, ::::: : : .:
24-
echo ,,:` `,,.
25-
echo ,,, .,`
26-
echo ,,. `, D B S E R V E R
27-
echo `` `.
28-
echo ``
29-
echo `
6+
echo .
7+
echo .` `
8+
echo , `:.
9+
echo `,` ,:`
10+
echo .,. :,,
11+
echo .,, ,,,
12+
echo . .,.::::: ```` ::::::::: :::::::::
13+
echo ,` .::,,,,::.,,,,,,`;; .: :::::::::: ::: :::
14+
echo `,. ::,,,,,,,:.,,.` ` .: ::: ::: ::: :::
15+
echo ,,:,:,,,,,,,,::. ` ` `` .: ::: ::: ::: :::
16+
echo ,,:.,,,,,,,,,: `::, ,, ::,::` : :,::` :::: ::: ::: ::: :::
17+
echo ,:,,,,,,,,,,::,: ,, :. : :: : .: ::: ::: :::::::
18+
echo :,,,,,,,,,,:,:: ,, : : : : .: ::: ::: :::::::::
19+
echo ` :,,,,,,,,,,:,::, ,, .:::::::: : : .: ::: ::: ::: :::
20+
echo `,...,,:,,,,,,,,,: .:,. ,, ,, : : .: ::: ::: ::: :::
21+
echo .,,,,::,,,,,,,: `: , ,, : ` : : .: ::: ::: ::: :::
22+
echo ...,::,,,,::.. `: .,, :, : : : .: ::::::::::: ::: :::
23+
echo ,::::,,,. `: ,, ::::: : : .: ::::::::: ::::::::::
24+
echo ,,:` `,,.
25+
echo ,,, .,`
26+
echo ,,. `, GRAPH DATABASE
27+
echo `` `. DISTRIBUTED
28+
echo `` www.orientdb.org
29+
echo `
3030

3131
rem Guess ORIENTDB_HOME if not defined
3232
set CURRENT_DIR=%cd%
@@ -41,7 +41,7 @@ set JAVA="%JAVA_HOME%\bin\java"
4141
:okJava
4242
if not "%ORIENTDB_HOME%" == "" goto gotHome
4343
set ORIENTDB_HOME=%CURRENT_DIR%
44-
if exist "%ORIENTDB_HOME%\bin\cserver.bat" goto okHome
44+
if exist "%ORIENTDB_HOME%\bin\server.bat" goto okHome
4545
cd ..
4646
set ORIENTDB_HOME=%cd%
4747
cd %CURRENT_DIR%
@@ -63,14 +63,13 @@ shift
6363
goto setArgs
6464

6565
:doneSetArgs
66-
set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-dserver-config.xml
66+
67+
if NOT exist "%CONFIG_FILE%" set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-dserver-config.xml
68+
6769
set LOG_FILE=%ORIENTDB_HOME%/config/orientdb-server-log.properties
68-
set LOG_CONSOLE_LEVEL=info
69-
set LOG_FILE_LEVEL=fine
7070
set WWW_PATH=%ORIENTDB_HOME%/www
71-
REM UNCOMMENT BELOW TO DISABLE THE CACHE
72-
set ORIENTDB_SETTINGS=-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.strategy=1
73-
set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true
71+
set ORIENTDB_SETTINGS=-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.enabled=false -Dcache.level2.size=0
72+
set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8
7473

7574
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%
7675

‎distributed/script/dserver.sh‎

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2009-2012 Luca Garulli
3+
# Copyright (c) 2009-2013 Luca Garulli
44
#
55

6-
echo " . "
7-
echo " .\` \` "
8-
echo " , \`:. "
9-
echo " \`,\` ,:\` "
10-
echo " .,. :,, "
11-
echo " .,, ,,, "
12-
echo " . .,.::::: \`\`\`\` "
13-
echo " ,\` .::,,,,::.,,,,,,\`;; .: "
14-
echo " \`,. ::,,,,,,,:.,,.\` \` .: "
15-
echo " ,,:,:,,,,,,,,::. \` \` \`\` .: "
16-
echo " ,,:.,,,,,,,,,: \`::, ,, ::,::\` : :,::\` :::: "
17-
echo " ,:,,,,,,,,,,::,: ,, :. : :: : .: "
18-
echo " :,,,,,,,,,,:,:: ,, : : : : .: "
19-
echo " \` :,,,,,,,,,,:,::, ,, .:::::::: : : .: "
20-
echo " \`,...,,:,,,,,,,,,: .:,. ,, ,, : : .: "
21-
echo " .,,,,::,,,,,,,: \`: , ,, : \` : : .: "
22-
echo " ...,::,,,,::.. \`: .,, :, : : : .: "
23-
echo " ,::::,,,. \`: ,, ::::: : : .: "
24-
echo " ,,:\` \`,,. "
25-
echo " ,,, .,\` "
26-
echo " ,,. \`, S E R V E R "
27-
echo " \`\` \`. "
28-
echo " \`\` "
29-
echo " \` "
6+
echo " . "
7+
echo " .\` \` "
8+
echo " , \`:. "
9+
echo " \`,\` ,:\` "
10+
echo " .,. :,, "
11+
echo " .,, ,,, "
12+
echo " . .,.::::: \`\`\`\` ::::::::: ::::::::: "
13+
echo " ,\` .::,,,,::.,,,,,,\`;; .: :::::::::: ::: ::: "
14+
echo " \`,. ::,,,,,,,:.,,.\` \` .: ::: ::: ::: ::: "
15+
echo " ,,:,:,,,,,,,,::. \` \` \`\` .: ::: ::: ::: ::: "
16+
echo " ,,:.,,,,,,,,,: \`::, ,, ::,::\` : :,::\` :::: ::: ::: ::: ::: "
17+
echo " ,:,,,,,,,,,,::,: ,, :. : :: : .: ::: ::: ::::::: "
18+
echo " :,,,,,,,,,,:,:: ,, : : : : .: ::: ::: ::::::::: "
19+
echo " \` :,,,,,,,,,,:,::, ,, .:::::::: : : .: ::: ::: ::: ::: "
20+
echo " \`,...,,:,,,,,,,,,: .:,. ,, ,, : : .: ::: ::: ::: ::: "
21+
echo " .,,,,::,,,,,,,: \`: , ,, : \` : : .: ::: ::: ::: ::: "
22+
echo " ...,::,,,,::.. \`: .,, :, : : : .: ::::::::::: ::: ::: "
23+
echo " ,::::,,,. \`: ,, ::::: : : .: ::::::::: :::::::::: "
24+
echo " ,,:\` \`,,. "
25+
echo " ,,, .,\` "
26+
echo " ,,. \`, GRAPH DATABASE "
27+
echo " \`\` \`. DISTRIBUTED "
28+
echo " \`\` www.orientdb.org "
29+
echo " \` "
30+
31+
cd "$(dirname "$0")"
3032

3133
# resolve links - $0 may be a softlink
3234
PRG="$0"
@@ -48,13 +50,22 @@ PRGDIR=`dirname "$PRG"`
4850
[ -f "$ORIENTDB_HOME"/bin/orient.sh ] || ORIENTDB_HOME=`cd "$PRGDIR/.." ; pwd`
4951
export ORIENTDB_HOME
5052

51-
CONFIG_FILE=$ORIENTDB_HOME/config/orientdb-dserver-config.xml
53+
if [ ! -f "${CONFIG_FILE}" ]
54+
then
55+
CONFIG_FILE=$ORIENTDB_HOME/config/orientdb-dserver-config.xml
56+
fi
57+
58+
# Set JavaHome if it exists
59+
if [ -f "${JAVA_HOME}/bin/java" ]; then
60+
JAVA=${JAVA_HOME}/bin/java
61+
else
62+
JAVA=java
63+
fi
64+
export JAVA
65+
5266
LOG_FILE=$ORIENTDB_HOME/config/orientdb-server-log.properties
53-
LOG_CONSOLE_LEVEL=info
54-
LOG_FILE_LEVEL=fine
5567
WWW_PATH=$ORIENTDB_HOME/www
56-
#UNCOMMENT BELOW TO DISABLE THE CACHE
57-
ORIENTDB_SETTINGS=-Dcache.level1.enabled=false
58-
JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
68+
ORIENTDB_SETTINGS="-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.enabled=false"
69+
JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8"
5970

60-
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
71+
$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

‎server/script/server.bat‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22
rem
3-
rem Copyright (c) 1999-2012 Luca Garulli @www.orientechnologies.com
3+
rem Copyright (c) 1999-2013 Luca Garulli @www.orientechnologies.com
44
rem
55

66
echo .
@@ -67,12 +67,10 @@ goto setArgs
6767
if NOT exist "%CONFIG_FILE%" set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-server-config.xml
6868

6969
set LOG_FILE=%ORIENTDB_HOME%/config/orientdb-server-log.properties
70-
set LOG_CONSOLE_LEVEL=info
71-
set LOG_FILE_LEVEL=fine
7270
set WWW_PATH=%ORIENTDB_HOME%/www
7371
set ORIENTDB_SETTINGS=-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.enabled=false -Dcache.level2.size=0
74-
set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true
72+
set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8
7573

76-
call %JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% %ORIENTDB_SETTINGS% -Dfile.encoding=UTF8 -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%
74+
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%
7775

78-
:end
76+
:end

‎server/script/server.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@ fi
6464
export JAVA
6565

6666
LOG_FILE=$ORIENTDB_HOME/config/orientdb-server-log.properties
67-
LOG_CONSOLE_LEVEL=info
68-
LOG_FILE_LEVEL=fine
6967
WWW_PATH=$ORIENTDB_HOME/www
7068
ORIENTDB_SETTINGS="-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.enabled=false"
71-
JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
69+
JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8"
7270

73-
$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT $ORIENTDB_SETTINGS -Dfile.encoding=UTF8 -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
71+
$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

0 commit comments

Comments
 (0)