You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/25 15:06:00 UTC

[03/17] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin' into tp30

Merge remote-tracking branch 'origin' into tp30


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

Branch: refs/heads/master
Commit: e21f283e02d0bfe6678e479d562d70df8fb28ca4
Parents: 25063bb bcf9153
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 25 08:32:40 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 25 08:32:40 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   28 +-
 README.asciidoc                                 |    2 +-
 docs/src/gremlin-applications.asciidoc          |   50 +-
 docs/static/images/gremlin-gangster.png         |  Bin 0 -> 142316 bytes
 docs/static/images/tinkerpop3.graffle           | 2023 +++++++++++++++++-
 gremlin-console/conf/remote-objects.yaml        |   23 +-
 gremlin-console/conf/remote-secure.yaml         |    9 +
 gremlin-console/conf/remote.yaml                |   12 +
 gremlin-console/pom.xml                         |    2 +-
 .../console/plugin/GephiRemoteAcceptor.groovy   |  320 ++-
 .../GephiTraversalVisualizationStrategy.groovy  |  127 ++
 .../plugin/UtilitiesGremlinPluginScript.groovy  |    2 +-
 .../GephiRemoteAcceptorIntegrateTest.java       |  105 +-
 gremlin-core/pom.xml                            |    2 +-
 .../gremlin/process/traversal/Path.java         |   35 +-
 .../process/traversal/TraversalStrategies.java  |    4 +-
 .../gremlin/process/traversal/Traverser.java    |    3 +
 .../traversal/dsl/graph/GraphTraversal.java     |  147 +-
 .../gremlin/process/traversal/dsl/graph/__.java |   27 +-
 .../process/traversal/lambda/LoopTraversal.java |   33 +-
 .../gremlin/process/traversal/step/Scoping.java |    4 +-
 .../traversal/step/branch/BranchStep.java       |    2 +
 .../traversal/step/branch/RepeatStep.java       |    9 +-
 .../traversal/step/filter/DedupGlobalStep.java  |    2 +-
 .../step/filter/WherePredicateStep.java         |   13 +-
 .../process/traversal/step/map/LoopsStep.java   |   37 +
 .../process/traversal/step/map/MapKeysStep.java |   14 +-
 .../traversal/step/map/MapValuesStep.java       |   14 +-
 .../process/traversal/step/map/MatchStep.java   |   23 +-
 .../traversal/step/map/RangeLocalStep.java      |   18 +-
 .../traversal/step/map/TailLocalStep.java       |    6 +-
 .../traversal/step/sideEffect/GraphStep.java    |   12 +-
 .../traversal/step/util/AbstractStep.java       |   16 +-
 .../traversal/step/util/ComputerAwareStep.java  |   12 +-
 .../process/traversal/step/util/EmptyPath.java  |   10 +-
 .../traversal/step/util/ImmutablePath.java      |   70 +-
 .../traversal/step/util/MutablePath.java        |   46 +-
 .../optimization/DedupBijectionStrategy.java    |   90 -
 .../optimization/FilterRankingStrategy.java     |  176 ++
 .../traverser/B_LP_O_P_S_SE_SL_Traverser.java   |   99 +
 .../B_LP_O_P_S_SE_SL_TraverserGenerator.java    |   59 +
 .../traverser/B_LP_O_S_SE_SL_Traverser.java     |  106 +
 .../B_LP_O_S_SE_SL_TraverserGenerator.java      |   61 +
 .../traverser/B_O_P_S_SE_SL_Traverser.java      |  100 -
 .../B_O_P_S_SE_SL_TraverserGenerator.java       |   58 -
 .../traverser/TraverserRequirement.java         |    1 +
 .../traverser/util/AbstractTraverser.java       |    6 +
 .../util/DefaultTraverserGeneratorFactory.java  |   12 +-
 .../traverser/util/EmptyTraverser.java          |    6 +
 .../process/traversal/util/TraversalHelper.java |   25 +-
 .../gremlin/structure/Transaction.java          |    1 -
 .../structure/io/graphml/GraphMLReader.java     |   43 +-
 .../gremlin/structure/io/gryo/GryoMapper.java   |   22 +-
 .../util/AbstractThreadLocalTransaction.java    |   75 +
 .../util/AbstractThreadedTransaction.java       |   70 +
 .../structure/util/AbstractTransaction.java     |   83 +-
 .../gremlin/process/traversal/PathTest.java     |   85 +-
 .../traversal/step/filter/WhereStepTest.java    |    2 +-
 .../traversal/step/map/LoopsStepTest.java       |   40 +
 .../traversal/step/map/SelectOneStepTest.java   |    2 +-
 .../traversal/step/map/SelectStepTest.java      |    2 +-
 .../DedupBijectionStrategyTest.java             |  128 --
 .../optimization/FilterRankingStrategyTest.java |  133 ++
 .../LambdaRestrictionStrategyTest.java          |    3 -
 gremlin-driver/pom.xml                          |    2 +-
 gremlin-groovy-test/pom.xml                     |    2 +-
 .../step/branch/GroovyRepeatTest.groovy         |    7 +-
 .../traversal/step/map/GroovyCountTest.groovy   |   11 +-
 .../traversal/step/map/GroovyLoopsTest.groovy   |   56 +
 .../traversal/step/map/GroovyMapKeysTest.groovy |    5 +
 .../step/map/GroovyMapValuesTest.groovy         |    5 +
 .../traversal/step/map/GroovyMatchTest.groovy   |    5 +
 .../traversal/step/map/GroovyUnfoldTest.groovy  |    9 +-
 .../traversal/step/map/GroovyVertexTest.groovy  |   12 +-
 .../step/sideEffect/GroovyProfileTest.groovy    |    2 +-
 .../process/GroovyProcessComputerSuite.java     |    1 +
 .../process/GroovyProcessStandardSuite.java     |    1 +
 gremlin-groovy/pom.xml                          |    2 +-
 .../gremlin/groovy/engine/GremlinExecutor.java  |   32 +-
 .../groovy/engine/GremlinExecutorTest.java      |   11 +-
 .../groovy/engine/GremlinExecutorInit.groovy    |    3 +-
 gremlin-server/conf/gremlin-server-classic.yaml |    2 +-
 .../conf/gremlin-server-modern-readonly.yaml    |    2 +-
 gremlin-server/conf/gremlin-server-modern.yaml  |    2 +-
 gremlin-server/conf/gremlin-server-secure.yaml  |    2 +-
 gremlin-server/conf/gremlin-server.yaml         |    2 +-
 gremlin-server/pom.xml                          |    2 +-
 .../gremlin/server/op/session/Session.java      |    2 -
 .../server/util/ServerGremlinExecutor.java      |    4 -
 .../server/GremlinDriverIntegrateTest.java      |    2 +-
 .../server/GremlinResultSetIntegrateTest.java   |    2 +-
 .../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  |   38 +-
 .../apache/tinkerpop/gremlin/GraphProvider.java |   10 +-
 .../gremlin/process/ProcessComputerSuite.java   |   23 +-
 .../gremlin/process/ProcessStandardSuite.java   |    2 +
 .../traversal/step/branch/RepeatTest.java       |   28 +-
 .../process/traversal/step/map/CountTest.java   |   17 +
 .../process/traversal/step/map/LoopsTest.java   |  152 ++
 .../process/traversal/step/map/MapKeysTest.java |   18 +-
 .../traversal/step/map/MapValuesTest.java       |   18 +-
 .../process/traversal/step/map/MatchTest.java   |   31 +-
 .../process/traversal/step/map/UnfoldTest.java  |   24 +-
 .../process/traversal/step/map/VertexTest.java  |   29 +-
 .../traversal/step/sideEffect/ProfileTest.java  |    6 +-
 .../gremlin/structure/TransactionTest.java      |   13 +-
 .../tinkerpop/gremlin/structure/io/IoTest.java  |   46 +-
 .../structure/io/graphml/graph-types-bad.xml    |   42 +
 hadoop-gremlin/pom.xml                          |    2 +-
 .../gremlin/hadoop/structure/HadoopGraph.java   |    8 +
 neo4j-gremlin/pom.xml                           |    2 +-
 .../step/sideEffect/Neo4jGraphStep.java         |    2 +-
 .../gremlin/neo4j/structure/Neo4jGraph.java     |    8 +-
 pom.xml                                         |    2 +-
 tinkergraph-gremlin/pom.xml                     |    2 +-
 .../step/sideEffect/TinkerGraphStep.java        |    2 +-
 .../tinkergraph/structure/TinkerGraph.java      |    6 +
 .../tinkergraph/structure/TinkerIoRegistry.java |   88 +
 .../tinkergraph/structure/TinkerGraphTest.java  |   44 +-
 122 files changed, 4501 insertions(+), 1108 deletions(-)
----------------------------------------------------------------------