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/06/15 16:33:52 UTC
[1/2] incubator-tinkerpop git commit: Initialize the config for
gremlin-groovy in Settings.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d49f409d4 -> 3a5cdf812
Initialize the config for gremlin-groovy in Settings.
Using an empty Map for the default.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6eeef720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6eeef720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6eeef720
Branch: refs/heads/master
Commit: 6eeef7207abc65cdac1678de61d6809ef3a85739
Parents: be988ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 15 10:32:50 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 15 10:32:50 2015 -0400
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6eeef720/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 1dcaccb..1393897 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.server;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
@@ -27,7 +26,6 @@ import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
import info.ganglia.gmetric4j.gmetric.GMetric;
import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -36,6 +34,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -57,9 +56,10 @@ public class Settings {
scriptEngines.put("gremlin-groovy", new ScriptEngineSettings());
serializers = new ArrayList<>();
- final SerializerSettings graphson = new SerializerSettings();
- graphson.className = GryoMessageSerializerV1d0.class.getName();
- serializers.add(graphson);
+ final SerializerSettings gryoSerializerSettings = new SerializerSettings();
+ gryoSerializerSettings.className = GryoMessageSerializerV1d0.class.getName();
+ gryoSerializerSettings.config = Collections.emptyMap();
+ serializers.add(gryoSerializerSettings);
}
/**
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3a5cdf81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3a5cdf81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3a5cdf81
Branch: refs/heads/master
Commit: 3a5cdf812140b760e12fcdc5090cfbc59a83ec04
Parents: 6eeef72 d49f409
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 15 10:33:44 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 15 10:33:44 2015 -0400
----------------------------------------------------------------------
docs/src/the-traversal.asciidoc | 9 ++++++
.../gremlin/process/traversal/Path.java | 2 +-
.../gremlin/process/traversal/Pop.java | 6 ++++
.../traversal/step/util/ImmutablePath.java | 30 +++++++++-----------
.../traversal/step/util/MutablePath.java | 2 +-
.../gremlin/process/traversal/PathTest.java | 14 ++++-----
pom.xml | 5 ++++
7 files changed, 43 insertions(+), 25 deletions(-)
----------------------------------------------------------------------