From 60e869bac22a83a5df8b795787382e9407e3341a Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Sat, 30 Sep 2017 17:11:43 +0300 Subject: [PATCH 1/4] Update Windows-Service.md Add to "installService.bat" 3rd parameter with password for root-user to be able shutdown server by windows service (#6552) --- Windows-Service.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Windows-Service.md b/Windows-Service.md index ebf20805..81104ea6 100644 --- a/Windows-Service.md +++ b/Windows-Service.md @@ -77,6 +77,11 @@ set str=%~2 rem Check OrientDB Home location parameter if "%str%" == "" goto missingOrientDBHome set ORIENTDB_HOME=%str% +rem Remove surrounding quotes from the third parameter +set str=%~3 +rem Check root password to stop server +if "%str%" == "" goto missingRootPassword +set ROOT_PASSWORD=%str% set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-server-config.xml set LOG_FILE=%ORIENTDB_HOME%/config/orientdb-server-log.properties @@ -92,7 +97,7 @@ OrientDBGraphX.X.X.exe //IS --DisplayName="OrientDB GraphEd X.X.X" ^ --Description="OrientDB Graph Edition, aka GraphEd, contains OrientDB server integrated with the latest release of the TinkerPop Open Source technology stack supporting property graph data model." ^ --StartClass=com.orientechnologies.orient.server.OServerMain --StopClass=com.orientechnologies.orient.server.OServerShutdownMain ^ --Classpath="%ORIENTDB_HOME%\lib\*" --JvmOptions=-Dfile.encoding=%ORIENTDB_ENCODING%;-Djava.util.logging.config.file="%LOG_FILE%";-Dorientdb.config.file="%CONFIG_FILE%";-Dorientdb.www.path="%WWW_PATH%";-Dlog.console.level=%LOG_CONSOLE_LEVEL%;-Dlog.file.level=%LOG_FILE_LEVEL%;-Dorientdb.build.number="@BUILD@";-DORIENTDB_HOME="%ORIENTDB_HOME%" ^ ---StartMode=jvm --StartPath="%ORIENTDB_HOME%\bin" --StopMode=jvm --StopPath="%ORIENTDB_HOME%\bin" --Jvm="%JVM_DLL%" --LogPath="%ORIENTDB_HOME%\log" --Startup=auto +--StartMode=jvm --StartPath="%ORIENTDB_HOME%\bin" --StopMode=jvm --StopPath="%ORIENTDB_HOME%\bin" --StopParams=-p#%ROOT_PASSWORD% --Jvm="%JVM_DLL%" --LogPath="%ORIENTDB_HOME%\log" --Startup=auto EXIT /B @@ -104,9 +109,13 @@ goto printUsage echo Insert the OrientDB Home goto printUsage +:missingRootPassword +echo Insert the root password +goto printUsage + :printUsage echo usage: -echo installService JVM_DLL_location OrientDB_Home +echo installService JVM_DLL_location OrientDB_Home root_password EXIT /B ``` @@ -114,6 +123,7 @@ The script requires two input parameters: 1. The location of jvm.dll, for example _C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll_ 1. The location of the OrientDB installation folder, for example *D:\orientdb-graphed-1.0rc5* +1. The password for root user (to stop server) The service is actually installed when executing **OrientDBGraph.exe** (originally prunsrv) with the appropriate set of command line arguments and parameters. The command line argument **//IS** states that the execution of that application will result in a service installation. @@ -140,7 +150,7 @@ In order to install the service: 1. Open the Windows command shell 1. Go to _%ORIENTDB_HOME%\service_, for example typing in the shell > cd D:\orientdb-graphed-1.0rc5\service -1. Execute the *installService.bat* specifying the *jvm.dll* location and the OrientDB Home as full paths, for example typing in the shell > installService.bat "C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll" D:\orientdb-graphed-1.0rc5 +1. Execute the *installService.bat* specifying the *jvm.dll* location and the OrientDB Home as full paths, for example typing in the shell > installService.bat "C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll" D:\orientdb-graphed-1.0rc5 password 1. Open the Windows Services Management Console - from the taskbar, click on *Start*, *Control Panel*, *Administrative Tools* and then *Service* - and check the existance of a service with the same name specified as value of the --DisplayName parameter (in this case **OrientDB GraphEd 1.0rc5**). You can also use _%ORIENTDB_HOME%\service\OrientDBGraphw.exe_ to manage and monitor the *OrientDBGraph* service. From 7f3c6314935bd16faef69cb9aa37e7697a909cd3 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Mon, 2 Oct 2017 14:24:20 +0300 Subject: [PATCH 2/4] Fix mistake in Windows-Service.md --- Windows-Service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Windows-Service.md b/Windows-Service.md index 81104ea6..9e195256 100644 --- a/Windows-Service.md +++ b/Windows-Service.md @@ -119,7 +119,7 @@ echo installService JVM_DLL_location OrientDB_Home root_password EXIT /B ``` -The script requires two input parameters: +The script requires three input parameters: 1. The location of jvm.dll, for example _C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll_ 1. The location of the OrientDB installation folder, for example *D:\orientdb-graphed-1.0rc5* From 89c99ca86b7550ff4a635d7d3ab1cd9aaa093595 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Mon, 2 Oct 2017 14:29:43 +0300 Subject: [PATCH 3/4] Update Windows-Service.md Set password value the same as in Tutorial-Run-the-server.html --- Windows-Service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Windows-Service.md b/Windows-Service.md index 9e195256..067e5940 100644 --- a/Windows-Service.md +++ b/Windows-Service.md @@ -150,7 +150,7 @@ In order to install the service: 1. Open the Windows command shell 1. Go to _%ORIENTDB_HOME%\service_, for example typing in the shell > cd D:\orientdb-graphed-1.0rc5\service -1. Execute the *installService.bat* specifying the *jvm.dll* location and the OrientDB Home as full paths, for example typing in the shell > installService.bat "C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll" D:\orientdb-graphed-1.0rc5 password +1. Execute the *installService.bat* specifying the *jvm.dll* location and the OrientDB Home as full paths, for example typing in the shell > installService.bat "C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll" D:\orientdb-graphed-1.0rc5 ROOT_PASSWORD 1. Open the Windows Services Management Console - from the taskbar, click on *Start*, *Control Panel*, *Administrative Tools* and then *Service* - and check the existance of a service with the same name specified as value of the --DisplayName parameter (in this case **OrientDB GraphEd 1.0rc5**). You can also use _%ORIENTDB_HOME%\service\OrientDBGraphw.exe_ to manage and monitor the *OrientDBGraph* service. From fadab3deb10919a900a1ec2bb3c4cea1cbce0c56 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Mon, 2 Oct 2017 15:54:40 +0300 Subject: [PATCH 4/4] fix unmerged rows --- Windows-Service.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Windows-Service.md b/Windows-Service.md index 21bc7d13..97d78e64 100644 --- a/Windows-Service.md +++ b/Windows-Service.md @@ -151,13 +151,8 @@ In order to install the service: 1. Open the Windows command shell 1. Go to _%ORIENTDB_HOME%\service_, for example typing in the shell > cd D:\orientdb-graphed-1.0rc5\service -<<<<<<< HEAD 1. Execute the *installService.bat* specifying the *jvm.dll* location and the OrientDB Home as full paths, for example typing in the shell > installService.bat "C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll" D:\orientdb-graphed-1.0rc5 ROOT_PASSWORD -1. Open the Windows Services Management Console - from the taskbar, click on *Start*, *Control Panel*, *Administrative Tools* and then *Service* - and check the existance of a service with the same name specified as value of the --DisplayName parameter (in this case **OrientDB GraphEd 1.0rc5**). You can also use _%ORIENTDB_HOME%\service\OrientDBGraphw.exe_ to manage and monitor the *OrientDBGraph* service. -======= -1. Execute the *installService.bat* specifying the *jvm.dll* location and the OrientDB Home as full paths, for example typing in the shell > installService.bat "C:\Program Files\Java\jdk1.6.0_26\jre\bin\server\jvm.dll" D:\orientdb-graphed-1.0rc5 1. Open the Windows Services Management Console - from the taskbar, click on *Start*, *Control Panel*, *Administrative Tools* and then *Service* - and check the existance of a service with the same name specified as value of the --DisplayName parameter (in this case **OrientDB GraphEd X.X.X**). You can also use _%ORIENTDB_HOME%\service\OrientDBGraphw.exe_ to manage and monitor the *OrientDBGraph* service. ->>>>>>> 2.2.x ## Uninstallation