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/05/01 17:53:12 UTC

[41/50] [abbrv] incubator-tinkerpop git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop


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

Branch: refs/heads/variables
Commit: 96e1219e0db8c1a67ff42411f5d6a362952d86dc
Parents: c42e5bc 08617c5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 30 22:02:49 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 30 22:02:49 2015 +0200

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   3 +
 NOTICE                                          |   9 +-
 .../traversal/TraversalScriptSupplier.java      |  15 +-
 .../traversal/TraversalVertexProgram.java       |   4 +-
 .../traversal/VertexTraversalSideEffects.java   |  13 +-
 .../process/traversal/TraversalSideEffects.java |  51 +----
 .../gremlin/process/traversal/Traverser.java    |   2 +-
 .../traversal/step/filter/ExceptStep.java       |   2 +-
 .../traversal/step/filter/RetainStep.java       |   2 +-
 .../step/sideEffect/AggregateStep.java          |  16 +-
 .../sideEffect/GroupCountSideEffectStep.java    |  12 +-
 .../step/sideEffect/GroupSideEffectStep.java    |  17 +-
 .../traversal/step/sideEffect/ProfileStep.java  |  16 +-
 .../step/sideEffect/SideEffectCapStep.java      |  22 +--
 .../traversal/step/sideEffect/StoreStep.java    |  12 +-
 .../step/sideEffect/TreeSideEffectStep.java     |   2 +-
 .../util/DefaultTraversalSideEffects.java       |  27 +--
 .../util/EmptyTraversalSideEffects.java         |   4 +-
 .../tinkerpop/gremlin/structure/Element.java    |   2 +-
 .../gremlin/structure/io/graphml/GraphMLIo.java |  20 ++
 .../structure/io/graphml/GraphMLMapper.java     |   4 +
 .../structure/io/graphml/GraphMLReader.java     |  35 ++++
 .../structure/io/graphml/GraphMLWriter.java     |  40 ++++
 .../io/graphml/GraphMLWriterHelper.java         | 190 ++++++++-----------
 .../structure/io/graphson/GraphSONIo.java       |  18 ++
 .../structure/io/graphson/GraphSONMapper.java   |  12 +-
 .../structure/io/graphson/GraphSONModule.java   |  10 +-
 .../structure/io/graphson/GraphSONReader.java   |  63 +++++-
 .../structure/io/graphson/GraphSONWriter.java   |  35 ++--
 .../io/graphson/LegacyGraphSONReader.java       |  35 ++++
 .../gremlin/structure/io/gryo/GryoMapper.java   |  11 +-
 .../gremlin/structure/io/gryo/GryoReader.java   |   5 +-
 .../process/computer/ComputerTestHelper.groovy  |  11 +-
 .../step/branch/GroovyLocalTest.groovy          |  19 +-
 .../step/branch/GroovyRepeatTest.groovy         |  12 +-
 .../step/branch/GroovyUnionTest.groovy          |  10 +-
 .../step/filter/GroovyCyclicPathTest.groovy     |   8 +-
 .../step/filter/GroovyExceptTest.groovy         |  12 +-
 .../step/filter/GroovyFilterTest.groovy         |   6 +-
 .../step/filter/GroovyHasNotTest.groovy         |   4 +-
 .../traversal/step/filter/GroovyHasTest.groovy  |  29 +--
 .../traversal/step/filter/GroovyIsTest.groovy   |  10 +-
 .../step/filter/GroovyRetainTest.groovy         |  10 +-
 .../step/filter/GroovySimplePathTest.groovy     |   6 +-
 .../step/map/GroovyCoalesceTest.groovy          |   8 +-
 .../traversal/step/map/GroovyMapTest.groovy     |   8 +-
 .../traversal/step/map/GroovyPathTest.groovy    |   6 +-
 .../step/map/GroovyPropertiesTest.groovy        |   8 +-
 .../traversal/step/map/GroovySelectTest.groovy  |  18 +-
 .../step/map/GroovyValueMapTest.groovy          |   6 +-
 .../traversal/step/map/GroovyVertexTest.groovy  |  51 ++---
 .../server/op/AbstractEvalOpProcessor.java      |   2 +-
 .../traversal/TraversalSideEffectsTest.java     |   6 +-
 .../traversal/step/branch/UnionTest.java        |   3 +-
 .../traversal/step/sideEffect/ProfileTest.java  |  10 +-
 .../step/sideEffect/SideEffectTest.java         |   4 +-
 .../traversal/step/sideEffect/SubgraphTest.java |   2 +-
 57 files changed, 559 insertions(+), 419 deletions(-)
----------------------------------------------------------------------