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 2016/08/18 14:39:48 UTC
[1/3] tinkerpop git commit: Add EmptyGraph to console imports.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 5db60212a -> 4906d5979
Add EmptyGraph to console imports.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ef2b484
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ef2b484
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ef2b484
Branch: refs/heads/TINKERPOP-1278
Commit: 5ef2b48484dab2f920cc3a82faf162102261af90
Parents: 5db6021
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 18 10:37:55 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 18 10:37:55 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ef2b484/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
index 27939b1..a7542b6 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
@@ -64,6 +64,7 @@ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedElement;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.Gremlin;
import org.apache.tinkerpop.gremlin.util.TimeUtil;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
@@ -93,6 +94,7 @@ public abstract class AbstractImportCustomizerProvider implements ImportCustomiz
imports.add(GraphFactory.class.getPackage().getName() + DOT_STAR);
imports.add(DetachedElement.class.getPackage().getName() + DOT_STAR);
imports.add(RemoteGraph.class.getPackage().getName() + DOT_STAR);
+ imports.add(EmptyGraph.class.getPackage().getName() + DOT_STAR);
staticImports.add(T.class.getCanonicalName() + DOT_STAR);
staticImports.add(Direction.class.getCanonicalName() + DOT_STAR);
staticImports.add(VertexProperty.Cardinality.class.getCanonicalName() + DOT_STAR);
[2/3] tinkerpop git commit: Update config file for remote connection
using new format now that RemoteGraph is gone.
Posted by sp...@apache.org.
Update config file for remote connection using new format now that RemoteGraph is gone.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/865d35dd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/865d35dd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/865d35dd
Branch: refs/heads/TINKERPOP-1278
Commit: 865d35ddb6838ec3ca29432627ccffb891218289
Parents: 5ef2b48
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 18 10:38:08 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 18 10:38:08 2016 -0400
----------------------------------------------------------------------
gremlin-console/conf/remote-graph.properties | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/865d35dd/gremlin-console/conf/remote-graph.properties
----------------------------------------------------------------------
diff --git a/gremlin-console/conf/remote-graph.properties b/gremlin-console/conf/remote-graph.properties
index 2ae01e1..4fbe0a7 100644
--- a/gremlin-console/conf/remote-graph.properties
+++ b/gremlin-console/conf/remote-graph.properties
@@ -16,9 +16,10 @@
# under the License.
##############################################################
-# This configuration is meant for use with RemoteGraph.
+# This configuration is meant for use with withRemote().
#
-# gremlin> graph = RemoteGraph.open('conf/remote-graph.properties')
+# graph = EmptyGraph.instance()
+# g = graph.traversal().withRemote('conf/remote-graph.properties')
#
# This file will work with:
# - gremlin-server.yaml
@@ -28,7 +29,6 @@
# - gremlin-server-secure.yaml
##############################################################
-gremlin.graph=org.apache.tinkerpop.gremlin.process.remote.RemoteGraph
-gremlin.remoteGraph.remoteConnectionClass=org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection
-gremlin.remoteGraph.driver.clusterFile=conf/remote-objects.yaml
-gremlin.remoteGraph.driver.sourceName=g
\ No newline at end of file
+gremlin.remote.remoteConnectionClass=org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection
+gremlin.remote.driver.clusterFile=conf/remote-objects.yaml
+gremlin.remote.driver.sourceName=g
\ No newline at end of file
[3/3] tinkerpop git commit: Update docs to get rid of RemoteGraph in
favor of withRemote()
Posted by sp...@apache.org.
Update docs to get rid of RemoteGraph in favor of withRemote()
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4906d597
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4906d597
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4906d597
Branch: refs/heads/TINKERPOP-1278
Commit: 4906d5979dade016e06aea6f4fe4c523a7ff8270
Parents: 865d35d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 18 10:39:15 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 18 10:39:15 2016 -0400
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4906d597/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 86bd67c..8fb102d 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -865,8 +865,9 @@ the `TraversalSource` be generated with `EmptyGraph` as follows:
[gremlin-groovy]
----
+import org.apache.tinkerpop.gremlin.structure.util.empty.*
graph = EmptyGraph.instance()
-g = graph.traversal().withRemote('conf/remote-graph.properties'))
+g = graph.traversal().withRemote('conf/remote-graph.properties')
g.V().valueMap(true)
----
@@ -875,11 +876,11 @@ then re-use it.
[gremlin-groovy]
----
+import org.apache.tinkerpop.gremlin.structure.util.empty.*
cluster = Cluster.open('conf/remote-objects.yaml')
graph = EmptyGraph.instance()
g = graph.traversal().withRemote(DriverRemoteConnection.using(cluster, "g"))
g.V().valueMap(true)
-graph.close()
cluster.close()
----