Merge branch 'tp31' of https://github.com/apache/tinkerpop into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c279fab4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c279fab4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c279fab4 Branch: refs/heads/TINKERPOP-1599 Commit: c279fab44d1b4b86791a3cd25ae79fa9a7548b1e Parents: 3dcfa3d 6e2128c Author: Joshua Shinavier <[email protected]> Authored: Fri Jan 20 22:24:58 2017 -0800 Committer: Joshua Shinavier <[email protected]> Committed: Fri Jan 20 22:24:58 2017 -0800 ---------------------------------------------------------------------- .gitignore | 1 + CHANGELOG.asciidoc | 74 +++++++- CONTRIBUTING.asciidoc | 2 +- appveyor.yml | 14 -- bin/gremlin.sh | 23 +-- bin/publish-docs.awk | 31 ++++ bin/publish-docs.sh | 50 ++++-- bin/validate-distribution.sh | 7 +- docker/build.sh | 2 +- docker/scripts/build.sh | 7 + docs/preprocessor/preprocess.sh | 5 +- docs/src/dev/developer/administration.asciidoc | 145 ++++++++++++---- docs/src/dev/developer/contributing.asciidoc | 12 +- .../developer/development-environment.asciidoc | 18 +- docs/src/dev/developer/for-committers.asciidoc | 96 ++++++++--- docs/src/dev/developer/release.asciidoc | 84 +++++---- docs/src/dev/provider/index.asciidoc | 14 +- docs/src/index.asciidoc | 87 ++++++++++ .../src/reference/gremlin-applications.asciidoc | 35 ++-- .../reference/implementations-hadoop.asciidoc | 2 +- .../reference/implementations-neo4j.asciidoc | 5 +- .../implementations-tinkergraph.asciidoc | 2 +- docs/src/reference/intro.asciidoc | 2 +- docs/src/reference/the-graph.asciidoc | 2 +- docs/src/reference/the-graphcomputer.asciidoc | 5 + docs/src/reference/the-traversal.asciidoc | 61 ++++--- .../tutorials/getting-started/index.asciidoc | 6 +- docs/src/upgrade/index.asciidoc | 2 +- .../upgrade/release-3.1.x-incubating.asciidoc | 51 +++++- docs/static/images/gremlin-gym-cropped.png | Bin 0 -> 32532 bytes giraph-gremlin/pom.xml | 2 +- .../src/test/resources/giraph-site.xml | 12 ++ .../gremlin-archetype-server/pom.xml | 2 +- .../src/main/java/Service.java | 2 +- .../src/test/java/ServiceTest.java | 2 +- .../src/test/resources/gremlin-server.yaml | 2 +- .../gremlin-archetype-tinkergraph/pom.xml | 2 +- gremlin-archetype/pom.xml | 2 +- gremlin-console/bin/gremlin.sh | 25 +-- gremlin-console/pom.xml | 2 +- gremlin-console/src/main/bin/gremlin.sh | 28 +-- .../plugin/gremlin-server-integration.yaml | 2 +- .../gremlin/console/groovy/plugin/remote.yaml | 2 +- gremlin-core/pom.xml | 2 +- .../gremlin/process/computer/MapReduce.java | 2 +- .../process/traversal/step/filter/NotStep.java | 7 + .../IncidentToAdjacentStrategy.java | 50 +++--- .../optimization/RangeByIsCountStrategy.java | 20 ++- .../tinkerpop/gremlin/structure/Graph.java | 26 ++- .../IncidentToAdjacentStrategyTest.java | 56 +++--- .../RangeByIsCountStrategyTest.java | 2 + gremlin-driver/pom.xml | 2 +- gremlin-driver/src/main/bin/config-eval.sh | 4 +- gremlin-driver/src/main/bin/profile-driver.sh | 4 +- .../tinkerpop/gremlin/driver/Channelizer.java | 6 +- .../apache/tinkerpop/gremlin/driver/Client.java | 43 ++++- .../tinkerpop/gremlin/driver/Cluster.java | 24 ++- .../tinkerpop/gremlin/driver/Connection.java | 72 ++++++-- .../gremlin/driver/ConnectionPool.java | 21 ++- .../tinkerpop/gremlin/driver/Handler.java | 27 ++- .../gremlin/driver/LoadBalancingStrategy.java | 2 +- .../tinkerpop/gremlin/driver/ResultQueue.java | 4 + .../driver/handler/WebSocketClientHandler.java | 4 +- gremlin-groovy-test/pom.xml | 2 +- .../traversal/step/map/GroovyMatchTest.groovy | 10 ++ .../traversal/step/map/GroovyPathTest.groovy | 7 +- gremlin-groovy/pom.xml | 2 +- .../groovy/util/DependencyGrabber.groovy | 55 +++--- .../gremlin/groovy/engine/GremlinExecutor.java | 2 +- .../jsr223/GremlinGroovyScriptEngine.java | 142 ++++++++------- .../jsr223/GremlinGroovyScriptEngineTest.java | 69 +++++++- .../util/DependencyGrabberIntegrateTest.java | 102 +++++++++++ .../groovy/util/DependencyGrabberTest.java | 102 ----------- gremlin-server/conf/gremlin-server-classic.yaml | 2 +- gremlin-server/pom.xml | 2 +- gremlin-server/src/assembly/distribution.xml | 3 +- gremlin-server/src/main/bin/gremlin-server.sh | 4 +- .../gremlin/server/AbstractChannelizer.java | 2 +- .../tinkerpop/gremlin/server/GremlinServer.java | 5 + .../server/auth/AllowAllAuthenticator.java | 1 - .../server/auth/SimpleAuthenticator.java | 1 - .../handler/SaslAuthenticationHandler.java | 2 +- .../gremlin/server/op/session/Session.java | 12 ++ .../server/op/session/SessionOpProcessor.java | 14 ++ .../AbstractGremlinServerPerformanceTest.java | 2 +- .../server/GremlinAdditionPerformanceTest.java | 2 +- .../server/GremlinDriverIntegrateTest.java | 171 +++++++++++++------ .../server/GremlinResultSetIntegrateTest.java | 2 +- .../server/GremlinServerAuthIntegrateTest.java | 29 ++-- .../GremlinServerAuthOldIntegrateTest.java | 29 ++-- .../server/GremlinServerHttpIntegrateTest.java | 92 +++++----- .../server/GremlinServerIntegrateTest.java | 70 ++++---- .../GremlinServerSessionIntegrateTest.java | 52 ++++-- .../server/GremlinTraversalPerformanceTest.java | 2 +- .../gremlin/server/TestClientFactory.java | 60 +++++++ .../server/gremlin-server-integration.yaml | 2 +- .../server/gremlin-server-performance.yaml | 2 +- gremlin-shaded/pom.xml | 2 +- gremlin-test/pom.xml | 2 +- .../tinkerpop/gremlin/AbstractGremlinTest.java | 1 + .../gremlin/FeatureRequirementSet.java | 2 +- .../generator/CommunityGeneratorTest.java | 4 + .../generator/DistributionGeneratorTest.java | 4 + .../gremlin/process/GremlinProcessRunner.java | 2 +- .../process/traversal/step/map/MapTest.java | 4 +- .../process/traversal/step/map/MatchTest.java | 63 ++++--- .../process/traversal/step/map/PathTest.java | 35 +++- .../traversal/step/map/PropertiesTest.java | 9 +- .../tinkerpop/gremlin/structure/EdgeTest.java | 13 +- .../gremlin/structure/PropertyTest.java | 1 + .../tinkerpop/gremlin/structure/io/IoTest.java | 4 +- hadoop-gremlin/pom.xml | 2 +- .../computer/util/ComputerSubmissionHelper.java | 2 +- neo4j-gremlin/pom.xml | 2 +- .../gremlin/neo4j/structure/Neo4jGraph.java | 2 +- pom.xml | 70 +++----- spark-gremlin/pom.xml | 29 +--- tinkergraph-gremlin/pom.xml | 2 +- .../tinkergraph/structure/TinkerGraph.java | 4 +- .../tinkergraph/structure/TinkerGraphTest.java | 39 +++++ 120 files changed, 1803 insertions(+), 859 deletions(-) ----------------------------------------------------------------------
