updated usage for windows gremlin-server.bat
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f5132ea7 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f5132ea7 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f5132ea7 Branch: refs/heads/TINKERPOP-980 Commit: f5132ea7738c320635b771facde904fd90709c1d Parents: 40b35ca Author: Robert Dale <robd...@gmail.com> Authored: Thu Oct 27 12:08:47 2016 -0400 Committer: Robert Dale <robd...@gmail.com> Committed: Thu Nov 17 03:47:40 2016 -0500 ---------------------------------------------------------------------- docs/src/reference/gremlin-applications.asciidoc | 2 ++ docs/src/upgrade/release-3.3.x.asciidoc | 9 ++++++++- gremlin-server/src/main/bin/gremlin-server.bat | 10 ++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5132ea7/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index eea044a..ea8ef2a 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -1011,6 +1011,8 @@ to use to `bin/gremlin-server.sh` as in: bin/gremlin-server.sh conf/gremlin-server-min.yaml ---- +WARNING: On Windows, gremlin-server.bat will always start in the foreground. When no parameter is provided, it will start with the default `conf/gremlin-server.yaml` file. + The following table describes the various YAML configuration options that Gremlin Server expects: [width="100%",cols="3,10,^2",options="header"] http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5132ea7/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 9743d51..e59070b 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -116,8 +116,15 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-1235[TINKERPOP-1235] Gremlin-server.sh and Init Scripts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`gremlin-server.sh` is now also an init script and can no longer be started without parameters. To start it in the foreground, please use the `console` parameter. Also, it will still start in the foreground when provided a yaml configuration file. +`gremlin-server.sh` is now also an init script and can no longer be started without parameters. To start it in the foreground with defaults like previous usage, please use the `console` parameter. Also, `gremlin-server.sh` will continue to start in the foreground when provided a yaml configuration file. How to install as a service has been added to the link:http://tinkerpop.apache.org/docs/3.2.3/reference/#_as_a_service[Reference Documentation - As A Service]. +The switch name has changed for installing dependencies. `-i` has been deprecated and replaced by `install`. + See: link:https://issues.apache.org/jira/browse/TINKERPOP-980[TINKERPOP-980], link:http://tinkerpop.apache.org/docs/3.2.3/reference/#_configuring_2[Reference Documentation - Server Configuration]. + +Gremlin-server.bat +^^^^^^^^^^^^^^^^^^ + +The switch name has changed for installing dependencies. `-i` has been deprecated and replaced by `install`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5132ea7/gremlin-server/src/main/bin/gremlin-server.bat ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/bin/gremlin-server.bat b/gremlin-server/src/main/bin/gremlin-server.bat index d6405fc..8ceab26 100644 --- a/gremlin-server/src/main/bin/gremlin-server.bat +++ b/gremlin-server/src/main/bin/gremlin-server.bat @@ -36,13 +36,19 @@ cd .. set JAVA_OPTIONS=-Xms32m -Xmx512m if "%1" == "" goto server -if "%1" == "-i" goto install +if "%1" == "-i" goto dashi +if "%1" == "install" goto install :server :: Launch the application java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.GremlinServer %* +:dashi + +echo NOTE: -i is deprecated. Please update your scripts. Using 'install' command... +goto install + :install set RESTVAR= @@ -55,4 +61,4 @@ goto loop1 :after_loop -java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR% \ No newline at end of file +java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
