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/08/10 18:03:38 UTC
[1/2] tinkerpop git commit: TINKERPOP-1951 Allow classpath to include
spaces on windows CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 5e48acceb -> a050b6ed6
TINKERPOP-1951 Allow classpath to include spaces on windows CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/00cb9a81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00cb9a81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00cb9a81
Branch: refs/heads/tp33
Commit: 00cb9a81a36aac2e88b621a15ba7740ce0fe790d
Parents: b50a3c8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 10 13:59:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 10 14:01:20 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-server/src/main/bin/gremlin-server.bat | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00cb9a81/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f6413e2..a45f0f8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed problem with Gremlin Server sometimes returning an additional message after a failure.
+* Allowed spaces in classpath for `gremlin-server.bat`.
* Added an system error code for failed plugin installs for Gremlin Server `-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00cb9a81/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..cf8e916 100644
--- a/gremlin-server/src/main/bin/gremlin-server.bat
+++ b/gremlin-server/src/main/bin/gremlin-server.bat
@@ -41,7 +41,7 @@ if "%1" == "-i" 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 %*
+java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" org.apache.tinkerpop.gremlin.server.GremlinServer %*
:install
@@ -55,4 +55,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%
\ No newline at end of file
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
gremlin-server/src/main/bin/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/a050b6ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a050b6ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a050b6ed
Branch: refs/heads/tp33
Commit: a050b6ed6380b1b97462739a75c6104f4e6e1b32
Parents: 5e48acc 00cb9a8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 10 14:03:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 10 14:03:06 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-server/src/main/bin/gremlin-server.bat | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a050b6ed/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a050b6ed/gremlin-server/src/main/bin/gremlin-server.bat
----------------------------------------------------------------------
diff --cc gremlin-server/src/main/bin/gremlin-server.bat
index 8ceab26,cf8e916..6c73f48
--- a/gremlin-server/src/main/bin/gremlin-server.bat
+++ b/gremlin-server/src/main/bin/gremlin-server.bat
@@@ -42,13 -41,8 +42,13 @@@ if "%1" == "install" goto instal
:server
:: Launch the application
- java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.GremlinServer %*
+ 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=
@@@ -61,4 -55,4 +61,4 @@@ goto loop
:after_loop
- java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
-java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
++java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%