Mailing-List: contact commits-help@tinkerpop.incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: dev@tinkerpop.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: okram@apache.org
To: commits@tinkerpop.incubator.apache.org
Date: Thu, 03 Dec 2015 16:43:27 -0000
Message-Id: <2c53a010da594b95b71c78a55edee814@git.apache.org>
In-Reply-To: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org>
References: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org>
Subject: [31/50] incubator-tinkerpop git commit: Merge remote-tracking branch
 'origin/TINKERPOP3-978'

Merge remote-tracking branch 'origin/TINKERPOP3-978'

Conflicts:
	CHANGELOG.asciidoc
	tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.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/141b7e84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/141b7e84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/141b7e84

Branch: refs/heads/TINKERPOP3-982
Commit: 141b7e841147d335380e6d282e9d096baa8db961
Parents: 6af274b 8760761
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Mon Nov 30 17:01:04 2015 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Mon Nov 30 17:01:04 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   1 +
 .../structure/io/graphson/GraphSONReader.java   |   4 +-
 .../structure/io/graphson/GraphSONTokens.java   |   2 +
 .../structure/io/graphson/GraphSONUtil.java     |  10 +-
 .../structure/io/graphson/GraphSONWriter.java   |   2 +-
 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        |   8 +-
 gremlin-server/conf/gremlin-server-secure.yaml  |   8 +-
 gremlin-server/conf/gremlin-server-spark.yaml   |   8 +-
 gremlin-server/conf/gremlin-server.yaml         |   8 +-
 .../server/GremlinResultSetIntegrateTest.java   |  25 ++-
 .../server/GremlinServerHttpIntegrateTest.java  |  24 +++
 .../server/gremlin-server-integration.yaml      |   4 +-
 .../tinkergraph/structure/TinkerIoRegistry.java | 176 ++++++++++++++++++-
 .../TinkerGraphGryoSerializerTest.java          |  81 +++++++++
 .../structure/TinkerGraphSerializerTest.java    |  81 ---------
 .../tinkergraph/structure/TinkerGraphTest.java  |  34 ++++
 19 files changed, 375 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/141b7e84/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 7473fb7,0ccb1d7..a6acdd6
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,11 -26,7 +26,12 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
+ * `TinkerGraph` has "native" serialization in GraphSON, which enables it to be a return value from Gremlin Server.
 +* Improved the ability to embed Gremlin Server by providing a way to get the `ServerGremlinExecutor` and improve reusability of `AbstractEvalOpProcessor` and related classes.
 +* `ProfileStep` is now available off of `Traversal` via `profile()`. To be consistent with `Traversal.explain()`.
 +* If no comparator is provided to `order()`, `Order.incr` is assumed (previously, an exception occurred).
 +* Fixed various Gremlin-Groovy tests that assumed `toString()`-able ids.
 +* Split TinkerPop documentation into different directories.
  * Added `explain()`-step which yields a `TraversalExplanation` with a pretty `toString()` detailing the compilation process.
  * Fixed a traversal strategy ordering bug in `AdjacentToIncidentStrategy` and `IncidentToAdjacentStrategy`.
  * Made a number of changes to improve traversal startup and execution performance.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/141b7e84/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --cc tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 7ff797b,d1bf381..1ddc909
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@@ -23,12 -23,16 +23,18 @@@ import org.apache.commons.configuration
  import org.apache.tinkerpop.gremlin.TestHelper;
  import org.apache.tinkerpop.gremlin.process.traversal.P;
  import org.apache.tinkerpop.gremlin.structure.Edge;
 +import org.apache.tinkerpop.gremlin.structure.Graph;
  import org.apache.tinkerpop.gremlin.structure.Vertex;
 +import org.apache.tinkerpop.gremlin.structure.io.Io;
+ import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+ import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
  import org.apache.tinkerpop.gremlin.structure.io.IoCore;
 +import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
  import org.apache.tinkerpop.gremlin.structure.io.IoTest;
+ import org.apache.tinkerpop.gremlin.structure.io.Mapper;
+ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
+ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
+ import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
  import org.junit.Ignore;
  import org.junit.Test;