Merge branch 'tp32' Conflicts: docs/src/reference/gremlin-applications.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/17da0afd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/17da0afd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/17da0afd Branch: refs/heads/master Commit: 17da0afdc9aaf4eb2e02d9b455d465a1c12be9d9 Parents: 11a864d d56862b Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Jan 5 14:13:11 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Jan 5 14:13:11 2018 -0500 ---------------------------------------------------------------------- docs/src/reference/gremlin-applications.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17da0afd/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/reference/gremlin-applications.asciidoc index 6f66f35,df05ead..df944c8 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@@ -865,16 -842,16 +865,16 @@@ can be passed to the `Client` instance |username |The username to submit on requests that require authentication. |"" |========================================================= -=== Connecting via REST +=== Connecting via HTTP image:gremlin-rexster.png[width=225,float=left] While the default behavior for Gremlin Server is to provide a -WebSocket-based connection, it can also be configured to support link:http://en.wikipedia.org/wiki/Representational_state_transfer[REST]. -The REST endpoint provides for a communication protocol familiar to most developers, with a wide support of -programming languages, tools and libraries for accessing it. As a result, REST provides a fast way to get started +WebSocket-based connection, it can also be configured to support plain HTTP web service. +The HTTP endpoint provides for a communication protocol familiar to most developers, with a wide support of +programming languages, tools and libraries for accessing it. As a result, HTTP provides a fast way to get started - with Gremlin Server. It also may represent an easier upgrade path from link:http://rexster.tinkerpop.com/[Rexster] + with Gremlin Server. It also may represent an easier upgrade path from link:https://github.com/tinkerpop/rexster[Rexster] as the API for the endpoint is very similar to Rexster's link:https://github.com/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin Extension]. -Gremlin Server provides for a single REST endpoint - a Gremlin evaluator - which allows the submission of a Gremlin +Gremlin Server provides for a single HTTP endpoint - a Gremlin evaluator - which allows the submission of a Gremlin script as a request. For each request, it returns a response containing the serialized results of that script. To enable this endpoint, Gremlin Server needs to be configured with the `HttpChannelizer`, which replaces the default. The `WsAndHttpChannelizer` may also be configured to enable both WebSockets and the REST endpoint. `WebSocketChannelizer`, in the configuration file: