tinkerpop git commit: TINKERPOP-1878 Removed the old sparql-gremlin link
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1878 7802de5b9 -> 91382dfa8 TINKERPOP-1878 Removed the old sparql-gremlin link Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/91382dfa Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/91382dfa Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/91382dfa Branch: refs/heads/TINKERPOP-1878 Commit: 91382dfa8aa8b621b8b0128c9adc3d18b5d2f145 Parents: 7802de5 Author: Stephen Mallette Authored: Fri Aug 10 15:11:55 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 15:11:55 2018 -0400 -- docs/site/home/index.html | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/91382dfa/docs/site/home/index.html -- diff --git a/docs/site/home/index.html b/docs/site/home/index.html index bbba419..6576c7d 100644 --- a/docs/site/home/index.html +++ b/docs/site/home/index.html @@ -260,7 +260,6 @@ limitations under the License. http://ogre.clojurewerkz.org/;>ogre (clojure/variant) - A Clojure language wrapper for TinkerPop3. http://bayofmany.github.io/;>Peapod (java/dsl) - An object-graph-wrapper. http://tinkerpop.apache.org/docs/current/reference/#sparql-gremlin;>sparql-gremlin (sparql/distinct) - A SPARQL to Gremlin traversal compiler. -https://github.com/LITMUS-Benchmark-Suite/sparql-to-gremlin;>sparql-gremlin (sparql/distinct) - A SPARQL to Gremlin traversal compiler. https://github.com/Microsoft/spring-data-gremlin;>spring-data-gremlin (java/dsl) - Spring Data support for TinkerPop-enabled graph systems. https://github.com/twilmes/sql-gremlin;>sql-gremlin (sql/distinct) - An SQL to Gremlin traversal compiler.
tinkerpop git commit: TINKERPOP-1951 Allow classpath to include spaces on windows CTR
Repository: tinkerpop Updated Branches: refs/heads/tp32 b50a3c8b9 -> 00cb9a81a 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/tp32 Commit: 00cb9a81a36aac2e88b621a15ba7740ce0fe790d Parents: b50a3c8 Author: Stephen Mallette Authored: Fri Aug 10 13:59:59 2018 -0400 Committer: Stephen Mallette 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
[3/3] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe3863fe Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe3863fe Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe3863fe Branch: refs/heads/master Commit: fe3863fee61837852b76287f65a9196dc3fa5987 Parents: df4b334 a050b6e Author: Stephen Mallette Authored: Fri Aug 10 14:03:14 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 14:03:14 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/fe3863fe/CHANGELOG.asciidoc --
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
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 Authored: Fri Aug 10 14:03:06 2018 -0400 Committer: Stephen Mallette 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%
[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 Authored: Fri Aug 10 13:59:59 2018 -0400 Committer: Stephen Mallette 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
[1/3] tinkerpop git commit: TINKERPOP-1951 Allow classpath to include spaces on windows CTR
Repository: tinkerpop Updated Branches: refs/heads/master df4b3349d -> fe3863fee 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/master Commit: 00cb9a81a36aac2e88b621a15ba7740ce0fe790d Parents: b50a3c8 Author: Stephen Mallette Authored: Fri Aug 10 13:59:59 2018 -0400 Committer: Stephen Mallette 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/3] tinkerpop git commit: Merge branch 'tp32' into tp33
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/master Commit: a050b6ed6380b1b97462739a75c6104f4e6e1b32 Parents: 5e48acc 00cb9a8 Author: Stephen Mallette Authored: Fri Aug 10 14:03:06 2018 -0400 Committer: Stephen Mallette 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%
tinkerpop git commit: Minor syntax fix to connectedComponent() recipe CTR
Repository: tinkerpop Updated Branches: refs/heads/master b83d6e373 -> df4b3349d Minor syntax fix to connectedComponent() recipe CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/df4b3349 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df4b3349 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df4b3349 Branch: refs/heads/master Commit: df4b3349d3cd0d54db4bfb99209b5c77fb690979 Parents: b83d6e3 Author: Stephen Mallette Authored: Fri Aug 10 13:57:55 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 13:57:55 2018 -0400 -- docs/src/recipes/connected-components.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4b3349/docs/src/recipes/connected-components.asciidoc -- diff --git a/docs/src/recipes/connected-components.asciidoc b/docs/src/recipes/connected-components.asciidoc index c46180f..000cda8 100644 --- a/docs/src/recipes/connected-components.asciidoc +++ b/docs/src/recipes/connected-components.asciidoc @@ -61,10 +61,11 @@ Connected components in a small graph can be determined with either an OLTP trav described in more detail in the link:http://tinkerpop.apache.org/docs/x.y.z/reference/#connectedcomponent-step[Reference Documentation]. The traversal looks like: + [gremlin-groovy,existing] g.withComputer().V().connectedComponent(). -group().by(component). +group().by(ConnectedComponent.component). select(values).unfold() @@ -81,6 +82,7 @@ g.V().emit(cyclicPath().or().not(both())). <1 by(path().unfold().dedup().fold()). <4> select(values).unfold() <5> + <1> The initial emit() step allows for output of isolated vertices, in addition to the discovery of components as described in (2).
svn commit: r1837826 - in /tinkerpop/site: docs/3.4.0-SNAPSHOT/ docs/3.4.0-SNAPSHOT/dev/ docs/3.4.0-SNAPSHOT/dev/developer/ docs/3.4.0-SNAPSHOT/dev/future/ docs/3.4.0-SNAPSHOT/dev/io/ docs/3.4.0-SNAPS
Author: spmallette Date: Fri Aug 10 17:51:44 2018 New Revision: 1837826 URL: http://svn.apache.org/viewvc?rev=1837826=rev Log: Deploy docs for TinkerPop 3.4.0-SNAPSHOT [This commit notification would consist of 1003 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[1/2] tinkerpop git commit: Added "Preface" to the intro section of ref docs.
Repository: tinkerpop Updated Branches: refs/heads/tp33 b9ebe1599 -> 5e48acceb Added "Preface" to the intro section of ref docs. Always bugged me that we never titled it that way despite having the anchor named that way. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b50a3c8b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b50a3c8b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b50a3c8b Branch: refs/heads/tp33 Commit: b50a3c8b9c6650aabb61ecbcb382b0962c4c4800 Parents: a533878 Author: Stephen Mallette Authored: Fri Aug 10 11:34:00 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 11:34:00 2018 -0400 -- docs/src/reference/preface.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b50a3c8b/docs/src/reference/preface.asciidoc -- diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc index f54e168..8977de2 100644 --- a/docs/src/reference/preface.asciidoc +++ b/docs/src/reference/preface.asciidoc @@ -14,9 +14,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -[[preface]] = TinkerPop3 Documentation +[[preface]] += Preface + In the beginning... == TinkerPop0
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5e48acce Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5e48acce Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5e48acce Branch: refs/heads/master Commit: 5e48accebc6906c0069f6fb91548a28e5af09f9b Parents: b9ebe15 b50a3c8 Author: Stephen Mallette Authored: Fri Aug 10 11:35:24 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 11:35:24 2018 -0400 -- docs/src/reference/preface.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --
[3/3] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Conflicts: docs/src/reference/preface.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b83d6e37 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b83d6e37 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b83d6e37 Branch: refs/heads/master Commit: b83d6e373d793f2e1059f947abf8317129ec2189 Parents: 6a70509 5e48acc Author: Stephen Mallette Authored: Fri Aug 10 11:36:22 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 11:36:22 2018 -0400 -- docs/src/reference/preface.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b83d6e37/docs/src/reference/preface.asciidoc -- diff --cc docs/src/reference/preface.asciidoc index 4776a75,8977de2..da93d3a --- a/docs/src/reference/preface.asciidoc +++ b/docs/src/reference/preface.asciidoc @@@ -14,9 -14,11 +14,11 @@@ WITHOUT WARRANTIES OR CONDITIONS OF AN See the License for the specific language governing permissions and limitations under the License. - [[preface]] -= TinkerPop3 Documentation += TinkerPop Documentation + [[preface]] + = Preface + In the beginning... == TinkerPop0
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5e48acce Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5e48acce Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5e48acce Branch: refs/heads/tp33 Commit: 5e48accebc6906c0069f6fb91548a28e5af09f9b Parents: b9ebe15 b50a3c8 Author: Stephen Mallette Authored: Fri Aug 10 11:35:24 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 11:35:24 2018 -0400 -- docs/src/reference/preface.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --
tinkerpop git commit: Added "Preface" to the intro section of ref docs.
Repository: tinkerpop Updated Branches: refs/heads/tp32 a533878cb -> b50a3c8b9 Added "Preface" to the intro section of ref docs. Always bugged me that we never titled it that way despite having the anchor named that way. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b50a3c8b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b50a3c8b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b50a3c8b Branch: refs/heads/tp32 Commit: b50a3c8b9c6650aabb61ecbcb382b0962c4c4800 Parents: a533878 Author: Stephen Mallette Authored: Fri Aug 10 11:34:00 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 11:34:00 2018 -0400 -- docs/src/reference/preface.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b50a3c8b/docs/src/reference/preface.asciidoc -- diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc index f54e168..8977de2 100644 --- a/docs/src/reference/preface.asciidoc +++ b/docs/src/reference/preface.asciidoc @@ -14,9 +14,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -[[preface]] = TinkerPop3 Documentation +[[preface]] += Preface + In the beginning... == TinkerPop0
[1/3] tinkerpop git commit: Added "Preface" to the intro section of ref docs.
Repository: tinkerpop Updated Branches: refs/heads/master 6a705098b -> b83d6e373 Added "Preface" to the intro section of ref docs. Always bugged me that we never titled it that way despite having the anchor named that way. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b50a3c8b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b50a3c8b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b50a3c8b Branch: refs/heads/master Commit: b50a3c8b9c6650aabb61ecbcb382b0962c4c4800 Parents: a533878 Author: Stephen Mallette Authored: Fri Aug 10 11:34:00 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 11:34:00 2018 -0400 -- docs/src/reference/preface.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b50a3c8b/docs/src/reference/preface.asciidoc -- diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc index f54e168..8977de2 100644 --- a/docs/src/reference/preface.asciidoc +++ b/docs/src/reference/preface.asciidoc @@ -14,9 +14,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -[[preface]] = TinkerPop3 Documentation +[[preface]] += Preface + In the beginning... == TinkerPop0
[1/3] tinkerpop git commit: TINKERPOP-1990 Implemented `ShortestPathVertexProgram` and `ShortestPathVertexProgramStep`.
Repository: tinkerpop
Updated Branches:
refs/heads/master c8e4fec98 -> 6a705098b
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b52a8c0/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index a0ae7ca..0cdcd21 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -80,6 +80,21 @@ const ignoredScenarios = {
'g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X':
new IgnoreError(ignoreReason.computerNotSupported),
'g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX':
new IgnoreError(ignoreReason.computerNotSupported),
'g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXEDGES_outEX_withXPROPERTY_NAME_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX':
new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_both_dedup_shortestPath': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath_edgesIncluded': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath_directionXINX': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath_edgesXoutEX': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath_edgesIncluded_edgesXoutEX': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasXname_markoX_shortestPath': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath_targetXhasXname_markoXX': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_shortestPath_targetXvaluesXnameX_isXmarkoXX': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasXname_markoX_shortestPath_targetXhasLabelXsoftwareXX': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasXname_markoX_shortestPath_targetXhasXname_joshXX_distanceXweightX':
new IgnoreError(ignoreReason.computerNotSupported),
+
'g_V_hasXname_danielX_shortestPath_targetXhasXname_stephenXX_edgesXbothEXusesXX':
new IgnoreError(ignoreReason.computerNotSupported),
+
'g_V_hasXsong_name_MIGHT_AS_WELLX_shortestPath_targetXhasXsong_name_MAYBE_YOU_KNOW_HOW_I_FEELXX_edgesXoutEXfollowedByXX_distanceXweightX':
new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasXname_markoX_shortestPath_maxDistanceX1X': new
IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasXname_vadasX_shortestPath_distanceXweightX_maxDistanceX1_3X': new
IgnoreError(ignoreReason.computerNotSupported),
};
defineSupportCode(function(methods) {
@@ -352,4 +367,4 @@ function IgnoreError(reason) {
Error.captureStackTrace(this, IgnoreError);
}
-util.inherits(IgnoreError, Error);
\ No newline at end of file
+util.inherits(IgnoreError, Error);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b52a8c0/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index b073aa8..a54853b 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -438,6 +438,10 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("select", *args)
return self
+def shortestPath(self, *args):
+self.bytecode.add_step("shortestPath", *args)
+return self
+
def sideEffect(self, *args):
self.bytecode.add_step("sideEffect", *args)
return self
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b52a8c0/gremlin-test/features/map/Path.feature
--
diff --git a/gremlin-test/features/map/Path.feature
b/gremlin-test/features/map/Path.feature
index b0cb9dd..0bb7573 100644
--- a/gremlin-test/features/map/Path.feature
+++ b/gremlin-test/features/map/Path.feature
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-Feature: Step - count()
+Feature: Step - path()
Scenario: g_VX1X_name_path
Given the modern graph
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b52a8c0/gremlin-test/features/map/ShortestPath.feature
--
diff --git
[2/3] tinkerpop git commit: TINKERPOP-1990 Implemented `ShortestPathVertexProgram` and `ShortestPathVertexProgramStep`.
TINKERPOP-1990 Implemented `ShortestPathVertexProgram` and `ShortestPathVertexProgramStep`. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6b52a8c0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6b52a8c0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6b52a8c0 Branch: refs/heads/master Commit: 6b52a8c0e8c8b5df0253b89ed4b97d7a916bcf9a Parents: 0c2fc21 Author: Daniel Kuppitz Authored: Wed May 23 08:46:34 2018 -0400 Committer: Daniel Kuppitz Committed: Thu Aug 9 18:49:43 2018 -0700 -- CHANGELOG.asciidoc | 1 + docs/src/recipes/shortest-path.asciidoc | 62 ++ docs/src/reference/the-graphcomputer.asciidoc | 51 ++ docs/src/reference/the-traversal.asciidoc | 61 ++ .../tinkerpop/gremlin/jsr223/CoreImports.java | 4 + .../search/path/ShortestPathVertexProgram.java | 611 +++ .../traversal/step/map/ShortestPath.java| 108 .../step/map/ShortestPathVertexProgramStep.java | 185 ++ .../gremlin/process/remote/RemoteGraph.java | 8 + .../gremlin/process/traversal/Traversal.java| 16 +- .../traversal/dsl/graph/GraphTraversal.java | 21 + .../traversal/lambda/ColumnTraversal.java | 8 + .../traversal/lambda/ConstantTraversal.java | 9 +- .../traversal/lambda/ElementValueTraversal.java | 10 +- .../traversal/lambda/IdentityTraversal.java | 7 +- .../process/traversal/lambda/LoopTraversal.java | 6 + .../traversal/lambda/TokenTraversal.java| 8 + .../process/traversal/lambda/TrueTraversal.java | 5 + .../structure/io/graphson/GraphSONModule.java | 2 +- .../gremlin/structure/io/gryo/GryoVersion.java | 12 +- .../structure/io/gryo/UtilSerializers.java | 15 + .../gremlin/structure/util/Attachable.java | 3 +- .../traversal/dsl/graph/GraphTraversalTest.java | 2 +- .../Process/Traversal/GraphTraversal.cs | 9 + .../lib/process/graph-traversal.js | 10 + .../test/cucumber/feature-steps.js | 17 +- .../gremlin_python/process/graph_traversal.py | 4 + gremlin-test/features/map/Path.feature | 2 +- gremlin-test/features/map/ShortestPath.feature | 361 +++ .../tinkerpop/gremlin/AbstractGremlinTest.java | 6 +- .../process/AbstractGremlinProcessTest.java | 7 +- .../gremlin/process/ProcessComputerSuite.java | 5 + .../search/path/ShortestPathTestHelper.java | 100 +++ .../path/ShortestPathVertexProgramTest.java | 297 + .../traversal/step/map/ShortestPathTest.java| 353 +++ pom.xml | 3 + .../computer/SparkHadoopGraphProvider.java | 2 + 37 files changed, 2366 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b52a8c0/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 481a7d3..f6233ba 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -25,6 +25,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima This release also includes changes from <>. +* 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. * Added `GraphFeatures.supportsIoRead()` and `GraphFeatures.supportsIoWrite()`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b52a8c0/docs/src/recipes/shortest-path.asciidoc -- diff --git a/docs/src/recipes/shortest-path.asciidoc b/docs/src/recipes/shortest-path.asciidoc index 2e33055..04c542d 100644 --- a/docs/src/recipes/shortest-path.asciidoc +++ b/docs/src/recipes/shortest-path.asciidoc @@ -49,6 +49,16 @@ length three), but this example is not considering that. <2> It might be interesting to know the path lengths for all paths between vertex "1" and "5". <3> Alternatively, one might wish to do a path length distribution over all the paths. +The following code block demonstrates how the shortest path from `v[1]` to `v[5]` can be queried in OLAP, using the `shortestPath()` step. + +[gremlin-groovy,existing] + +g = g.withComputer() +g.V(1).shortestPath(). + with(ShortestPath.edges, Direction.OUT). + with(ShortestPath.target, hasId(5)) + + The previous example defines the length of the path by the number of vertices in the path, but the "path" might also be measured by data within the graph itself. The following example use the same graph structure as the previous example, but includes a "weight" on the edges, that will be
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1990'
Merge branch 'TINKERPOP-1990' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a705098 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a705098 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a705098 Branch: refs/heads/master Commit: 6a705098b5176086c667b94fa9e13aa2f122bb59 Parents: c8e4fec 6b52a8c Author: Daniel Kuppitz Authored: Fri Aug 10 07:25:48 2018 -0700 Committer: Daniel Kuppitz Committed: Fri Aug 10 07:25:48 2018 -0700 -- CHANGELOG.asciidoc | 1 + docs/src/recipes/shortest-path.asciidoc | 62 ++ docs/src/reference/the-graphcomputer.asciidoc | 51 ++ docs/src/reference/the-traversal.asciidoc | 61 ++ .../tinkerpop/gremlin/jsr223/CoreImports.java | 4 + .../search/path/ShortestPathVertexProgram.java | 611 +++ .../traversal/step/map/ShortestPath.java| 108 .../step/map/ShortestPathVertexProgramStep.java | 185 ++ .../gremlin/process/remote/RemoteGraph.java | 8 + .../gremlin/process/traversal/Traversal.java| 16 +- .../traversal/dsl/graph/GraphTraversal.java | 21 + .../traversal/lambda/ColumnTraversal.java | 8 + .../traversal/lambda/ConstantTraversal.java | 9 +- .../traversal/lambda/ElementValueTraversal.java | 10 +- .../traversal/lambda/IdentityTraversal.java | 7 +- .../process/traversal/lambda/LoopTraversal.java | 6 + .../traversal/lambda/TokenTraversal.java| 8 + .../process/traversal/lambda/TrueTraversal.java | 5 + .../structure/io/graphson/GraphSONModule.java | 2 +- .../gremlin/structure/io/gryo/GryoVersion.java | 12 +- .../structure/io/gryo/UtilSerializers.java | 15 + .../gremlin/structure/util/Attachable.java | 3 +- .../traversal/dsl/graph/GraphTraversalTest.java | 2 +- .../Process/Traversal/GraphTraversal.cs | 9 + .../lib/process/graph-traversal.js | 10 + .../test/cucumber/feature-steps.js | 17 +- .../gremlin_python/process/graph_traversal.py | 4 + gremlin-test/features/map/Path.feature | 2 +- gremlin-test/features/map/ShortestPath.feature | 361 +++ .../tinkerpop/gremlin/AbstractGremlinTest.java | 6 +- .../process/AbstractGremlinProcessTest.java | 7 +- .../gremlin/process/ProcessComputerSuite.java | 5 + .../search/path/ShortestPathTestHelper.java | 100 +++ .../path/ShortestPathVertexProgramTest.java | 297 + .../traversal/step/map/ShortestPathTest.java| 353 +++ pom.xml | 3 + .../computer/SparkHadoopGraphProvider.java | 2 + 37 files changed, 2366 insertions(+), 25 deletions(-) --
[1/2] tinkerpop git commit: Another attempt to wait for flushed logs on kerberos tests CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 0c2fc21fb -> c8e4fec98
Another attempt to wait for flushed logs on kerberos tests CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b9ebe159
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b9ebe159
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b9ebe159
Branch: refs/heads/master
Commit: b9ebe15990b44bde0e2592ba62d52343d73edb4e
Parents: b12a3fd
Author: Stephen Mallette
Authored: Fri Aug 10 08:04:20 2018 -0400
Committer: Stephen Mallette
Committed: Fri Aug 10 08:04:20 2018 -0400
--
.../gremlin/server/auth/Krb5Authenticator.java | 10 ++--
.../GremlinServerAuthKrb5IntegrateTest.java | 49 ++--
2 files changed, 27 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b9ebe159/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
--
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index a92e404..f4e5d77 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -66,6 +66,7 @@ public class Krb5Authenticator implements Authenticator {
"Could not configure a %s - provide a 'config' in the
'authentication' settings",
Krb5Authenticator.class.getName()));
}
+
try {
final File keytabFile = new File((String) config.get(KEYTAB_KEY));
principalName = (String) config.get(PRINCIPAL_KEY);
@@ -73,19 +74,14 @@ public class Krb5Authenticator implements Authenticator {
} catch (Exception e) {
logger.warn("Failed to login to kdc");
}
+
logger.debug("Done logging in to kdc");
}
@Override
public SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress) {
logger.debug("newSaslNegotiator() called");
-return Subject.doAs(subject,
-new PrivilegedAction() {
-public SaslNegotiator run() {
-return new Krb5SaslAuthenticator();
-}
-}
-);
+return Subject.doAs(subject, (PrivilegedAction)
Krb5SaslAuthenticator::new);
}
public AuthenticatedUser authenticate(final Map
credentials) throws AuthenticationException {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b9ebe159/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
--
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
index 10ed834..c102446 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
@@ -39,15 +39,14 @@ import java.util.HashMap;
import java.util.Map;
import javax.security.auth.login.LoginException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
-
/**
* @author Marc de Lignie
- *
*/
public class GremlinServerAuthKrb5IntegrateTest extends
AbstractGremlinServerIntegrationTest {
private static final org.slf4j.Logger logger =
LoggerFactory.getLogger(GremlinServerAuthKrb5IntegrateTest.class);
@@ -180,32 +179,17 @@ public class GremlinServerAuthKrb5IntegrateTest extends
AbstractGremlinServerInt
@Test
public void shouldFailWithNonexistentServerPrincipal() throws Exception {
-
-// wait for logger to flush - (don't think there is a way to detect
this)
-stopServer();
-Thread.sleep(1000);
-
-assertTrue(recordingAppender.logContainsAny("WARN - Failed to login to
kdc"));
+assertFailedLogin();
}
@Test
public void shouldFailWithEmptyServerKeytab() throws Exception {
-
-// wait for logger to flush - (don't think there is a way to detect
this)
-stopServer();
-Thread.sleep(1000);
-
-assertTrue(recordingAppender.logContainsAny("WARN - Failed to login to
kdc"));
+assertFailedLogin();
tinkerpop git commit: Another attempt to wait for flushed logs on kerberos tests CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 b12a3fdd0 -> b9ebe1599
Another attempt to wait for flushed logs on kerberos tests CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b9ebe159
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b9ebe159
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b9ebe159
Branch: refs/heads/tp33
Commit: b9ebe15990b44bde0e2592ba62d52343d73edb4e
Parents: b12a3fd
Author: Stephen Mallette
Authored: Fri Aug 10 08:04:20 2018 -0400
Committer: Stephen Mallette
Committed: Fri Aug 10 08:04:20 2018 -0400
--
.../gremlin/server/auth/Krb5Authenticator.java | 10 ++--
.../GremlinServerAuthKrb5IntegrateTest.java | 49 ++--
2 files changed, 27 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b9ebe159/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
--
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index a92e404..f4e5d77 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -66,6 +66,7 @@ public class Krb5Authenticator implements Authenticator {
"Could not configure a %s - provide a 'config' in the
'authentication' settings",
Krb5Authenticator.class.getName()));
}
+
try {
final File keytabFile = new File((String) config.get(KEYTAB_KEY));
principalName = (String) config.get(PRINCIPAL_KEY);
@@ -73,19 +74,14 @@ public class Krb5Authenticator implements Authenticator {
} catch (Exception e) {
logger.warn("Failed to login to kdc");
}
+
logger.debug("Done logging in to kdc");
}
@Override
public SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress) {
logger.debug("newSaslNegotiator() called");
-return Subject.doAs(subject,
-new PrivilegedAction() {
-public SaslNegotiator run() {
-return new Krb5SaslAuthenticator();
-}
-}
-);
+return Subject.doAs(subject, (PrivilegedAction)
Krb5SaslAuthenticator::new);
}
public AuthenticatedUser authenticate(final Map
credentials) throws AuthenticationException {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b9ebe159/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
--
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
index 10ed834..c102446 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
@@ -39,15 +39,14 @@ import java.util.HashMap;
import java.util.Map;
import javax.security.auth.login.LoginException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
-
/**
* @author Marc de Lignie
- *
*/
public class GremlinServerAuthKrb5IntegrateTest extends
AbstractGremlinServerIntegrationTest {
private static final org.slf4j.Logger logger =
LoggerFactory.getLogger(GremlinServerAuthKrb5IntegrateTest.class);
@@ -180,32 +179,17 @@ public class GremlinServerAuthKrb5IntegrateTest extends
AbstractGremlinServerInt
@Test
public void shouldFailWithNonexistentServerPrincipal() throws Exception {
-
-// wait for logger to flush - (don't think there is a way to detect
this)
-stopServer();
-Thread.sleep(1000);
-
-assertTrue(recordingAppender.logContainsAny("WARN - Failed to login to
kdc"));
+assertFailedLogin();
}
@Test
public void shouldFailWithEmptyServerKeytab() throws Exception {
-
-// wait for logger to flush - (don't think there is a way to detect
this)
-stopServer();
-Thread.sleep(1000);
-
-assertTrue(recordingAppender.logContainsAny("WARN - Failed to login to
kdc"));
+assertFailedLogin();
}
[2/2] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c8e4fec9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c8e4fec9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c8e4fec9 Branch: refs/heads/master Commit: c8e4fec989196f12e23c8b0149a399c277217e07 Parents: 0c2fc21 b9ebe15 Author: Stephen Mallette Authored: Fri Aug 10 08:05:01 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 10 08:05:01 2018 -0400 -- .../gremlin/server/auth/Krb5Authenticator.java | 10 ++-- .../GremlinServerAuthKrb5IntegrateTest.java | 49 ++-- 2 files changed, 27 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8e4fec9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java --
