You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/09/18 16:48:23 UTC

[05/50] [abbrv] tinkerpop git commit: TINKERPOP-2031 Removed support for -i in gremlin-server.sh

TINKERPOP-2031 Removed support for -i in gremlin-server.sh


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d79c3fff
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d79c3fff
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d79c3fff

Branch: refs/heads/TINKERPOP-1913
Commit: d79c3fff4cce6d4298ddc1c0d7c5a0c9f0a00dc6
Parents: bdec663
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 6 08:40:31 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 6 08:40:31 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                             | 1 +
 gremlin-server/src/main/bin/gremlin-server.bat | 6 ------
 gremlin-server/src/main/bin/gremlin-server.sh  | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d79c3fff/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4e00d80..0072db8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 This release also includes changes from <<release-3-3-3, 3.3.3>>.
 
 * GraphSON `MessageSerializer`s will automatically register the GremlinServerModule to a provided GraphSONMapper.
+* Removed support for `-i` option in Gremlin Server which was previously deprecated.
 * Implemented `ShortestPathVertexProgram` and the `shortestPath()` step.
 * `AbstractGraphProvider` uses `g.io()` for loading test data.
 * Added the `io()` start step and `read()` and `write()` termination steps to the Gremlin language.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d79c3fff/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 6c73f48..73df2a3 100644
--- a/gremlin-server/src/main/bin/gremlin-server.bat
+++ b/gremlin-server/src/main/bin/gremlin-server.bat
@@ -36,7 +36,6 @@ cd ..
 set JAVA_OPTIONS=-Xms32m -Xmx512m
 
 if "%1" == "" goto server
-if "%1" == "-i" goto dashi
 if "%1" == "install" goto install
 
 :server
@@ -44,11 +43,6 @@ if "%1" == "install" goto install
 :: 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=

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d79c3fff/gremlin-server/src/main/bin/gremlin-server.sh
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/bin/gremlin-server.sh b/gremlin-server/src/main/bin/gremlin-server.sh
index a09e10c..a15fee6 100755
--- a/gremlin-server/src/main/bin/gremlin-server.sh
+++ b/gremlin-server/src/main/bin/gremlin-server.sh
@@ -252,11 +252,6 @@ case "$1" in
   stop)
     stop
     ;;
-  -i)
-    shift
-    echo "Redirecting to 'install $@' (-i will be removed in a future release)"
-    install "$@"
-    ;;
   install)
     shift
     install "$@"