You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/01/05 18:14:31 UTC

[2/4] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP3-432

Merge branch 'master' into TINKERPOP3-432


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/caebf26d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/caebf26d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/caebf26d

Branch: refs/heads/TINKERPOP3-432
Commit: caebf26dde09d1047f4cf63557b3e14b4ba398a5
Parents: 4be5db1 fdd853b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 5 14:14:39 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 5 14:14:39 2016 +0100

----------------------------------------------------------------------
 .travis.yml                                     |   14 +
 CHANGELOG.asciidoc                              |  110 +-
 CONTRIBUTING.asciidoc                           |    2 +-
 LICENSE                                         |   11 +-
 NOTICE                                          |   26 +-
 README.asciidoc                                 |   10 +-
 bin/process-docs.sh                             |    2 +-
 docs/javadoc/overview.html                      |    2 +-
 docs/postprocessor/postprocess.sh               |   13 +-
 docs/preprocessor/preprocess-file.sh            |    5 +-
 docs/preprocessor/preprocess.sh                 |   36 +-
 docs/src/acknowledgements.asciidoc              |   40 -
 docs/src/conclusion.asciidoc                    |   26 -
 docs/src/dev/developer/administration.asciidoc  |   91 +
 docs/src/dev/developer/contributing.asciidoc    |  404 +++
 docs/src/dev/developer/index.asciidoc           |   33 +
 docs/src/dev/developer/meetings.asciidoc        |  204 ++
 docs/src/dev/developer/release.asciidoc         |  193 ++
 docs/src/developer-contributing.asciidoc        |  272 --
 docs/src/developer-meetings.asciidoc            |   64 -
 docs/src/developer-release.asciidoc             |  171 --
 docs/src/developer.asciidoc                     |   31 -
 docs/src/gremlin-applications.asciidoc          | 1727 -------------
 docs/src/implementations.asciidoc               | 1764 -------------
 docs/src/index.asciidoc                         |   39 -
 docs/src/intro.asciidoc                         |  397 ---
 docs/src/preface.asciidoc                       |   97 -
 docs/src/reference/acknowledgements.asciidoc    |   40 +
 docs/src/reference/conclusion.asciidoc          |   26 +
 .../src/reference/gremlin-applications.asciidoc | 1745 +++++++++++++
 docs/src/reference/implementations.asciidoc     | 1766 +++++++++++++
 docs/src/reference/index.asciidoc               |   39 +
 docs/src/reference/intro.asciidoc               |  397 +++
 docs/src/reference/preface.asciidoc             |   97 +
 docs/src/reference/the-graph.asciidoc           |  771 ++++++
 docs/src/reference/the-graphcomputer.asciidoc   |  476 ++++
 docs/src/reference/the-traversal.asciidoc       | 2378 ++++++++++++++++++
 docs/src/the-graph.asciidoc                     |  768 ------
 docs/src/the-graphcomputer.asciidoc             |  475 ----
 docs/src/the-traversal.asciidoc                 | 2357 -----------------
 .../tutorials/getting-started/index.asciidoc    |  571 +++++
 .../upgrade-release-3.0.x-incubating.asciidoc   |  143 --
 .../upgrade-release-3.1.x-incubating.asciidoc   |  183 --
 docs/src/upgrade.asciidoc                       |   39 -
 docs/src/upgrade/index.asciidoc                 |   39 +
 .../upgrade/release-3.0.x-incubating.asciidoc   |  180 ++
 .../upgrade/release-3.1.x-incubating.asciidoc   |  403 +++
 docs/static/images/gremlin-gym.pdf              |  Bin 0 -> 963978 bytes
 docs/static/images/gremlin-gym.png              |  Bin 0 -> 273111 bytes
 .../images/gremlin-on-software-vertex.png       |  Bin 0 -> 39573 bytes
 docs/static/images/gremlin-plane.png            |  Bin 0 -> 89464 bytes
 docs/static/images/gremlin-to-the-6.png         |  Bin 0 -> 71084 bytes
 docs/static/images/gremlin-to-the-7.png         |  Bin 0 -> 80114 bytes
 docs/static/images/gremlin-to-the-8.png         |  Bin 0 -> 107598 bytes
 docs/static/images/gremlin-to-the-9.png         |  Bin 0 -> 135099 bytes
 .../images/modern-edge-1-to-3-1-gremlin.png     |  Bin 0 -> 11607 bytes
 docs/static/images/modern-edge-1-to-3-1.png     |  Bin 0 -> 3210 bytes
 .../images/modern-edge-1-to-3-2-gremlin.png     |  Bin 0 -> 17029 bytes
 docs/static/images/modern-edge-1-to-3-2.png     |  Bin 0 -> 4420 bytes
 .../images/modern-edge-1-to-3-3-gremlin.png     |  Bin 0 -> 20948 bytes
 docs/static/images/modern-edge-1-to-3-3.png     |  Bin 0 -> 7372 bytes
 docs/static/images/quantum-gremlin-atom.png     |  Bin 0 -> 816113 bytes
 giraph-gremlin/pom.xml                          |    2 +-
 gremlin-console/pom.xml                         |    2 +-
 gremlin-console/src/main/LICENSE                |   35 -
 gremlin-console/src/main/NOTICE                 |  292 +--
 .../groovy/plugin/DriverRemoteAcceptor.java     |   38 +-
 .../DriverRemoteAcceptorIntegrateTest.java      |    8 +
 .../groovy/plugin/DriverRemoteAcceptorTest.java |   40 +
 gremlin-core/pom.xml                            |    2 +-
 .../bulkloading/BulkLoaderVertexProgram.java    |    4 +-
 .../gremlin/process/traversal/Traversal.java    |   22 +
 .../gremlin/process/traversal/dsl/graph/__.java |    4 -
 .../traversal/step/map/OrderGlobalStep.java     |   10 +-
 .../traversal/step/map/OrderLocalStep.java      |   17 +-
 .../process/traversal/step/util/Parameters.java |   15 +-
 .../finalization/EngineDependentStrategy.java   |    8 +-
 .../AdjacentToIncidentStrategy.java             |    5 +-
 .../IncidentToAdjacentStrategy.java             |    6 +
 .../traversal/util/DefaultTraversal.java        |   13 +-
 .../util/DefaultTraversalStrategies.java        |    2 +-
 .../traversal/util/TraversalExplanation.java    |  117 +
 .../process/traversal/util/TraversalHelper.java |    8 +-
 .../tinkerpop/gremlin/structure/Graph.java      |   18 +-
 .../tinkerpop/gremlin/structure/Property.java   |    6 +-
 .../gremlin/structure/Transaction.java          |    2 +-
 .../tinkerpop/gremlin/structure/io/IoCore.java  |    6 +
 .../structure/io/graphson/GraphSONMapper.java   |    2 +-
 .../structure/io/graphson/GraphSONModule.java   |    3 +
 .../structure/io/graphson/GraphSONReader.java   |    4 +-
 .../io/graphson/GraphSONSerializers.java        |   47 +
 .../structure/io/graphson/GraphSONTokens.java   |    2 +
 .../structure/io/graphson/GraphSONUtil.java     |   10 +-
 .../structure/io/graphson/GraphSONWriter.java   |    2 +-
 .../gremlin/structure/io/gryo/GryoMapper.java   |   19 +-
 .../util/AbstractThreadLocalTransaction.java    |   40 +-
 .../util/AbstractThreadedTransaction.java       |   44 +-
 .../structure/util/AbstractTransaction.java     |   54 +-
 .../traversal/dsl/graph/GraphTraversalTest.java |    2 +-
 .../step/sideEffect/ProfileStepTest.java        |    2 +-
 gremlin-driver/pom.xml                          |    2 +-
 .../apache/tinkerpop/gremlin/driver/Client.java |  126 +-
 .../tinkerpop/gremlin/driver/Cluster.java       |   11 +-
 .../apache/tinkerpop/gremlin/driver/Tokens.java |    6 +
 ...raphSONMessageSerializerGremlinV1d0Test.java |   46 +-
 .../ser/GraphSONMessageSerializerV1d0Test.java  |   58 +-
 .../ser/GryoMessageSerializerV1d0Test.java      |   31 +
 gremlin-groovy-test/pom.xml                     |    2 +-
 .../loaders/SugarLoaderPerformanceTest.groovy   |    8 +-
 .../groovy/loaders/SugarLoaderTest.groovy       |   23 +-
 .../traversal/step/map/GroovyAddEdgeTest.groovy |    4 +-
 .../traversal/step/map/GroovyOrderTest.groovy   |   10 +
 .../step/sideEffect/GroovyExplainTest.groovy    |   35 +
 .../step/sideEffect/GroovyGroupCountTest.groovy |    5 +
 .../step/sideEffect/GroovyGroupTestV3d0.groovy  |    8 +-
 .../GremlinGroovyScriptEngineIntegrateTest.java |    3 +-
 .../GremlinGroovyScriptEngineOverGraphTest.java |   46 +-
 ...GroovyScriptEngineSandboxedStandardTest.java |   20 +-
 ...nGroovyScriptEngineTinkerPopSandboxTest.java |    5 +-
 .../process/GroovyProcessComputerSuite.java     |    2 +
 .../process/GroovyProcessStandardSuite.java     |    2 +
 gremlin-groovy/pom.xml                          |    2 +-
 .../gremlin/groovy/plugin/Artifact.java         |   10 +-
 .../gremlin/groovy/plugin/ArtifactTest.java     |   87 +
 .../groovy/util/DependencyGrabberTest.java      |   10 +-
 gremlin-server/conf/gremlin-server-min.yaml     |    4 +-
 gremlin-server/conf/gremlin-server-neo4j.yaml   |    8 +-
 .../conf/gremlin-server-rest-modern.yaml        |    4 +-
 .../conf/gremlin-server-rest-secure.yaml        |   11 +-
 gremlin-server/conf/gremlin-server-secure.yaml  |   11 +-
 gremlin-server/conf/gremlin-server-spark.yaml   |    8 +-
 gremlin-server/conf/gremlin-server.yaml         |    8 +-
 .../conf/tinkergraph-credentials.properties     |   20 +
 gremlin-server/pom.xml                          |    2 +-
 gremlin-server/scripts/generate-modern.groovy   |    2 +-
 gremlin-server/src/main/LICENSE                 |   33 -
 gremlin-server/src/main/NOTICE                  |  271 +-
 .../tinkerpop/gremlin/server/GremlinServer.java |    9 +-
 .../server/auth/SimpleAuthenticator.java        |   30 +-
 .../handler/HttpGremlinEndpointHandler.java     |   47 +-
 .../server/op/AbstractEvalOpProcessor.java      |    8 +-
 .../server/op/session/SessionOpProcessor.java   |    9 +-
 .../server/op/standard/StandardOpProcessor.java |   53 +-
 .../server/util/ServerGremlinExecutor.java      |   34 +-
 .../server/GremlinDriverIntegrateTest.java      |   36 +-
 .../server/GremlinResultSetIntegrateTest.java   |   54 +-
 .../GremlinServerAuthIntegrateOldTest.java      |  235 ++
 .../server/GremlinServerAuthIntegrateTest.java  |   39 +-
 .../server/GremlinServerHttpIntegrateTest.java  |  111 +-
 .../server/GremlinServerIntegrateTest.java      |   27 +-
 .../server/gremlin-server-integration.yaml      |    4 +-
 gremlin-shaded/pom.xml                          |    2 +-
 gremlin-test/pom.xml                            |    2 +-
 .../process/AbstractGremlinProcessTest.java     |   14 +-
 .../gremlin/process/ProcessComputerSuite.java   |    2 +
 .../gremlin/process/ProcessStandardSuite.java   |    2 +
 .../process/traversal/step/map/AddEdgeTest.java |    8 +-
 .../process/traversal/step/map/OrderTest.java   |   34 +
 .../traversal/step/sideEffect/ExplainTest.java  |   85 +
 .../step/sideEffect/GroupCountTest.java         |   32 +-
 .../step/sideEffect/GroupTestV3d0.java          |   16 +-
 .../PartitionStrategyProcessTest.java           |   13 +-
 .../tinkerpop/gremlin/structure/GraphTest.java  |    2 +-
 .../gremlin/structure/TransactionTest.java      |   84 +
 .../gremlin/structure/VertexPropertyTest.java   |   14 +-
 hadoop-gremlin/pom.xml                          |   26 +-
 .../gremlin/hadoop/structure/HadoopGraph.java   |   17 +-
 neo4j-gremlin/pom.xml                           |    2 +-
 .../gremlin/neo4j/structure/Neo4jEdge.java      |    2 +-
 .../neo4j/structure/Neo4jGraphVariables.java    |    2 +-
 .../structure/trait/MultiMetaNeo4jTrait.java    |    2 +-
 .../trait/NoMultiNoMetaNeo4jTrait.java          |    2 +-
 pom.xml                                         |  108 +-
 spark-gremlin/pom.xml                           |    2 +-
 tinkergraph-gremlin/pom.xml                     |    2 +-
 .../tinkergraph/structure/TinkerGraph.java      |   14 +-
 .../tinkergraph/structure/TinkerIoRegistry.java |  176 +-
 .../tinkergraph/TinkerGraphProvider.java        |    8 +-
 .../tinkergraph/TinkerGraphUUIDProvider.java    |   57 +
 .../TinkerGraphGryoSerializerTest.java          |   81 +
 .../structure/TinkerGraphPlayTest.java          |    4 +-
 .../structure/TinkerGraphSerializerTest.java    |   81 -
 .../tinkergraph/structure/TinkerGraphTest.java  |  101 +
 .../TinkerGraphUUIDGroovyEnvironmentTest.java   |   38 +
 184 files changed, 12536 insertions(+), 9729 deletions(-)
----------------------------------------------------------------------