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/03/11 18:28:44 UTC
[18/19] incubator-tinkerpop git commit: Merge branch 'newapi' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into newapi
Merge branch 'newapi' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into newapi
Conflicts:
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/57b647d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/57b647d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/57b647d2
Branch: refs/heads/newapi
Commit: 57b647d242122840927d44d703a3ee1a77a7483a
Parents: c099978 a8c46c5
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Mar 11 12:40:53 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Mar 11 12:40:53 2015 -0400
----------------------------------------------------------------------
.../gremlin/process/TraversalContext.java | 12 +-
.../gremlin/process/TraversalEngine.java | 8 +
.../gremlin/process/TraversalStrategies.java | 12 --
.../traversal/TraversalClassSupplier.java | 44 +++++
.../traversal/TraversalVertexProgram.java | 4 -
.../graph/traversal/GraphTraversalContext.java | 41 +++--
.../traversal/step/HasContainerHolder.java | 2 +
.../graph/traversal/step/filter/HasStep.java | 5 +
.../traversal/step/sideEffect/GraphStep.java | 8 +-
.../engine/ComputerTraversalEngine.java | 13 +-
.../engine/StandardTraversalEngine.java | 10 +-
.../traversal/step/SideEffectRegistrar.java | 27 ----
.../strategy/decoration/ElementIdStrategy.java | 67 ++++++++
.../strategy/decoration/ReadOnlyStrategy.java | 50 ++++++
.../tinkerpop/gremlin/structure/Graph.java | 18 +--
.../gremlin/structure/util/StringFactory.java | 8 +
.../gremlin/process/ComputerTestHelper.groovy | 5 +-
.../computer/GroovyGraphComputerTest.groovy | 24 +--
.../AbstractImportCustomizerProvider.java | 5 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 3 +-
.../structure/io/script/script-output.groovy | 12 +-
.../traversal/GraphTraversalMethodsTest.java | 161 -------------------
.../groovy/plugin/HadoopRemoteAcceptor.java | 12 +-
.../giraph/HadoopGiraphGraphProvider.java | 12 +-
.../spark/HadoopSparkGraphProvider.java | 11 +-
.../io/script/ScriptRecordReaderWriterTest.java | 18 +--
.../gremlin/neo4j/structure/Neo4jGraphTest.java | 43 ++---
.../traversal/sideEffect/TinkerGraphStep.java | 12 +-
.../process/TinkerGraphComputerProvider.java | 35 ++++
.../tinkergraph/structure/TinkerGraphTest.java | 10 +-
30 files changed, 369 insertions(+), 323 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/57b647d2/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
----------------------------------------------------------------------