Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7057d5ff Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7057d5ff Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7057d5ff Branch: refs/heads/master Commit: 7057d5ffb7418032e3b006feaab74d5ee442d5b0 Parents: 4762e50 e20b8ae Author: Robert Dale <robd...@gmail.com> Authored: Sun Nov 5 06:23:16 2017 -0500 Committer: Robert Dale <robd...@gmail.com> Committed: Sun Nov 5 06:23:16 2017 -0500 ---------------------------------------------------------------------- docs/src/dev/developer/contributing.asciidoc | 4 ++-- .../developer/development-environment.asciidoc | 2 +- docs/src/dev/developer/release.asciidoc | 2 +- docs/src/dev/provider/index.asciidoc | 6 +++--- docs/src/recipes/between-vertices.asciidoc | 2 +- docs/src/recipes/centrality.asciidoc | 2 +- docs/src/recipes/connected-components.asciidoc | 2 +- docs/src/recipes/cycle-detection.asciidoc | 2 +- docs/src/recipes/duplicate-edge.asciidoc | 6 +++--- .../src/recipes/if-then-based-grouping.asciidoc | 2 +- docs/src/recipes/pagination.asciidoc | 4 ++-- docs/src/recipes/recommendation.asciidoc | 6 +++--- docs/src/recipes/tree.asciidoc | 4 ++-- .../src/reference/gremlin-applications.asciidoc | 14 +++++++------- docs/src/reference/gremlin-variants.asciidoc | 4 ++-- docs/src/reference/the-traversal.asciidoc | 12 ++++++------ .../the-gremlin-console/index.asciidoc | 4 ++-- .../upgrade/release-3.2.x-incubating.asciidoc | 20 ++++++++++---------- 18 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/dev/developer/development-environment.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/dev/developer/release.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/dev/developer/release.asciidoc index cbddfe5,d3097ec..6589b6b --- a/docs/src/dev/developer/release.asciidoc +++ b/docs/src/dev/developer/release.asciidoc @@@ -236,9 -235,13 +236,9 @@@ for generating javadoc and without tha . Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`. . `cd release; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"` . Wait for Apache Sonatype to sync the artifacts to Maven Central at (link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]). - . Report the release through link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] (an email reminder should arrive shortly follwing the svn command above to do the release) + . Report the release through link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] (an email reminder should arrive shortly following the svn command above to do the release) . Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the download links work from a mirror). -. Update home page site with references to latest distribution - specifically: -.. Update the `template/header-footer.html`. -.. Update `index.html`. -.. Update link:http://tinkerpop.apache.org/downloads.html[Downloads] page, when moving "Current Releases" to "Archived -Releases" recall that the hyperlink must change to point to version in the link:https://archive.apache.org/dist/tinkerpop/[Apache Archives]. +. `bin/publish-home.sh <username>` to publish the updated web site with new releases. . Execute `bin/update-current-docs.sh` to migrate to the latest documentation set for `/current`. . This step should only occur after the website is updated and all links are working. If there are releases present in SVN that represents lines of code that are no longer under development, then remove those releases. In other words, http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/dev/provider/index.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/reference/gremlin-applications.asciidoc index 598b0f8,6135af9..82dc393 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@@ -1122,9 -1068,8 +1122,9 @@@ The following table describes the vario |authentication.authenticator |The fully qualified classname of an `Authenticator` implementation to use. If this setting is not present, then authentication is effectively disabled. |`AllowAllAuthenticator` |authentication.authenticationHandler | The fully qualified classname of an `AbstractAuthenticationHandler` implementation to use. If this setting is not present, but the `authentication.authenticator` is, it will use that authenticator with the default `AbstractAuthenticationHandler` implementation for the specified `Channelizer` |_none_ |authentication.config |A `Map` of configuration settings to be passes to the `Authenticator` when it is constructed. The settings available are dependent on the implementation. |_none_ +|authentication.enableAuditLog |The available authenticators can issue audit logging messages, binding the authenticated user to his remote socket address and binding requests with a gremlin query to the remote socket address. For privacy reasons, the default value of this setting is false. The audit logging messages are logged at the INFO level via the `audit.org.apache.tinkerpop.gremlin.server` logger, which can be configured using the log4j.properties file. |false |channelizer |The fully qualified classname of the `Channelizer` implementation to use. A `Channelizer` is a "channel initializer" which Gremlin Server uses to define the type of processing pipeline to use. By allowing different `Channelizer` implementations, Gremlin Server can support different communication protocols (e.g. WebSocket, Java NIO, etc.). |`WebSocketChannelizer` - |graphManager |The fully qualified classname of the `GraphManager` implementation to use. A `GraphManager` is a class that adheres to the TinkerPop `GraphManager` interface, allowing custom implementations for storing and managing graph references, as well as defining custom methods to open and close graphs instantiations. It is important to note that the Tinkerpop Http and WebSocketChannelizers auto-commit and auto-rollback based on the graphs stored in the graphManager upon script execution completion. |`DefaultGraphManager` + |graphManager |The fully qualified classname of the `GraphManager` implementation to use. A `GraphManager` is a class that adheres to the TinkerPop `GraphManager` interface, allowing custom implementations for storing and managing graph references, as well as defining custom methods to open and close graphs instantiations. It is important to note that the TinkerPop HTTP and WebSocketChannelizers auto-commit and auto-rollback based on the graphs stored in the graphManager upon script execution completion. |`DefaultGraphManager` |graphs |A `Map` of `Graph` configuration files where the key of the `Map` becomes the name to which the `Graph` will be bound and the value is the file name of a `Graph` configuration file. |_none_ |gremlinPool |The number of "Gremlin" threads available to execute actual scripts in a `ScriptEngine`. This pool represents the workers available to handle blocking operations in Gremlin Server. When set to `0`, Gremlin Server will use the value provided by `Runtime.availableProcessors()`. |0 |host |The name of the host to bind the server to. |localhost http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/reference/gremlin-variants.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/reference/the-traversal.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/upgrade/release-3.2.x-incubating.asciidoc ----------------------------------------------------------------------
