[21/38] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1698
Commit: ea20ca1926b17bca08517ed27793598805341715
Parents: 55af79f 9436585
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 10:04:50 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 10:04:50 2017 -0600

--
 CHANGELOG.asciidoc  |  2 +
 .../process/computer/GraphComputerTest.java | 75 ++--
 .../process/computer/TinkerMessageBoard.java|  4 +-
 .../process/computer/TinkerMessenger.java   | 22 +++---
 4 files changed, 86 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea20ca19/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea20ca19/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--

[35/38] tinkerpop git commit: TINKERPOP-1698 Hooked up Gryo 3.0 for OLAP stuff.

[spmallette]

TINKERPOP-1698 Hooked up Gryo 3.0 for OLAP stuff.

Improved configurability for the version. Parameterized tests for 1.0 and 3.0.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 80e08f52e056b62ff40161160da8b41b94bbf44c
Parents: 9bf1caf
Author: Stephen Mallette 
Authored: Mon Jun 26 13:23:55 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 .../structure/io/GiraphIoRegistryCheck.java |  9 +++--
 .../gremlin/structure/io/gryo/GryoPool.java | 13 -
 .../structure/io/gryo/GryoSerializersV3d0.java  | 12 +++-
 .../ser/GryoMessageSerializerV1d0Test.java  |  3 ---
 .../hadoop/structure/io/HadoopPools.java|  2 ++
 .../structure/io/AbstractIoRegistryCheck.java   | 17 -
 .../structure/io/gryo/GryoRegistrator.java  |  2 +-
 .../spark/structure/io/gryo/GryoSerializer.java |  2 ++
 .../SparkSingleIterationStrategyTest.java   | 20 
 .../structure/io/SparkIoRegistryCheck.java  |  9 +++--
 10 files changed, 78 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80e08f52/giraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/giraph/structure/io/GiraphIoRegistryCheck.java
--
diff --git 
a/giraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/giraph/structure/io/GiraphIoRegistryCheck.java
 
b/giraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/giraph/structure/io/GiraphIoRegistryCheck.java
index 51a2712..0a9dc81 100644
--- 
a/giraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/giraph/structure/io/GiraphIoRegistryCheck.java
+++ 
b/giraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/giraph/structure/io/GiraphIoRegistryCheck.java
@@ -48,8 +48,13 @@ public class GiraphIoRegistryCheck extends 
AbstractIoRegistryCheck {
 }
 
 @Test
-public void shouldSupportGryoIoRegistry() throws Exception {
-super.checkGryoIoRegistryCompliance((HadoopGraph) graph, 
GiraphGraphComputer.class);
+public void shouldSupportGryoV1d0IoRegistry() throws Exception {
+super.checkGryoV1d0IoRegistryCompliance((HadoopGraph) graph, 
GiraphGraphComputer.class);
+}
+
+@Test
+public void shouldSupportGryoV3d0IoRegistry() throws Exception {
+super.checkGryoV3d0IoRegistryCompliance((HadoopGraph) graph, 
GiraphGraphComputer.class);
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80e08f52/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
index 485ac98..0887306 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
@@ -40,7 +40,9 @@ import java.util.function.Function;
 public final class GryoPool {
 
 public static final String CONFIG_IO_GRYO_POOL_SIZE = 
"gremlin.io.gryo.poolSize";
+public static final String CONFIG_IO_GRYO_VERSION = 
"gremlin.io.gryo.version";
 public static final int CONFIG_IO_GRYO_POOL_SIZE_DEFAULT = 256;
+public static final GryoVersion CONFIG_IO_GRYO_POOL_VERSION_DEFAULT = 
GryoVersion.V3_0;
 
 public enum Type {READER, WRITER, READER_WRITER}
 
@@ -145,6 +147,15 @@ public final class GryoPool {
 private List ioRegistries = new ArrayList<>();
 private Type type = Type.READER_WRITER;
 private Consumer gryoMapperConsumer = null;
+private GryoVersion version = GryoVersion.V1_0;
+
+/**
+ * Set the version of Gryo to use for this pool.
+ */
+public Builder version(final GryoVersion version) {
+this.version = version;
+return this;
+}
 
 /**
  * The {@code IoRegistry} class names to use for the {@code GryoPool}
@@ -207,7 +218,7 @@ public final class GryoPool {
  * @return the new pool
  */
 public GryoPool create() {
-final GryoMapper.Builder mapper = 
GryoMapper.build().version(GryoVersion.V1_0);
+final GryoMapper.Builder mapper = 
GryoMapper.build().version(version);
 final GryoPool gryoPool = new GryoPool();
 if (null != 

[36/38] tinkerpop git commit: TINKERPOP-1698 Changed format of property writes

[spmallette]

TINKERPOP-1698 Changed format of property writes

Write properties with streams instead of pulling them into a List in memory


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

Branch: refs/heads/TINKERPOP-1698
Commit: 616a92a7071009e39297ec6215ed92ef5e873953
Parents: b528421
Author: Stephen Mallette 
Authored: Tue Jun 27 08:46:35 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 CHANGELOG.asciidoc  |   1 +
 .../structure/io/gryo/GryoSerializersV3d0.java  |  75 ++-
 .../structure/io/gryo/kryoshim/InputShim.java   |   2 +
 .../structure/io/gryo/kryoshim/OutputShim.java  |   2 +
 .../kryoshim/shaded/ShadedInputAdapter.java |   5 ++
 .../kryoshim/shaded/ShadedOutputAdapter.java|   7 +-
 .../structure/io/gryo/_3_3_0/edge-v3d0.kryo | Bin 41 -> 39 bytes
 .../io/gryo/_3_3_0/standardresult-v3d0.kryo | Bin 235 -> 229 bytes
 .../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo   | Bin 294 -> 306 bytes
 .../io/gryo/_3_3_0/traverser-v3d0.kryo  | Bin 216 -> 210 bytes
 .../structure/io/gryo/_3_3_0/tree-v3d0.kryo | Bin 293 -> 277 bytes
 .../structure/io/gryo/_3_3_0/vertex-v3d0.kryo   | Bin 207 -> 201 bytes
 .../io/gryo/_3_3_0/vertexproperty-v3d0.kryo | Bin 26 -> 23 bytes
 .../kryoshim/unshaded/UnshadedInputAdapter.java |   5 ++
 .../unshaded/UnshadedOutputAdapter.java |   5 ++
 15 files changed, 66 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/616a92a7/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 827d792..0d5b1b8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* Established the Gryo 3.0 format.
 * `GryoVersion` now includes a default `ClassResolver` to supply to the 
`GryoMapper`.
 * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract 
class that for providers to extend in `AbstractGryoClassResolver`.
 * Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/616a92a7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
index 20e13c4..82fa178 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
@@ -31,10 +31,10 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
 import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
@@ -51,6 +51,7 @@ import 
org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -86,14 +87,18 @@ public final class GryoSerializersV3d0 {
 }
 
 kryo.writeClassAndObject(output, edge.outVertex().id());
-output.writeString(edge.outVertex().label());
-
-final List properties = 
IteratorUtils.asList(edge.properties());
-output.writeInt(properties.size());
-properties.forEach(p -> {
-output.writeString(p.key());
-kryo.writeClassAndObject(output, 

[26/38] tinkerpop git commit: TINKERPOP-1694 Added a warning if using useMapperFromGraph

[spmallette]

TINKERPOP-1694 Added a warning if using useMapperFromGraph


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

Branch: refs/heads/TINKERPOP-1698
Commit: 9160a8ae3507ae67a2b88b656ee88580069aa342
Parents: d49548e
Author: Stephen Mallette 
Authored: Mon Jun 26 09:24:02 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:52:12 2017 -0400

--
 .../org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9160a8ae/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 5f2b785..0a784d9 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -204,6 +204,10 @@ public abstract class AbstractChannelizer extends 
ChannelInitializer

[27/38] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'

Conflicts:

gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
gremlin-server/conf/gremlin-server-classic.yaml
gremlin-server/conf/gremlin-server-modern-py.yaml
gremlin-server/conf/gremlin-server-modern-readonly.yaml
gremlin-server/conf/gremlin-server-modern.yaml
gremlin-server/conf/gremlin-server-neo4j.yaml
gremlin-server/conf/gremlin-server-rest-modern.yaml
gremlin-server/conf/gremlin-server-rest-secure.yaml
gremlin-server/conf/gremlin-server-secure.yaml
gremlin-server/conf/gremlin-server-spark.yaml
gremlin-server/conf/gremlin-server.yaml

gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml

gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml

gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml


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

Branch: refs/heads/TINKERPOP-1698
Commit: 4540cd4ae6cd276e82d0662d719a477ca1569e36
Parents: ec11593 9160a8a
Author: Stephen Mallette 
Authored: Wed Jun 28 13:58:54 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:58:54 2017 -0400

--
 CHANGELOG.asciidoc|  1 +
 docs/src/reference/gremlin-applications.asciidoc  |  5 ++---
 docs/src/upgrade/release-3.2.x-incubating.asciidoc|  9 +
 .../src/test/resources/gremlin-server.yaml|  2 +-
 gremlin-console/conf/remote-objects.yaml  |  5 -
 .../driver/ser/AbstractGraphSONMessageSerializerV1d0.java |  5 +
 .../driver/ser/AbstractGraphSONMessageSerializerV2d0.java |  5 +
 .../driver/ser/AbstractGryoMessageSerializerV1d0.java |  6 ++
 .../python/driver/gremlin-server-modern-secure-py.yaml| 10 +-
 gremlin-server/conf/gremlin-server-classic.yaml   | 10 +-
 gremlin-server/conf/gremlin-server-modern-py.yaml | 10 +-
 gremlin-server/conf/gremlin-server-modern-readonly.yaml   | 10 +-
 gremlin-server/conf/gremlin-server-modern.yaml| 10 +-
 gremlin-server/conf/gremlin-server-neo4j.yaml | 10 +-
 gremlin-server/conf/gremlin-server-rest-modern.yaml   |  6 +++---
 gremlin-server/conf/gremlin-server-rest-secure.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-secure.yaml| 10 +-
 gremlin-server/conf/gremlin-server-spark.yaml | 10 +-
 gremlin-server/conf/gremlin-server.yaml   | 10 +-
 .../tinkerpop/gremlin/server/AbstractChannelizer.java |  4 
 .../gremlin/driver/remote/gremlin-server-integration.yaml | 10 +-
 .../gremlin/server/gremlin-server-integration.yaml| 10 +-
 22 files changed, 93 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
--
diff --cc 
gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
index 5da82d7,cdabeb4..ffe4d07
--- 
a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
+++ 
b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
@@@ -23,13 -23,15 +23,13 @@@ scriptEvaluationTimeout: 3000
  serializedResponseTimeout: 3
  graphs: {
graph: conf/tinkergraph-empty.properties}
 -plugins:
 -  - tinkerpop.tinkergraph
  scriptEngines: {
gremlin-groovy: {
 -imports: [java.lang.Math],
 -staticImports: [java.lang.Math.PI],
 -scripts: [scripts/generate-modern.groovy]}}
 +plugins: { 

[29/38] tinkerpop git commit: TINKERPOP-1698 Gryo 3.0 WIP

[spmallette]

TINKERPOP-1698 Gryo 3.0 WIP


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

Branch: refs/heads/TINKERPOP-1698
Commit: 69565d476b44e86cd99803507e5359d6ced1da5c
Parents: 1d3e9a1
Author: Stephen Mallette 
Authored: Thu Jun 22 19:01:05 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:20:29 2017 -0400

--
 .../structure/io/gryo/GryoSerializers.java  | 285 --
 .../structure/io/gryo/GryoSerializersV1d0.java  | 285 ++
 .../structure/io/gryo/GryoSerializersV3d0.java  | 380 +++
 .../gremlin/structure/io/gryo/GryoVersion.java  |  63 +--
 .../structure/util/detached/DetachedVertex.java |   1 +
 .../util/detached/DetachedVertexProperty.java   |   9 +
 .../driver/ser/GryoMessageSerializerV1d0.java   |   5 +-
 .../driver/ser/GryoMessageSerializerV3d0.java   |  56 +++
 .../tinkerpop/gremlin/driver/ser/SerTokens.java |   1 +
 gremlin-server/conf/gremlin-server.yaml |   1 +
 .../structure/io/gryo/_3_3_0/edge-v3d0.kryo | Bin 57 -> 41 bytes
 .../structure/io/gryo/_3_3_0/property-v3d0.kryo |   2 +-
 .../io/gryo/_3_3_0/standardresult-v3d0.kryo | Bin 230 -> 235 bytes
 .../io/gryo/_3_3_0/traverser-v3d0.kryo  | Bin 211 -> 216 bytes
 .../structure/io/gryo/_3_3_0/tree-v3d0.kryo | Bin 284 -> 293 bytes
 .../structure/io/gryo/_3_3_0/vertex-v3d0.kryo   | Bin 202 -> 207 bytes
 .../io/gryo/_3_3_0/vertexproperty-v3d0.kryo | Bin 18 -> 26 bytes
 .../structure/io/gryo/GryoRegistrator.java  |  30 +-
 18 files changed, 788 insertions(+), 330 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69565d47/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
deleted file mode 100644
index dd88a56..000
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import 
org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import 

[07/38] tinkerpop git commit: TINKERPOP-741 Added upgrade docs around deprecation

[spmallette]

TINKERPOP-741 Added upgrade docs around deprecation


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

Branch: refs/heads/TINKERPOP-1698
Commit: 21bc4d85945cdd9beeeaedd92eb2769d75de53ba
Parents: 80822ee
Author: Stephen Mallette 
Authored: Mon Jun 19 12:24:47 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 12:25:09 2017 -0400

--
 docs/src/upgrade/release-3.3.x.asciidoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21bc4d85/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index dbb40b4..9507603 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -196,6 +196,7 @@ The following deprecated classes, methods or fields have 
been removed in this ve
 ** 
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_COMPUTER`
 ** 
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT`
 ** 
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT_INTEGRATE`
+** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
 * `gremlin-groovy`
 ** `org.apache.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider`
 ** `org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider`

[10/38] tinkerpop git commit: Merge branch 'TINKERPOP-1445'

[spmallette]

Merge branch 'TINKERPOP-1445'

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1698
Commit: 7d2b46b0f25471d7648e74c15afeb0653d05c084
Parents: 77c0477 47afd7a
Author: Stephen Mallette 
Authored: Mon Jun 26 10:18:12 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 26 10:18:12 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../gremlin/structure/util/StringFactory.java   |  9 +++
 .../gremlin/structure/PropertyTest.java | 28 +++-
 3 files changed, 31 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7d2b46b0/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 4e4844c,eb8ad8a..c34b3ff
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,7 +26,9 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~
  
 +* Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.
 +* `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
+ * Included an ellipse on long property names that are truncated.
  * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
  * Added more specific typing to various `__` traversal steps. E.g. 
`out()` is `out()`.
  * Updated Docker build scripts to include Python dependencies (NOTE: users 
should remove any previously generated TinkerPop Docker images).

[15/38] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1698
Commit: 55af79f78fb8f1c84be8764728695d95ca8bcf18
Parents: 1ba875b 5ac61b7
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:50:39 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:39 2017 -0600

--
 CHANGELOG.asciidoc   | 1 +
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55af79f7/CHANGELOG.asciidoc
--

[02/38] tinkerpop git commit: bugfix

[spmallette]

bugfix


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

Branch: refs/heads/TINKERPOP-1698
Commit: 28c514da9065683ed90ea6aabc66ffdcbab99c11
Parents: b1c0723
Author: Sheldon 
Authored: Thu Jun 15 18:00:32 2017 +0100
Committer: Sheldon 
Committed: Mon Jun 19 11:20:20 2017 +0100

--
 .../process/computer/TinkerMessageBoard.java|  4 ++--
 .../process/computer/TinkerMessenger.java   | 22 +---
 2 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28c514da/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
--
diff --git 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
index b217801..422ab86 100644
--- 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
+++ 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
@@ -32,8 +32,8 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 final class TinkerMessageBoard {
 
-public Map sendMessages = new ConcurrentHashMap<>();
-public Map receiveMessages = new ConcurrentHashMap<>();
+public Map> sendMessages = new 
ConcurrentHashMap<>();
+public Map> receiveMessages = new 
ConcurrentHashMap<>();
 public Set previousMessageScopes = new HashSet<>();
 public Set currentMessageScopes = new HashSet<>();
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28c514da/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
--
diff --git 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
index 3298aff..d3f2de5 100644
--- 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
+++ 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
@@ -37,6 +37,7 @@ import java.util.Optional;
 import java.util.Queue;
 import java.util.Spliterator;
 import java.util.Spliterators;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -59,14 +60,15 @@ public final class TinkerMessenger implements 
Messenger {
 @Override
 public Iterator receiveMessages() {
 final MultiIterator multiIterator = new MultiIterator<>();
-for (final MessageScope messageScope : 
this.messageBoard.previousMessageScopes) {
+for (final MessageScope messageScope : 
this.messageBoard.receiveMessages.keySet()) {
+//for (final MessageScope messageScope : 
this.messageBoard.previousMessageScopes) {
 if (messageScope instanceof MessageScope.Local) {
 final MessageScope.Local localMessageScope = 
(MessageScope.Local) messageScope;
 final Traversal.Admin incidentTraversal = 
TinkerMessenger.setVertexStart(localMessageScope.getIncidentTraversal().get().asAdmin(),
 this.vertex);
 final Direction direction = 
TinkerMessenger.getDirection(incidentTraversal);
 final Edge[] edge = new Edge[1]; // simulates storage 
side-effects available in Gremlin, but not Java8 streams
 
multiIterator.addIterator(StreamSupport.stream(Spliterators.spliteratorUnknownSize(VertexProgramHelper.reverse(incidentTraversal.asAdmin()),
 Spliterator.IMMUTABLE | Spliterator.SIZED), false)
-.map(e -> 
this.messageBoard.receiveMessages.get((edge[0] = e).vertices(direction).next()))
+.map(e -> 
this.messageBoard.receiveMessages.get(messageScope).get((edge[0] = 
e).vertices(direction).next()))
 .filter(q -> null != q)
 .flatMap(Queue::stream)
 .map(message -> 
localMessageScope.getEdgeFunction().apply(message, edge[0]))
@@ 

[18/38] tinkerpop git commit: fixed up the MultiScope test to use MODERN so that it works with Giraph and Spark. Will back tweak to tp31/.

[spmallette]

fixed up the MultiScope test to use MODERN so that it works with Giraph and 
Spark. Will back tweak to tp31/.


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

Branch: refs/heads/TINKERPOP-1698
Commit: f1aed80b056c2244ce8b23ab077e8b10ee6939d9
Parents: 5ac61b7 3b8c628
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 09:50:15 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 09:50:15 2017 -0600

--
 CHANGELOG.asciidoc  |  2 +
 .../process/computer/GraphComputerTest.java | 75 ++--
 .../process/computer/TinkerMessageBoard.java|  4 +-
 .../process/computer/TinkerMessenger.java   | 22 +++---
 4 files changed, 88 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1aed80b/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1aed80b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 5c66673,02ac5d4..e4b40e8
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@@ -24,35 -22,18 +24,32 @@@ import org.apache.commons.configuration
  import org.apache.tinkerpop.gremlin.ExceptionCoverage;
  import org.apache.tinkerpop.gremlin.LoadGraphWith;
  import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 +import 
org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder;
  import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
  import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.P;
- import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
  import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 +import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
  import org.apache.tinkerpop.gremlin.structure.Direction;
 -import org.apache.tinkerpop.gremlin.structure.Element;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
  import org.apache.tinkerpop.gremlin.structure.Graph;
 +import org.apache.tinkerpop.gremlin.structure.Property;
  import org.apache.tinkerpop.gremlin.structure.Vertex;
  import org.apache.tinkerpop.gremlin.structure.VertexProperty;
  import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
  import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 +import org.javatuples.Pair;
- import org.junit.Ignore;
  import org.junit.Test;
  
- import java.util.AbstractMap;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collections;
@@@ -70,15 -50,11 +68,14 @@@ import java.util.concurrent.Future
  
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
 +import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
- import static org.apache.tinkerpop.gremlin.structure.T.id;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
 +import static org.junit.Assume.assumeNoException;
 +
+ 
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
@@@ -1588,567 -1468,92 +1585,635 @@@ public class GraphComputerTest extends 
  public void storeState(final Configuration configuration) {
  

[14/38] tinkerpop git commit: EdgeVertexStep is no longer final and can be extended by providers.

[spmallette]

EdgeVertexStep is no longer final and can be extended by providers.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 2ba8debdabfdfdcdce231477b3584299746e9c8c
Parents: 1518cc4
Author: Marko A. Rodriguez 
Authored: Thu Jun 22 07:15:15 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:22 2017 -0600

--
 CHANGELOG.asciidoc | 1 +
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ba8debd/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7a69469..1b46dcf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 This release also includes changes from <>.
 
 * Added annotations to the traversal metrics pretty print.
+* `EdgeVertexStep` is no longer final and can be extended by providers.
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
 * Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ba8debd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
index 87c1561..d7ebd32 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
@@ -33,7 +33,7 @@ import java.util.Set;
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
+public class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
 
 private Direction direction;
 

[25/38] tinkerpop git commit: TINKERPOP-1694 Deprecated useMapperFromGraph

[spmallette]

TINKERPOP-1694 Deprecated useMapperFromGraph


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

Branch: refs/heads/TINKERPOP-1698
Commit: d49548eacc88c5a34cc4f01f6367552604ad6cf3
Parents: aa81313
Author: Stephen Mallette 
Authored: Fri Jun 23 12:26:46 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:52:12 2017 -0400

--
 CHANGELOG.asciidoc|  1 +
 docs/src/reference/gremlin-applications.asciidoc  |  5 ++---
 docs/src/upgrade/release-3.2.x-incubating.asciidoc|  9 +
 .../src/test/resources/gremlin-server.yaml|  2 +-
 gremlin-console/conf/remote-objects.yaml  |  5 -
 .../driver/ser/AbstractGraphSONMessageSerializerV1d0.java |  5 +
 .../driver/ser/AbstractGraphSONMessageSerializerV2d0.java |  5 +
 .../driver/ser/AbstractGryoMessageSerializerV1d0.java |  6 ++
 .../python/driver/gremlin-server-modern-secure-py.yaml| 10 +-
 gremlin-server/conf/gremlin-server-classic.yaml   |  8 
 gremlin-server/conf/gremlin-server-modern-py.yaml |  8 
 gremlin-server/conf/gremlin-server-modern-readonly.yaml   |  8 
 gremlin-server/conf/gremlin-server-modern.yaml|  8 
 gremlin-server/conf/gremlin-server-neo4j.yaml |  8 
 gremlin-server/conf/gremlin-server-rest-modern.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-rest-secure.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-secure.yaml|  8 
 gremlin-server/conf/gremlin-server-spark.yaml |  8 
 gremlin-server/conf/gremlin-server.yaml   |  8 
 .../gremlin/driver/remote/gremlin-server-integration.yaml |  8 
 .../gremlin/server/gremlin-server-integration.yaml|  8 
 .../gremlin/server/gremlin-server-performance.yaml|  2 +-
 22 files changed, 79 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d49548ea/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ba9f2a7..b438248 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 This release also includes changes from <>.
 
+* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server 
serializers.
 * Added annotations to the traversal metrics pretty print.
 * `EdgeVertexStep` is no longer final and can be extended by providers.
 * Deprecated `Transaction.submit(Function)`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d49548ea/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index e62ce86..0d93194 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1518,7 +1518,7 @@ consistent with standard JSON data types.  It has the 
following configuration op
 [width="100%",cols="3,10,^2",options="header"]
 |=
 |Key |Description |Default
-|useMapperFromGraph |Specifies the name of the `Graph` (from the `graphs` 
`Map` in the configuration file) from which to plugin any custom serializers 
that are tied to it. |_none_
+|ioRegistries |A list of `IoRegistry` implementations to be applied to the 
serializer. |_none_
 |=
 
 [source,yaml]
@@ -1532,7 +1532,7 @@ type names, so interpretation from non-JVM languages will 
be required.  It has t
 [width="100%",cols="3,10,^2",options="header"]
 |=
 |Key |Description |Default
-|useMapperFromGraph |Specifies the name of the `Graph` (from the `graphs` 
`Map` in the configuration file) from which to plugin any custom serializers 
that are tied to it. |_none_
+|ioRegistries |A list of `IoRegistry` implementations to be applied to the 
serializer. |_none_
 |=
 
 Gryo
@@ -1554,7 +1554,6 @@ It has the MIME type of 
`application/vnd.gremlin-v1.0+gryo` and the following co
 |custom |A list of classes with custom kryo `Serializer` implementations 
related to them in the form of `;`. |_none_
 |ioRegistries |A list of `IoRegistry` implementations to be applied to the 

[04/38] tinkerpop git commit: TINKERPOP-741 Deprecated Transaction.submit(Function)

[spmallette]

TINKERPOP-741 Deprecated Transaction.submit(Function)


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

Branch: refs/heads/TINKERPOP-1698
Commit: eba0a2c0a3dbb8ea1bb4d5358b8c7445cad15c85
Parents: 9af4cce
Author: Stephen Mallette 
Authored: Mon Jun 19 11:45:32 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 11:51:51 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/the-graph.asciidoc   | 20 
 .../gremlin/structure/Transaction.java  |  4 
 .../structure/util/AbstractTransaction.java |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4e6dc16..bfb7aa9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 This release also includes changes from <>.
 
+* Deprecated `Transaction.submit(Function)`.
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/docs/src/reference/the-graph.asciidoc
--
diff --git a/docs/src/reference/the-graph.asciidoc 
b/docs/src/reference/the-graph.asciidoc
index 063c174..b66f5bd 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -280,26 +280,6 @@ NOTE: It may be important to consult the documentation of 
the `Graph` implementa
 specifics of how transactions will behave.  TinkerPop allows some latitude in 
this area and implementations may not have
 the exact same behaviors and link:https://en.wikipedia.org/wiki/ACID[ACID] 
guarantees.
 
-Retries
-~~~
-
-There are times when transactions fail.  Failure may be indicative of some 
permanent condition, but other failures
-might simply require the transaction to be retried for possible future 
success. The `Transaction` object also exposes
-a method for executing automatic transaction retries:
-
-[gremlin-groovy]
-
-graph = Neo4jGraph.open('/tmp/neo4j')
-graph.tx().submit {it.addVertex("name","josh")}.retry(10)
-graph.tx().submit {it.addVertex("name","daniel")}.exponentialBackoff(10)
-graph.close()
-
-
-As shown above, the `submit` method takes a `Function` which is the 
unit of work to execute and possibly
-retry on failure.  The method returns a `Transaction.Workload` object which 
has a number of default methods for common
-retry strategies.  It is also possible to supply a custom retry function if a 
default one does not suit the required
-purpose.
-
 Threaded Transactions
 ~
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
index 82f3820..ff4232d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
@@ -63,7 +63,9 @@ public interface Transaction extends AutoCloseable {
 /**
  * Submit a unit of work that represents a transaction returning a {@link 
Workload} that can be automatically
  * retried in the event of failure.
+ * @deprecated As of release 3.2.6, not replaced.
  */
+@Deprecated
 public  Workload submit(final Function work);
 
 /**
@@ -228,7 +230,9 @@ public interface Transaction extends AutoCloseable {
  * or the unit of work succeeds with a commit operation.
  *
  * @param  The type of the result from the unit of work.
+ * @deprecated As of release 3.2.6, not replaced.
  */
+@Deprecated
 public static class Workload {
 public static final long DEFAULT_DELAY_MS = 20;
 public static final int DEFAULT_TRIES = 8;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
--
diff --git 

[20/38] tinkerpop git commit: Merge branch 'tp31' into tp32

[spmallette]

Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1698
Commit: 943658531ba8a3bb8050c169ad2180f81cda96db
Parents: f1aed80 e7f5ef7
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 10:04:37 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 10:04:37 2017 -0600

--
 .../tinkerpop/gremlin/process/computer/GraphComputerTest.java  | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94365853/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index e4b40e8,e2acd5e..380887b
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@@ -73,9 -52,7 +73,8 @@@ import static org.junit.Assert.assertEq
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
 +import static org.junit.Assume.assumeNoException;
  
- 
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
@@@ -1591,7 -1472,7 +1590,7 @@@ public class GraphComputerTest extends 
  @Test
  @LoadGraphWith(MODERN)
  public void shouldSupportMultipleScopes() throws ExecutionException, 
InterruptedException {
- final ComputerResult result = graph.compute().program(new 
MultiScopeVertexProgram()).submit().get();
 -final ComputerResult result = 
graph.compute(graphComputerClass.get()).program(new 
MultiScopeVertexProgram()).submit().get();
++final ComputerResult result = 
graphProvider.getGraphComputer(graph).program(new 
MultiScopeVertexProgram()).submit().get();
  assertEquals(result.graph().traversal().V().has("name", 
"josh").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 0L);
  assertEquals(result.graph().traversal().V().has("name", 
"lop").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
  assertEquals(result.graph().traversal().V().has("name", 
"ripple").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
@@@ -1653,968 -1535,6 +1652,965 @@@
  public GraphComputer.ResultGraph getPreferredResultGraph() {
  return GraphComputer.ResultGraph.NEW;
  }
- 
 +}
 +
 +/
 +
 +@Test
 +@LoadGraphWith(MODERN)
 +public void shouldSupportGraphFilter() throws Exception {
 +// if the graph computer does not support graph filter, then make 
sure its exception handling is correct
 +if 
(!graphProvider.getGraphComputer(graph).features().supportsGraphFilter()) {
 +try {
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("software"));
 +fail("Should throw an unsupported operation exception");
 +} catch (final UnsupportedOperationException e) {
 +
assertEquals(GraphComputer.Exceptions.graphFilterNotSupported().getMessage(), 
e.getMessage());
 +}
 +try {
 +
graphProvider.getGraphComputer(graph).edges(__.outE().limit(10));
 +fail("Should throw an unsupported operation exception");
 +} catch (final UnsupportedOperationException e) {
 +
assertEquals(GraphComputer.Exceptions.graphFilterNotSupported().getMessage(), 
e.getMessage());
 +}
 +return;
 +}
 +/// VERTEX PROGRAM
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("software")).program(new
 VertexProgramM(VertexProgramM.SOFTWARE_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("person")).program(new
 VertexProgramM(VertexProgramM.PEOPLE_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).edges(__.bothE("knows")).program(new 
VertexProgramM(VertexProgramM.KNOWS_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("person")).edges(__.bothE("knows")).program(new
 VertexProgramM(VertexProgramM.PEOPLE_KNOWS_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("person")).edges(__.bothE("knows").has("weight",
 P.gt(0.5f))).program(new 

[19/38] tinkerpop git commit: tweaked the MessageScope bug fix test to use MODERN so it works with Spark and Giraph. Simple tweak to test data, not semantics. CTR.

[spmallette]

tweaked the MessageScope bug fix test to use MODERN so it works with Spark and 
Giraph. Simple tweak to test data, not semantics. CTR.


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

Branch: refs/heads/TINKERPOP-1698
Commit: e7f5ef711b1edbd130f23610d993e13d44d5df50
Parents: 3b8c628
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 09:55:35 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 09:55:35 2017 -0600

--
 .../process/computer/GraphComputerTest.java | 42 +---
 1 file changed, 10 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e7f5ef71/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 02ac5d4..e2acd5e 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -26,7 +26,6 @@ import 
org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
 import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
@@ -41,7 +40,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
@@ -1472,27 +1470,16 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 
 /
 @Test
+@LoadGraphWith(MODERN)
 public void shouldSupportMultipleScopes() throws ExecutionException, 
InterruptedException {
-Vertex a = graph.addVertex("a");
-Vertex b = graph.addVertex("b");
-Vertex c = graph.addVertex("c");
-a.addEdge("edge", b);
-b.addEdge("edge", c);
-
-// Simple graph:
-// a -> b -> c
-
-// Execute a traversal program that sends an incoming message of "2" 
and an outgoing message of "1" from "b"
-// then each vertex sums any received messages
-ComputerResult result = graph.compute().program(new 
MultiScopeVertexProgram()).submit().get();
-
-// We expect the results to be {a=2, b=0, c=1}. Instead it is {a=3, 
b=0, c=3}
-assertEquals((Long) 
result.graph().traversal().V().hasLabel("a").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(2L));
-assertEquals((Long) 
result.graph().traversal().V().hasLabel("b").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(0L));
-assertEquals((Long) 
result.graph().traversal().V().hasLabel("c").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(1L));
+final ComputerResult result = 
graph.compute(graphComputerClass.get()).program(new 
MultiScopeVertexProgram()).submit().get();
+assertEquals(result.graph().traversal().V().has("name", 
"josh").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 0L);
+assertEquals(result.graph().traversal().V().has("name", 
"lop").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
+assertEquals(result.graph().traversal().V().has("name", 
"ripple").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
+assertEquals(result.graph().traversal().V().has("name", 
"marko").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 2L);
 }
 
-public static class MultiScopeVertexProgram implements VertexProgram 
{
+public static class MultiScopeVertexProgram extends 
StaticVertexProgram {
 
 private final MessageScope.Local countMessageScopeIn = 
MessageScope.Local.of(__::inE);
 private final MessageScope.Local countMessageScopeOut = 
MessageScope.Local.of(__::outE);
@@ -1502,7 +1489,8 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 private static final Set COMPUTE_KEYS = 

[17/38] tinkerpop git commit: updated CHANGELOG.

[spmallette]

updated CHANGELOG.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 3b8c62892b3369a2ada0314f33f0b5122a4d6e82
Parents: d67b88b
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:54:00 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:54:00 2017 -0600

--
 CHANGELOG.asciidoc | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3b8c6289/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d421cb5..5436fd9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.1.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* Fixed a `MessageScope` bug in `TinkerGraphComputer`.
+
 [[release-3-1-7]]
 TinkerPop 3.1.7 (Release Date: June 12, 2017)
 ~

[33/38] tinkerpop git commit: TINKERPOP-1698 Initialize computedMetrics

[spmallette]

TINKERPOP-1698 Initialize computedMetrics

Without that initialization there are scenarios in sparkgraphcomputer where 
serialization will fail. The Gryo 3.0 TraversalMetricSerializer gets a 
collection of computed metrics and null pointers basically.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 07c97aafd404d38ae7d3621b4f17ac987a806567
Parents: 80e08f5
Author: Stephen Mallette 
Authored: Mon Jun 26 15:41:38 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 .../gremlin/process/traversal/util/DefaultTraversalMetrics.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07c97aaf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index c5f290a..584456a 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -52,7 +52,7 @@ public final class DefaultTraversalMetrics implements 
TraversalMetrics, Serializ
 The following are computed values upon the completion of profiling in 
order to report the results back to the user
  */
 private long totalStepDuration;
-private Map computedMetrics;
+private Map computedMetrics = new 
LinkedHashMap<>();
 
 public DefaultTraversalMetrics() {
 }

[32/38] tinkerpop git commit: TINKERPOP-1698 Fixed up a bunch of tests with Gryo V3

[spmallette]

TINKERPOP-1698 Fixed up a bunch of tests with Gryo V3

Basically had to default everything to work on V3. Might need to change up some 
tests to validate V1 specifically still.


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

Branch: refs/heads/TINKERPOP-1698
Commit: cc22b7136f7e6603cbc31902f02b113a75a4ced0
Parents: b599980
Author: Stephen Mallette 
Authored: Mon Jun 26 09:03:13 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 .../src/test/resources/gremlin-server.yaml  |   1 +
 .../io/gryo/GryoClassResolverV1d0.java  |   2 +-
 .../io/gryo/GryoClassResolverV3d0.java  |   2 +-
 .../gremlin/structure/io/gryo/GryoMapper.java   |   2 +-
 .../gremlin/structure/io/gryo/GryoPool.java |   2 +-
 .../structure/io/gryo/GryoSerializersV3d0.java  |  32 +-
 .../gremlin/structure/io/gryo/GryoVersion.java  |  10 +-
 .../structure/io/gryo/GryoMapperTest.java   |  49 +-
 .../tinkerpop/gremlin/driver/Cluster.java   |   2 +-
 .../tinkerpop/gremlin/driver/Settings.java  |   4 +-
 .../gremlin/driver/ser/Serializers.java |   3 +
 .../gremlin/driver/simple/NioClient.java|   4 +-
 .../gremlin/driver/simple/WebSocketClient.java  |   5 +-
 .../ser/GryoBaseMessageSerializerTest.java  | 617 +++
 .../ser/GryoBaseMessageSerializerV1d0Test.java  | 613 --
 .../server/GremlinDriverIntegrateTest.java  |   4 +-
 .../server/GremlinResultSetIntegrateTest.java   |   8 +-
 .../remote/gremlin-server-integration.yaml  |   1 +
 .../server/gremlin-server-integration.yaml  |   1 +
 .../gremlin/structure/SerializationTest.java|   3 +-
 .../gremlin/structure/io/IoCustomTest.java  |  10 +-
 .../io/gryo/GryoCompatibilityTest.java  |   4 +-
 .../structure/io/gryo/GryoRegistrator.java  |   3 +-
 .../jsr223/TinkerGraphGremlinPlugin.java|   2 +
 .../TinkerGraphGryoSerializerV2d0Test.java  |   2 +-
 .../TinkerGraphGryoSerializerV3d0Test.java  |  80 +++
 .../tinkergraph/structure/TinkerGraphTest.java  |   5 +-
 27 files changed, 794 insertions(+), 677 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc22b713/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
--
diff --git 
a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
 
b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
index ffe4d07..c0e4e3c 100644
--- 
a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
+++ 
b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
@@ -30,6 +30,7 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: 
{files: [scripts/generate-modern.groovy]
 serializers:
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
   # application/vnd.gremlin-v1.0+gryo
+  - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
serializeResultToString: true }}   # application/vnd.gremlin-v1.0+gryo-stringd
 metrics: {
   slf4jReporter: {enabled: true, interval: 18}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc22b713/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
index 12a9bfb..82531b0 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
@@ -57,7 +57,7 @@ public class 

[05/38] tinkerpop git commit: Merge branch 'TINKERPOP-741' into TINKERPOP-741-master

[spmallette]

Merge branch 'TINKERPOP-741' into TINKERPOP-741-master


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

Branch: refs/heads/TINKERPOP-1698
Commit: 21102e4fa86c1094a36e44bba8147d27f3da7628
Parents: 05d8a0a eba0a2c
Author: Stephen Mallette 
Authored: Mon Jun 19 11:52:04 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 11:52:04 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/the-graph.asciidoc   | 20 
 .../gremlin/structure/Transaction.java  |  4 
 .../structure/util/AbstractTransaction.java |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21102e4f/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21102e4f/docs/src/reference/the-graph.asciidoc
--

[30/38] tinkerpop git commit: TINKERPOP-1698 Metrics serializer for gryo 3.0 and abstract ClassResolver

[spmallette]

TINKERPOP-1698 Metrics serializer for gryo 3.0 and abstract ClassResolver


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

Branch: refs/heads/TINKERPOP-1698
Commit: b599980566d44a7dda997263c29b2a71e1e5fde5
Parents: 69565d4
Author: Stephen Mallette 
Authored: Sat Jun 24 09:55:20 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:20:29 2017 -0400

--
 CHANGELOG.asciidoc  |   2 +
 .../tinkerpop/gremlin/jsr223/CoreImports.java   |   6 +-
 .../io/gryo/AbstractGryoClassResolver.java  | 188 +++
 .../structure/io/gryo/GryoClassResolver.java| 227 ---
 .../io/gryo/GryoClassResolverV1d0.java  |  79 +++
 .../io/gryo/GryoClassResolverV3d0.java  |  85 +++
 .../gremlin/structure/io/gryo/GryoMapper.java   |   8 +-
 .../structure/io/gryo/GryoSerializersV1d0.java  |   1 -
 .../structure/io/gryo/GryoSerializersV3d0.java  |  70 ++
 .../gremlin/structure/io/gryo/GryoVersion.java  |  24 +-
 .../structure/io/gryo/GryoMapperTest.java   |   2 +-
 .../ser/GryoBaseMessageSerializerV1d0Test.java  |   4 +-
 gremlin-tools/gremlin-io-test/pom.xml   |   2 +-
 .../structure/io/gryo/_3_3_0/metrics-v3d0.kryo  | Bin 187 -> 184 bytes
 .../io/gryo/_3_3_0/traversalmetrics-v3d0.kryo   | Bin 294 -> 308 bytes
 .../tinkergraph/structure/TinkerGraphTest.java  |   4 +-
 16 files changed, 456 insertions(+), 246 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5999805/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7a93c45..827d792 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* `GryoVersion` now includes a default `ClassResolver` to supply to the 
`GryoMapper`.
+* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract 
class that for providers to extend in `AbstractGryoClassResolver`.
 * Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.
 * `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
 * Included an ellipse on long property names that are truncated.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5999805/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index 1296cfe..7f82834 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@ -112,7 +112,8 @@ import 
org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolver;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1d0;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV3d0;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
@@ -192,7 +193,8 @@ public final class CoreImports {
 CLASS_IMPORTS.add(GraphSONVersion.class);
 CLASS_IMPORTS.add(GraphSONWriter.class);
 CLASS_IMPORTS.add(LegacyGraphSONReader.class);
-CLASS_IMPORTS.add(GryoClassResolver.class);
+CLASS_IMPORTS.add(GryoClassResolverV1d0.class);
+CLASS_IMPORTS.add(GryoClassResolverV3d0.class);
 CLASS_IMPORTS.add(GryoIo.class);
 CLASS_IMPORTS.add(GryoMapper.class);
 CLASS_IMPORTS.add(GryoReader.class);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5999805/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/AbstractGryoClassResolver.java
--
diff --git 

[34/38] tinkerpop git commit: TINKERPOP-1698 Refactored gryo serialization tests

[spmallette]

TINKERPOP-1698 Refactored gryo serialization tests

Did a better job parameterizing tests for re-use.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 045eb052fb07d553cef15d455b14595ca6fa8327
Parents: cc22b71
Author: Stephen Mallette 
Authored: Mon Jun 26 11:19:29 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 .../ser/GryoBaseMessageSerializerTest.java  | 617 ---
 .../ser/GryoMessageSerializerV1d0Test.java  | 575 -
 .../gremlin/structure/FeatureSupportTest.java   |   6 +-
 3 files changed, 571 insertions(+), 627 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/045eb052/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoBaseMessageSerializerTest.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoBaseMessageSerializerTest.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoBaseMessageSerializerTest.java
deleted file mode 100644
index fff95dd..000
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoBaseMessageSerializerTest.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1d0;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.kryo.ClassResolver;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.KryoException;
-import org.apache.tinkerpop.shaded.kryo.Registration;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.Supplier;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(Parameterized.class)
-public class GryoBaseMessageSerializerTest {
-@Parameterized.Parameters(name = "expect({0})")
-public static Iterable data() {
-final GryoMessageSerializerV1d0 v1d0Text = new 
GryoMessageSerializerV1d0();
-   

[24/38] tinkerpop git commit: Merge branch 'TINKERPOP-741-master'

[spmallette]

Merge branch 'TINKERPOP-741-master'

Conflicts:
CHANGELOG.asciidoc
docs/src/upgrade/release-3.3.x.asciidoc


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

Branch: refs/heads/TINKERPOP-1698
Commit: ec1159340d771cee9c72999fd506f377d50eb1c8
Parents: 0551620 21bc4d8
Author: Stephen Mallette 
Authored: Wed Jun 28 13:33:51 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:33:51 2017 -0400

--
 CHANGELOG.asciidoc  |   1 +
 docs/src/upgrade/release-3.3.x.asciidoc |   1 +
 .../gremlin/structure/Transaction.java  | 216 -
 .../structure/util/AbstractTransaction.java |   9 -
 .../gremlin/structure/TransactionTest.java  | 242 +--
 5 files changed, 12 insertions(+), 457 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 3aee122,ddf3a83..e158be1
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -35,13 -32,7 +35,14 @@@ TinkerPop 3.3.0 (Release Date: NOT OFFI
  * Added "attachment requisite" `VertexProperty.element()` and 
`Property.element()` data in GraphSON serialization.
  * GraphSON 3.0 is now the default serialization format in TinkerGraph and 
Gremlin Server.
  * Established the GraphSON 3.0 format.
 +* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
 +* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)` 
constructor.
 +* Removed previously deprecated `TinkerIoRegistry`.
 +* Removed previously deprecated `getInstance()` methods on all TinkerPop 
classes.
 +* Removed previously deprecated 
`VertexPropertyFeatures.supportsAddProperty()`.
 +* Removed previously deprecated TinkerGraph configuration member variables.
 +* Changed `ServerGremlinExecutor` to not use generics since there really is 
no flexibility in the kind of `ScheduledExecutorService` that will be used.
+ * Removed previously deprecated `Transaction.submit(Function)`.
  * Removed previously deprecated `OpSelectorHandler.errorMeter` and 
`AbstractEvalOpProcessor.errorMeter` fields.
  * Removed previously deprecated `AbstractEvalOpProcessor.validBindingName` 
field.
  * Removed previously deprecated 
`SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index 6fefe28,9507603..0f71714
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -208,9 -196,7 +208,10 @@@ The following deprecated classes, metho
  ** 
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_COMPUTER`
  ** 
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT`
  ** 
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT_INTEGRATE`
 +** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)`
+ ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
 +* `gremlin-driver`
 +** 
`org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)`
  * `gremlin-groovy`
  ** `org.apache.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider`
  ** `org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
--

[31/38] tinkerpop git commit: TINKERPOP-1698 Fixed up a bunch of tests with Gryo V3

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc22b713/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
--
diff --git 
a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
 
b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
index 1fcb89e..044c672 100644
--- 
a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
+++ 
b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
@@ -32,6 +32,7 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: 
{files: [scripts/generate-all.groovy]
 serializers:
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
+  - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: 
{ ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
serializeResultToString: true}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, 
config: { ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc22b713/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
--
diff --git 
a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
 
b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index e6f6f8e..2444dc0 100644
--- 
a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ 
b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -28,6 +28,7 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: 
{files: [scripts/empty-sample.groovy]
 serializers:
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
+  - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: 
{ ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0], 
custom: 
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
serializeResultToString: true}}
   - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, 
config: { ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc22b713/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index a112777..8451c22 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -52,7 +52,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import static 

[28/38] tinkerpop git commit: Now that graphson 3.0 is defaulted tested needed some cleanup CTR

[spmallette]

Now that graphson 3.0 is defaulted tested needed some cleanup CTR


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

Branch: refs/heads/TINKERPOP-1698
Commit: 1d3e9a1d81cae9f6b30ce4f2db3680028bce71ac
Parents: 4540cd4
Author: Stephen Mallette 
Authored: Wed Jun 28 15:09:12 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:09:12 2017 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/Settings.java| 2 +-
 .../gremlin/server/GremlinServerHttpIntegrateTest.java| 7 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d3e9a1d/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 cb3ee2b..cbb930b 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
@@ -379,7 +379,7 @@ public class Settings {
  * A {@link Map} containing {@link MessageSerializer} specific 
configurations. Consult the
  * {@link MessageSerializer} implementation for specifics on what 
configurations are expected.
  */
-public Map config = null;
+public Map config = Collections.emptyMap();
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d3e9a1d/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
--
diff --git 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 6a94c72..ec878de 100644
--- 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -586,11 +586,8 @@ public class GremlinServerHttpIntegrateTest extends 
AbstractGremlinServerIntegra
 final JsonNode data = resultJson.get("result").get("data");
 assertEquals(1, data.size());
 
-final List vertices = 
data.get(0).findValues(GraphSONTokens.VERTICES);
-final List edges = 
data.get(0).findValues(GraphSONTokens.EDGES);
-
-assertEquals(6, vertices.get(0).size());
-assertEquals(6, edges.get(0).size());
+assertEquals(6, 
data.get(0).get(GraphSONTokens.VERTICES).get(1).size());
+assertEquals(6, 
data.get(0).get(GraphSONTokens.EDGES).get(1).size());
 }
 }
 

[38/38] tinkerpop git commit: TINKERPOP-1698 Include traversal index in deserialization

[spmallette]

TINKERPOP-1698 Include traversal index in deserialization

Seems like it is needed for giraph for some reason.


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

Branch: refs/heads/TINKERPOP-1698
Commit: b52842199a9a567ee8c60d9d2aa42ac29e4b59d6
Parents: 07c97aa
Author: Stephen Mallette 
Authored: Tue Jun 27 07:42:07 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 .../process/traversal/util/DefaultTraversalMetrics.java  | 7 ++-
 .../gremlin/process/traversal/step/map/ProfileTest.java  | 8 
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5284219/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 584456a..3c543f6 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author Bob Briody (http://bobbriody.com)
@@ -63,7 +64,11 @@ public final class DefaultTraversalMetrics implements 
TraversalMetrics, Serializ
 public DefaultTraversalMetrics(final long totalStepDurationNs, final 
List metricsMap) {
 this.totalStepDuration = totalStepDurationNs;
 this.computedMetrics = new LinkedHashMap<>(this.metrics.size());
-metricsMap.forEach(metric -> this.computedMetrics.put(metric.getId(), 
metric.getImmutableClone()));
+final AtomicInteger counter = new AtomicInteger(0);
+metricsMap.forEach(metric -> {
+this.computedMetrics.put(metric.getId(), 
metric.getImmutableClone());
+this.indexToLabelMap.put(counter.getAndIncrement(), 
metric.getId());
+});
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5284219/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
index 06afc1f..2dc0e3b 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
@@ -153,7 +153,7 @@ public abstract class ProfileTest extends 
AbstractGremlinProcessTest {
 validate_g_V_out_out_profile_grateful(traversalMetrics);
 }
 
-private void validate_g_V_out_out_profile_grateful(TraversalMetrics 
traversalMetrics) {
+private void validate_g_V_out_out_profile_grateful(final TraversalMetrics 
traversalMetrics) {
 traversalMetrics.toString(); // ensure no exceptions are thrown
 
 Metrics metrics = traversalMetrics.getMetrics(0);
@@ -206,7 +206,7 @@ public abstract class ProfileTest extends 
AbstractGremlinProcessTest {
 
validate_g_V_sideEffectXThread_sleepX10XX_sideEffectXThread_sleepX5XX_profile(traversalMetrics);
 }
 
-private void 
validate_g_V_sideEffectXThread_sleepX10XX_sideEffectXThread_sleepX5XX_profile(TraversalMetrics
 traversalMetrics) {
+private void 
validate_g_V_sideEffectXThread_sleepX10XX_sideEffectXThread_sleepX5XX_profile(final
 TraversalMetrics traversalMetrics) {
 traversalMetrics.toString(); // ensure no exceptions are thrown
 
 // Grab the second (sideEffect{sleep}) step and check the times.
@@ -253,7 +253,7 @@ public abstract class ProfileTest extends 
AbstractGremlinProcessTest {
 
!traversal.asAdmin().getStrategies().toList().contains(ComputerVerificationStrategy.instance()));
 }
 
-private void validate_g_V_repeat_both_modern_profile(TraversalMetrics 
traversalMetrics, boolean withRepeatUnrollStrategy) {
+private void validate_g_V_repeat_both_modern_profile(final 
TraversalMetrics 

[06/38] tinkerpop git commit: TINKERPOP-741 Removed deprecated transaction retry methods

[spmallette]

TINKERPOP-741 Removed deprecated transaction retry methods


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

Branch: refs/heads/TINKERPOP-1698
Commit: 80822ee52c7eb500e38a444d44f98b5469c496e6
Parents: 21102e4
Author: Stephen Mallette 
Authored: Mon Jun 19 12:15:33 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 12:15:33 2017 -0400

--
 CHANGELOG.asciidoc  |   1 +
 .../gremlin/structure/Transaction.java  | 216 -
 .../structure/util/AbstractTransaction.java |   9 -
 .../gremlin/structure/TransactionTest.java  | 242 +--
 4 files changed, 11 insertions(+), 457 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80822ee5/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index af56ed1..ddf3a83 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 * Added "attachment requisite" `VertexProperty.element()` and 
`Property.element()` data in GraphSON serialization.
 * GraphSON 3.0 is now the default serialization format in TinkerGraph and 
Gremlin Server.
 * Established the GraphSON 3.0 format.
+* Removed previously deprecated `Transaction.submit(Function)`.
 * Removed previously deprecated `OpSelectorHandler.errorMeter` and 
`AbstractEvalOpProcessor.errorMeter` fields.
 * Removed previously deprecated `AbstractEvalOpProcessor.validBindingName` 
field.
 * Removed previously deprecated 
`SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80822ee5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
index ff4232d..8d73bf6 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
@@ -61,14 +61,6 @@ public interface Transaction extends AutoCloseable {
 public void rollback();
 
 /**
- * Submit a unit of work that represents a transaction returning a {@link 
Workload} that can be automatically
- * retried in the event of failure.
- * @deprecated As of release 3.2.6, not replaced.
- */
-@Deprecated
-public  Workload submit(final Function work);
-
-/**
  * Creates a transaction that can be executed across multiple threads. The 
{@link Graph} returned from this
  * method is not meant to represent some form of child transaction that 
can be committed from this object.
  * A threaded transaction is a {@link Graph} instance that has a 
transaction context that enables multiple
@@ -221,212 +213,4 @@ public interface Transaction extends AutoCloseable {
 }
 }
 }
-
-/**
- * A {@link Workload} represents a unit of work constructed by the {@link 
Workload#submit(Function)} method on
- * the {@link Transaction} interface. The unit of work is a {@link 
Function} typically containing mutations to
- * the {@link Graph}.  The {@link Workload} is responsible for executing 
the unit of work in the context of a
- * retry strategy, such that a failed unit of work is rolled back and 
executed again until retries are exhausted
- * or the unit of work succeeds with a commit operation.
- *
- * @param  The type of the result from the unit of work.
- * @deprecated As of release 3.2.6, not replaced.
- */
-@Deprecated
-public static class Workload {
-public static final long DEFAULT_DELAY_MS = 20;
-public static final int DEFAULT_TRIES = 8;
-
-private final Function workToDo;
-private final Graph g;
-
-/**
- * Creates a new {@link Workload} that will be tried to be executed 
within a transaction.
- *
- * @param gThe {@link Graph} instance on which the work will be 
performed.
- * @param work The work to be executed on the Graph instance which 
will optionally return a value.
- */
-public Workload(final Graph g, final Function work) {
-this.g = g;
-this.workToDo = work;
-}
-
-/**
- * Try to execute a {@link Workload} with a 

[23/38] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1698
Commit: 0551620f1f30bb40dad631e8862b33d97c436cf2
Parents: ea20ca1 aa81313
Author: Stephen Mallette 
Authored: Wed Jun 28 13:32:47 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:32:47 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/the-graph.asciidoc   | 20 
 .../gremlin/structure/Transaction.java  |  4 
 .../structure/util/AbstractTransaction.java |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0551620f/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0551620f/docs/src/reference/the-graph.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0551620f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0551620f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
--

[13/38] tinkerpop git commit: made the Direction method protected.

[spmallette]

made the Direction method protected.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 5ac61b7af2bb19dff84e100965587bd6eae29029
Parents: 2ba8deb
Author: Marko A. Rodriguez 
Authored: Fri Jun 23 09:20:02 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:22 2017 -0600

--
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac61b7a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
index d7ebd32..8bef835 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
@@ -35,7 +35,7 @@ import java.util.Set;
  */
 public class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
 
-private Direction direction;
+protected Direction direction;
 
 public EdgeVertexStep(final Traversal.Admin traversal, final Direction 
direction) {
 super(traversal);

[03/38] tinkerpop git commit: add the regression test

[spmallette]

add the regression test


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

Branch: refs/heads/TINKERPOP-1698
Commit: 99679a037db3e86112471a40cd454114231852b6
Parents: 28c514d
Author: Sheldon 
Authored: Mon Jun 19 10:35:16 2017 +0100
Committer: Sheldon 
Committed: Mon Jun 19 11:20:37 2017 +0100

--
 .../process/computer/GraphComputerTest.java | 93 
 1 file changed, 93 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99679a03/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 1af0830..02ac5d4 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -24,11 +24,14 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
 import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
 import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -38,9 +41,11 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
@@ -1463,6 +1468,94 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 public void storeState(final Configuration configuration) {
 VertexProgram.super.storeState(configuration);
 }
+}
+
+/
+@Test
+public void shouldSupportMultipleScopes() throws ExecutionException, 
InterruptedException {
+Vertex a = graph.addVertex("a");
+Vertex b = graph.addVertex("b");
+Vertex c = graph.addVertex("c");
+a.addEdge("edge", b);
+b.addEdge("edge", c);
+
+// Simple graph:
+// a -> b -> c
+
+// Execute a traversal program that sends an incoming message of "2" 
and an outgoing message of "1" from "b"
+// then each vertex sums any received messages
+ComputerResult result = graph.compute().program(new 
MultiScopeVertexProgram()).submit().get();
+
+// We expect the results to be {a=2, b=0, c=1}. Instead it is {a=3, 
b=0, c=3}
+assertEquals((Long) 
result.graph().traversal().V().hasLabel("a").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(2L));
+assertEquals((Long) 
result.graph().traversal().V().hasLabel("b").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(0L));
+assertEquals((Long) 
result.graph().traversal().V().hasLabel("c").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(1L));
+}
+
+public static class MultiScopeVertexProgram implements VertexProgram 
{
+
+private final MessageScope.Local countMessageScopeIn = 
MessageScope.Local.of(__::inE);
+private final MessageScope.Local countMessageScopeOut = 
MessageScope.Local.of(__::outE);
+
+private static final String MEMORY_KEY = "count";
+
+private static final Set COMPUTE_KEYS = 
Collections.singleton(MEMORY_KEY);
+
+@Override
+public void setup(final Memory memory) {}
+
+@Override
+public GraphComputer.Persist getPreferredPersist() {
+return GraphComputer.Persist.VERTEX_PROPERTIES;
+}
+
+@Override
+public Set getElementComputeKeys() {
+return COMPUTE_KEYS;
+

[01/38] tinkerpop git commit: TINKERPOP-1445 Add ellipses for long property values [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1698 9ede1f0f0 -> 616a92a70 (forced update)


TINKERPOP-1445 Add ellipses for long property values


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

Branch: refs/heads/TINKERPOP-1698
Commit: 47afd7a664ecb7c737341cac7c005e403c0b569e
Parents: b026ca3
Author: Stephen Mallette 
Authored: Sun Jun 18 14:25:15 2017 -0400
Committer: Stephen Mallette 
Committed: Sun Jun 18 14:25:15 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../gremlin/structure/util/StringFactory.java   |  9 +++
 .../gremlin/structure/PropertyTest.java | 28 +++-
 3 files changed, 31 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47afd7a6/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ff6ff24..eb8ad8a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* Included an ellipse on long property names that are truncated.
 * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
 * Added more specific typing to various `__` traversal steps. E.g. 
`out()` is `out()`.
 * Updated Docker build scripts to include Python dependencies (NOTE: users 
should remove any previously generated TinkerPop Docker images).

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47afd7a6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
index bcead2d..0a1cdb6 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.structure.util;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.tinkerpop.gremlin.process.computer.Computer;
 import org.apache.tinkerpop.gremlin.process.computer.ComputerResult;
 import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
@@ -68,12 +69,8 @@ public final class StringFactory {
 private static final String L_BRACKET = "[";
 private static final String R_BRACKET = "]";
 private static final String COMMA_SPACE = ", ";
-private static final String COLON = ":";
-private static final String EMPTY_MAP = "{}";
-private static final String DOTS = "...";
 private static final String DASH = "-";
 private static final String ARROW = "->";
-private static final String STAR = "*";
 private static final String EMPTY_PROPERTY = "p[empty]";
 private static final String EMPTY_VERTEX_PROPERTY = "vp[empty]";
 private static final String LINE_SEPARATOR = 
System.getProperty("line.separator");
@@ -106,11 +103,11 @@ public final class StringFactory {
 if (property instanceof VertexProperty) {
 if (!property.isPresent()) return EMPTY_VERTEX_PROPERTY;
 final String valueString = String.valueOf(property.value());
-return VP + L_BRACKET + property.key() + ARROW + 
valueString.substring(0, Math.min(valueString.length(), 20)) + R_BRACKET;
+return VP + L_BRACKET + property.key() + ARROW + 
StringUtils.abbreviate(valueString, 20) + R_BRACKET;
 } else {
 if (!property.isPresent()) return EMPTY_PROPERTY;
 final String valueString = String.valueOf(property.value());
-return P + L_BRACKET + property.key() + ARROW + 
valueString.substring(0, Math.min(valueString.length(), 20)) + R_BRACKET;
+return P + L_BRACKET + property.key() + ARROW + 
StringUtils.abbreviate(valueString, 20) + R_BRACKET;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47afd7a6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
 

[37/38] tinkerpop git commit: TINKERPOP-1698 Folded Gryo lite tests into main gryo tests

[spmallette]

TINKERPOP-1698 Folded Gryo lite tests into main gryo tests


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

Branch: refs/heads/TINKERPOP-1698
Commit: 9bf1caf15c06ef4408dd7750fab5327cbc570f6b
Parents: 045eb05
Author: Stephen Mallette 
Authored: Mon Jun 26 11:28:29 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:23:14 2017 -0400

--
 .../ser/GryoLiteMessageSerializerV1d0Test.java  | 150 ---
 .../ser/GryoMessageSerializerV1d0Test.java  | 120 +--
 2 files changed, 78 insertions(+), 192 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bf1caf1/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0Test.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0Test.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0Test.java
deleted file mode 100644
index 2a23d02..000
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0Test.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-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.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GryoLiteMessageSerializerV1d0Test {
-private static final Map config = new HashMap() {{
-
put(AbstractGryoMessageSerializerV1d0.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
-}};
-
-private UUID requestId = 
UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-private ResponseMessage.Builder responseMessageBuilder = 
ResponseMessage.build(requestId);
-private static ByteBufAllocator allocator = 
UnpooledByteBufAllocator.DEFAULT;
-
-public MessageSerializer binarySerializer = new 
GryoLiteMessageSerializerV1d0();
-
-@Test
-public void shouldSerializeEdge() throws Exception {
-final Graph g = TinkerGraph.open();
-final Vertex v1 = g.addVertex();
-final Vertex v2 = g.addVertex();
-final Edge e = v1.addEdge("test", v2);
-e.property("abc", 123);
-
-final Iterable iterable = IteratorUtils.list(g.edges());
-
-final ResponseMessage response = convertBinary(iterable);
-assertCommon(response);
-
-final List edgeList = (List) 
response.getResult().getData();
-  

[11/38] tinkerpop git commit: Fixed dev docs for expected SASL value

[spmallette]

Fixed dev docs for expected SASL value

This was changed long ago on TINKERPOP-1600 but the docs went stale. Note that 
the byte array is still supported on 3.2.x. It goes away in 3.3.0.


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

Branch: refs/heads/TINKERPOP-1698
Commit: 1518cc420cc35939aafae790ed79eedfe3751766
Parents: 8bb9908
Author: Stephen Mallette 
Authored: Mon Jun 26 14:29:56 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 26 14:29:56 2017 -0400

--
 docs/src/dev/provider/index.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1518cc42/docs/src/dev/provider/index.asciidoc
--
diff --git a/docs/src/dev/provider/index.asciidoc 
b/docs/src/dev/provider/index.asciidoc
index 39c235b..de8be1f 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -827,7 +827,7 @@ evaluated and is committed when the script completes (or 
rolled back if an error
 [width="100%",cols="2,2,9",options="header"]
 |=
 |Key |Type |Description
-|sasl |byte[] | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server.
+|sasl |String | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server and is Base64 encoded.
 |saslMechanism |String | The SASL mechanism: `PLAIN` or `GSSAPI`. Note that it 
is up to the server implementation to use or disregard this setting (default 
implementation in Gremlin Server ignores it).
 |=
 
@@ -874,7 +874,7 @@ Gremlin Server are deployed, session state is not shared 
among them.
 |=
 |Key |Type |Description
 |saslMechanism |String | The SASL mechanism: `PLAIN` or `GSSAPI`. Note that it 
is up to the server implementation to use or disregard this setting (default 
implementation in Gremlin Server ignores it).
-|sasl |byte[] | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server.
+|sasl |String | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server and is Base64 encoded.
 |=
 
 '`eval` operation arguments'
@@ -975,7 +975,7 @@ operation is available to clear the cache of a specific 
side-effect.
 [width="100%",cols="2,2,9",options="header"]
 |=
 |Key |Type |Description
-|sasl |byte[] | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server.
+|sasl |String | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server and is Base64 encoded.
 |=
 
 '`bytecode` operation arguments'

[16/38] tinkerpop git commit: Merge branch 'tp31' of https://github.com/sheldonkhall/tinkerpop into tp31

[spmallette]

Merge branch 'tp31' of https://github.com/sheldonkhall/tinkerpop into tp31


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

Branch: refs/heads/TINKERPOP-1698
Commit: d67b88b2bee75c68d3c5756a8dbf963f9de2df39
Parents: 3d50f5c 99679a0
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:53:22 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:53:22 2017 -0600

--
 .../process/computer/GraphComputerTest.java | 93 
 .../process/computer/TinkerMessageBoard.java|  4 +-
 .../process/computer/TinkerMessenger.java   | 22 +++--
 3 files changed, 109 insertions(+), 10 deletions(-)
--

[09/38] tinkerpop git commit: Merge branch 'TINKERPOP-1004'

[spmallette]

Merge branch 'TINKERPOP-1004'

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1698
Commit: 77c0477f539c41cf48da2936fee85f7ab003b517
Parents: 685d1ed eb0eddc
Author: Stephen Mallette 
Authored: Mon Jun 26 10:15:57 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 26 10:15:57 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/upgrade/release-3.3.x.asciidoc | 66 +++-
 .../gremlin/structure/Transaction.java  |  9 ++-
 .../structure/util/AbstractTransaction.java | 34 ++
 .../structure/util/TransactionException.java| 42 +
 .../gremlin/neo4j/structure/Neo4jGraph.java |  1 +
 6 files changed, 93 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77c0477f/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index f6fcfff,610cf7e..4e4844c
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,7 +26,8 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~
  
 +* Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.
+ * `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
  * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
  * Added more specific typing to various `__` traversal steps. E.g. 
`out()` is `out()`.
  * Updated Docker build scripts to include Python dependencies (NOTE: users 
should remove any previously generated TinkerPop Docker images).

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77c0477f/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index 20a29de,ea8be1b..6fefe28
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -341,3 -294,41 +313,41 @@@ spark.serializer=org.apache.tinkerpop.g
  ```
  
  See: link:https://issues.apache.org/jira/browse/TINKERPOP-1389
+ 
+ Upgrading for Providers
+ ~~~
+ 
+ Graph Database Providers
+ 
+ 
+ Test Suite Removal
+ ++
+ 
+ A number of test suites that were previously deprecated have been removed 
which should reduce the burden on graph
+ providers who are implementing TinkerPop. Test suites related to perfrmance 
based on `junit-benchmarks` have been
+ removed as have the suites in `gremlin-groovy-test` (in fact, this entire 
module has been removed). Specifically,
+ providers should be concerned with breaking changes related to the removal of:
+ 
+ * `StructurePerformanceSuite`
+ * `ProcessPerformanceSuite`
+ * `GroovyEnvironmentPerformanceSuite`
+ * `GroovyProcessStandardSuite`
+ * `GroovyProcessComputerSuite`
+ * `GroovyEnvironmentSuite`
+ * `GroovyEnvironmentIntegrateSuite`
+ 
+ Those graph providers who relied on these tests should simply remove them 
from their respective test suites. Beware of
+ `OptOut` annotations that reference tests in these suites as test failure 
will occur if those references are not
+ removed.
+ 
+ See: 
link:https://issues.apache.org/jira/browse/TINKERPOP-1235[TINKERPOP-1235], 
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612]
+ 
+ TransactionException
+ 
+ 
+ The `AbstractTransaction.TransactionException` class is now just 
`TransactionException` which extends `RuntimeExcetpion`
+ rather than `Exception`. Providers should consider using this exception to 
wrap their own on calls to
+ `Transaction.commit()` or `Transaction.rollback()`. By throwing this 
exception, the TinkerPop stack can better respond
+ to transaction problems and it allows for more common, generalized error 
handling for users.
+ 
 -See: link:https://issues.apache.org/jira/browse/TINKERPOP-1004[TINKERPOP-1004]
++See: link:https://issues.apache.org/jira/browse/TINKERPOP-1004[TINKERPOP-1004]

[08/38] tinkerpop git commit: TINKERPOP-1004 Expand usage of TransactionException

[spmallette]

TINKERPOP-1004 Expand usage of TransactionException

TransactionException is no longer bound to usage by AbstractTransaction. 
Precribed a more general usage of it with the Transaction interface.


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

Branch: refs/heads/TINKERPOP-1698
Commit: eb0eddca04050cb48d1262c7ff3bc28354f558c6
Parents: 268333b
Author: Stephen Mallette 
Authored: Tue Jun 20 12:57:04 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Jun 20 13:51:45 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/upgrade/release-3.3.x.asciidoc | 66 +++-
 .../gremlin/structure/Transaction.java  |  9 ++-
 .../structure/util/AbstractTransaction.java | 34 ++
 .../structure/util/TransactionException.java| 42 +
 .../gremlin/neo4j/structure/Neo4jGraph.java |  1 +
 6 files changed, 93 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb0eddca/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 58a3a62..610cf7e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
 * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
 * Added more specific typing to various `__` traversal steps. E.g. 
`out()` is `out()`.
 * Updated Docker build scripts to include Python dependencies (NOTE: users 
should remove any previously generated TinkerPop Docker images).

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb0eddca/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index dbb40b4..ea8be1b 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -255,34 +255,6 @@ 
link:https://issues.apache.org/jira/browse/TINKERPOP-1420[TINKERPOP-1420], link:
 link:https://issues.apache.org/jira/browse/TINKERPOP-1465[TINKERPOP-1465], 
link:https://issues.apache.org/jira/browse/TINKERPOP-1526[TINKERPOP-1526],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], 
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622]
 
-Upgrading for Providers
-~~~
-
-Graph Database Providers
-
-
-Test Suite Removal
-++
-
-A number of test suites that were previously deprecated have been removed 
which should reduce the burden on graph
-providers who are implementing TinkerPop. Test suites related to perfrmance 
based on `junit-benchmarks` have been
-removed as have the suites in `gremlin-groovy-test` (in fact, this entire 
module has been removed). Specifically,
-providers should be concerned with breaking changes related to the removal of:
-
-* `StructurePerformanceSuite`
-* `ProcessPerformanceSuite`
-* `GroovyEnvironmentPerformanceSuite`
-* `GroovyProcessStandardSuite`
-* `GroovyProcessComputerSuite`
-* `GroovyEnvironmentSuite`
-* `GroovyEnvironmentIntegrateSuite`
-
-Those graph providers who relied on these tests should simply remove them from 
their respective test suites. Beware of
-`OptOut` annotations that reference tests in these suites as test failure will 
occur if those references are not
-removed.
-
-See: 
link:https://issues.apache.org/jira/browse/TINKERPOP-1235[TINKERPOP-1235], 
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612]
-
 Gremlin-server.sh and Init Scripts
 ^^
 
@@ -322,3 +294,41 @@ 
spark.serializer=org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoSerial
 ```
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1389
+
+Upgrading for Providers
+~~~
+
+Graph Database Providers
+
+
+Test Suite Removal
+++
+
+A number of test suites that were previously deprecated have been removed 
which should reduce the burden on graph
+providers who are implementing TinkerPop. Test suites related to perfrmance 
based on `junit-benchmarks` have been
+removed as have the suites in `gremlin-groovy-test` (in fact, this entire 
module has been 

[09/46] tinkerpop git commit: Merge branch 'pr-630' into tp32

[spmallette]

Merge branch 'pr-630' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: b9a439a3de653a4cfa80db9269e7a958c1bd6970
Parents: 9af4cce 67cc12f
Author: Stephen Mallette 
Authored: Mon Jun 19 13:23:15 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 13:23:15 2017 -0400

--
 .../process/traversal/TraversalInterruptionComputerTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[06/46] tinkerpop git commit: Clean up the poms a bit

[spmallette]

Clean up the poms a bit

Bumped some versions of maven plugins. Added maven prerequisite to enforce the 
maven version. CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 9af4cce35c6784e5bd71ef5125448b3e5f450f52
Parents: e6ddba1
Author: Stephen Mallette 
Authored: Mon Jun 19 09:10:03 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 09:10:03 2017 -0400

--
 giraph-gremlin/pom.xml  |  3 +-
 gremlin-archetype/gremlin-archetype-dsl/pom.xml |  2 +-
 .../gremlin-archetype-server/pom.xml|  2 +-
 .../gremlin-archetype-tinkergraph/pom.xml   |  2 +-
 gremlin-archetype/pom.xml   |  3 +-
 gremlin-benchmark/pom.xml   |  1 -
 gremlin-console/pom.xml |  2 +-
 gremlin-driver/pom.xml  |  2 +-
 gremlin-server/pom.xml  |  2 +-
 gremlin-shaded/pom.xml  |  1 -
 hadoop-gremlin/pom.xml  |  3 +-
 neo4j-gremlin/pom.xml   |  1 -
 pom.xml | 45 ++--
 spark-gremlin/pom.xml   |  3 +-
 tinkergraph-gremlin/pom.xml |  1 -
 15 files changed, 43 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/giraph-gremlin/pom.xml
--
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 55404ff..19f1caf 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -196,8 +196,8 @@ limitations under the License.
 
 
 
+org.apache.maven.plugins
 maven-assembly-plugin
-2.4
 
 
 build-detached-assemblies
@@ -231,7 +231,6 @@ limitations under the License.
 
 org.apache.maven.plugins
 maven-jar-plugin
-2.5
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/gremlin-archetype-dsl/pom.xml
--
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml 
b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 55e3efd..7224a09 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -31,8 +31,8 @@ limitations under the License.
 
 
 
+org.apache.maven.plugins
 maven-archetype-plugin
-2.4
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/gremlin-archetype-server/pom.xml
--
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml 
b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 998f1b6..faadc86 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -31,8 +31,8 @@ limitations under the License.
 
 
 
+org.apache.maven.plugins
 maven-archetype-plugin
-2.4
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
--
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml 
b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 37813db..5b59efe 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -31,8 +31,8 @@ limitations under the License.
 
 
 
+org.apache.maven.plugins
 maven-archetype-plugin
-2.4
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/pom.xml
--
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index a99f4c8..944ec00 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -37,8 +37,9 @@ limitations under the License.
 
 
 
+org.apache.maven.plugins
  

[11/46] tinkerpop git commit: Merge branch 'tp31' into tp32

[spmallette]

Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: 8fc197e87e169feb3ba1230217648d1e2afeab67
Parents: b9a439a 3d50f5c
Author: Ted Wilmes 
Authored: Mon Jun 19 14:10:34 2017 -0500
Committer: Ted Wilmes 
Committed: Mon Jun 19 14:10:34 2017 -0500

--
 CHANGELOG.asciidoc | 4 
 docs/src/upgrade/release-3.1.x-incubating.asciidoc | 5 +
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fc197e8/CHANGELOG.asciidoc
--

[27/46] tinkerpop git commit: fixed up the MultiScope test to use MODERN so that it works with Giraph and Spark. Will back tweak to tp31/.

[spmallette]

fixed up the MultiScope test to use MODERN so that it works with Giraph and 
Spark. Will back tweak to tp31/.


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

Branch: refs/heads/TINKERPOP-1489
Commit: f1aed80b056c2244ce8b23ab077e8b10ee6939d9
Parents: 5ac61b7 3b8c628
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 09:50:15 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 09:50:15 2017 -0600

--
 CHANGELOG.asciidoc  |  2 +
 .../process/computer/GraphComputerTest.java | 75 ++--
 .../process/computer/TinkerMessageBoard.java|  4 +-
 .../process/computer/TinkerMessenger.java   | 22 +++---
 4 files changed, 88 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1aed80b/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1aed80b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 5c66673,02ac5d4..e4b40e8
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@@ -24,35 -22,18 +24,32 @@@ import org.apache.commons.configuration
  import org.apache.tinkerpop.gremlin.ExceptionCoverage;
  import org.apache.tinkerpop.gremlin.LoadGraphWith;
  import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 +import 
org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder;
  import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
  import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.P;
- import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
  import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 +import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
  import org.apache.tinkerpop.gremlin.structure.Direction;
 -import org.apache.tinkerpop.gremlin.structure.Element;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
  import org.apache.tinkerpop.gremlin.structure.Graph;
 +import org.apache.tinkerpop.gremlin.structure.Property;
  import org.apache.tinkerpop.gremlin.structure.Vertex;
  import org.apache.tinkerpop.gremlin.structure.VertexProperty;
  import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
  import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 +import org.javatuples.Pair;
- import org.junit.Ignore;
  import org.junit.Test;
  
- import java.util.AbstractMap;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collections;
@@@ -70,15 -50,11 +68,14 @@@ import java.util.concurrent.Future
  
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
 +import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
- import static org.apache.tinkerpop.gremlin.structure.T.id;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
 +import static org.junit.Assume.assumeNoException;
 +
+ 
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
@@@ -1588,567 -1468,92 +1585,635 @@@ public class GraphComputerTest extends 
  public void storeState(final Configuration configuration) {
  

[30/46] tinkerpop git commit: Merge branch 'TINKERPOP-741' into tp32

[spmallette]

Merge branch 'TINKERPOP-741' into tp32

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1489
Commit: aa81313ba1e031f895c02529573bffd79a999d9c
Parents: 9436585 eba0a2c
Author: Stephen Mallette 
Authored: Wed Jun 28 13:32:11 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:32:11 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/the-graph.asciidoc   | 20 
 .../gremlin/structure/Transaction.java  |  4 
 .../structure/util/AbstractTransaction.java |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa81313b/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 9da8d47,bfb7aa9..ba9f2a7
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,11 -28,9 +28,12 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <>.
  
 +* Added annotations to the traversal metrics pretty print.
 +* `EdgeVertexStep` is no longer final and can be extended by providers.
+ * Deprecated `Transaction.submit(Function)`.
  * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
  * Improved GraphSON serialization performance around `VertexProperty`.
 +* Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.
  
  [[release-3-2-5]]
  TinkerPop 3.2.5 (Release Date: June 12, 2017)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa81313b/docs/src/reference/the-graph.asciidoc
--

[38/46] tinkerpop git commit: Update Javascript GLV

[spmallette]

Update Javascript GLV

Address feedback and provide maven integration:
- Reorganize gremlin-javascript into node.js project
- Simplify javascript code generators
- Generate package.json to match project version
- Introduce Promise factory for third-party promise library integration (ie: 
bluebird)
- Use toList() and next() traversal methods
- Include Remote connection implementation
- Fix enum casing
- Use Maven nodejs plugin
- .gitignore and .npmignore at gremlin-javascript level
- Run integration tests using a gremlin-server instance
- Add gremlin-javascript doc in gremlin-variants.asciidoc


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

Branch: refs/heads/TINKERPOP-1489
Commit: baeabd7c81f823b3586d0c6b4649e6cfa2c3204d
Parents: 2bedccc
Author: Jorge Bay Gondra 
Authored: Tue Jun 6 15:05:14 2017 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 docs/src/reference/gremlin-variants.asciidoc|   71 +
 gremlin-javascript/pom.xml  |  171 +-
 .../javascript/GenerateGremlinJavascript.groovy |   36 +
 .../GraphTraversalSourceGenerator.groovy|  226 +-
 .../javascript/PackageJsonGenerator.groovy  |   72 +
 .../gremlin/javascript/SymbolHelper.groovy  |   50 +
 .../javascript/TraversalSourceGenerator.groovy  |  437 ++--
 .../javascript/GenerateGremlinJavascript.java   |   32 -
 .../gremlin/javascript/jsr223/SymbolHelper.java |   59 -
 .../javascript/gremlin-javascript/.gitignore|5 +
 .../javascript/gremlin-javascript/.npmignore|   26 +
 .../javascript/gremlin-javascript/README.md |   39 +
 .../driver/remote-connection.js |  107 -
 .../main/javascript/gremlin-javascript/index.js |  113 +-
 .../lib/driver/driver-remote-connection.js  |  200 ++
 .../lib/driver/remote-connection.js |   84 +
 .../gremlin-javascript/lib/process/bytecode.js  |   99 +
 .../lib/process/graph-traversal.js  | 2095 ++
 .../lib/process/traversal-strategy.js   |   88 +
 .../gremlin-javascript/lib/process/traversal.js |  236 ++
 .../gremlin-javascript/lib/structure/graph.js   |  138 ++
 .../lib/structure/io/graph-serializer.js|  398 
 .../javascript/gremlin-javascript/lib/utils.js  |   62 +
 .../javascript/gremlin-javascript/package.json  |   36 +
 .../process/graph-traversal.js  | 2016 -
 .../gremlin-javascript/process/traversal.js |  392 
 .../gremlin-javascript/structure/graph.js   |  157 --
 .../structure/io/graph-serializer.js|  415 
 .../test/integration/remote-connection-tests.js |   64 +
 .../test/integration/traversal-test.js  |   71 +
 .../test/unit/exports-test.js   |   73 +
 .../test/unit/graphson-test.js  |  112 +
 .../test/unit/traversal-test.js |  119 +
 .../javascript/gremlin-javascript/helper.js |   84 -
 .../gremlin-javascript/test-exports.js  |   87 -
 .../gremlin-javascript/test-graphson.js |  108 -
 .../gremlin-javascript/test-traversal.js|   69 -
 pom.xml |4 +
 38 files changed, 4623 insertions(+), 4028 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baeabd7c/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index 39b5558..7eaa706 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -354,4 +354,75 @@ graphson_writer = GraphSONWriter({MyType: MyType})
 connection = DriverRemoteConnection('ws://localhost:8182/gremlin', 'g',
  graphson_reader=graphson_reader,
  graphson_writer=graphson_writer)
+
+
+[[gremlin-javascript]]
+Gremlin-JavaScript
+--
+
+Apache TinkerPop's Gremlin-JavaScript implements Gremlin within the JavaScript 
language. It targets Node.js runtime
+and can be used on different operating systems on any Node.js 4 or above. 
Since the JavaScript naming conventions are
+very similar to that of Java, it should be very easy to switch between 
Gremlin-Java and Gremlin-JavaScript.
+
+[source,bash]
+npm install gremlin-javascript
+
+In Gremlin-JavaScript there exists `GraphTraversalSource`, `GraphTraversal`, 
and `__` which mirror the respective classes
+in Gremlin-Java. The `GraphTraversalSource` requires a RemoteConnection 

[34/46] tinkerpop git commit: TINKERPOP-1489 Cleaned up pom

[spmallette]

TINKERPOP-1489 Cleaned up pom

Removed some weird characters in license and bumped version to 3.2.5-SNAPSHOT


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

Branch: refs/heads/TINKERPOP-1489
Commit: d981d4b530661f44d781ea5bf9efb28991d9f7ef
Parents: 74fb077
Author: Stephen Mallette 
Authored: Thu May 18 12:47:48 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 gremlin-javascript/pom.xml | 35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d981d4b5/gremlin-javascript/pom.xml
--
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 387e628..b9b78cc 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -1,22 +1,19 @@
-
 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
@@ -24,7 +21,7 @@
 
 org.apache.tinkerpop
 tinkerpop
-3.2.3-SNAPSHOT
+3.2.5-SNAPSHOT
 
 gremlin-javascript
 Apache TinkerPop :: Gremlin Javascript

[33/46] tinkerpop git commit: Graph, traversalStrategies and graph as Traversal properties

[spmallette]

Graph, traversalStrategies and graph as Traversal properties

Expose those properties as in the Python GLV and the Java implementation. 
Previously, those properties where exposed using the private notation (ie: 
_graph).


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

Branch: refs/heads/TINKERPOP-1489
Commit: 966104e49e34aed1d739c7cbfacf1c4ee3384f6f
Parents: 5d987d1
Author: Jorge Bay Gondra 
Authored: Tue Oct 18 16:22:23 2016 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 .../GraphTraversalSourceGenerator.groovy|  23 +-
 .../javascript/TraversalSourceGenerator.groovy  |  12 +-
 .../process/graph-traversal.js  | 253 ++-
 .../gremlin-javascript/process/traversal.js |  12 +-
 4 files changed, 151 insertions(+), 149 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/966104e4/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
index b569292..a8217e2 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
@@ -80,9 +80,9 @@ class GraphTraversalSourceGenerator {
* @constructor
*/
   function GraphTraversalSource(graph, traversalStrategies, bytecode) {
-this._graph = graph;
-this._traversalStrategies = traversalStrategies;
-this._bytecode = bytecode || new Bytecode();
+this.graph = graph;
+this.traversalStrategies = traversalStrategies;
+this.bytecode = bytecode || new Bytecode();
   }
 
   /**
@@ -90,9 +90,9 @@ class GraphTraversalSourceGenerator {
* @returns {GraphTraversalSource}
*/
   GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
-var traversalStrategy = new 
t.TraversalStrategies(this._traversalStrategies);
+var traversalStrategy = new 
t.TraversalStrategies(this.traversalStrategies);
 traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
-return new GraphTraversalSource(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
+return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
   };
 
   /**
@@ -100,7 +100,7 @@ class GraphTraversalSourceGenerator {
* @returns {string}
*/
   GraphTraversalSource.prototype.toString = function () {
-return 'graphtraversalsource[' + this._graph.toString() + ']';
+return 'graphtraversalsource[' + this.graph.toString() + ']';
   };
 """)
 GraphTraversalSource.getMethods(). // SOURCE STEPS
@@ -122,8 +122,8 @@ class GraphTraversalSourceGenerator {
* @returns {GraphTraversalSource}
*/
   GraphTraversalSource.prototype.${method} = function (args) {
-var b = new 
Bytecode(this._bytecode).addSource('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+var b = new 
Bytecode(this.bytecode).addSource('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
   };
 """)
 }
@@ -141,8 +141,8 @@ class GraphTraversalSourceGenerator {
* @returns {GraphTraversal}
*/
   GraphTraversalSource.prototype.${method} = function (args) {
-var b = new 
Bytecode(this._bytecode).addStep('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
-return new GraphTraversal(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+var b = new 
Bytecode(this.bytecode).addStep('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
+return new GraphTraversal(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
   };
 """)
 }
@@ -153,6 +153,7 @@ class GraphTraversalSourceGenerator {
 """
   /**
* Represents a graph traversal.
+   * @extends Traversal
* @constructor
*/
   function GraphTraversal(graph, traversalStrategies, bytecode) {
@@ -175,7 +176,7 @@ class 

[43/46] tinkerpop git commit: TINKERPOP-1489 Regenerated traversal.js

[spmallette]

TINKERPOP-1489 Regenerated traversal.js

which added Pick.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 2bedcccba399aecd635e67ffdb3386abca41bc7c
Parents: d981d4b
Author: Stephen Mallette 
Authored: Thu May 18 12:48:27 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 .../src/main/javascript/gremlin-javascript/process/traversal.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bedcccb/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
index f585161..9709a4f 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
@@ -377,6 +377,7 @@
 direction: toEnum('Direction', 'BOTH IN OUT'),
 operator: toEnum('Operator', 'addAll and assign div max min minus mult or 
sum sumLong'),
 order: toEnum('Order', 'decr incr keyDecr keyIncr shuffle valueDecr 
valueIncr'),
+pick: toEnum('Pick', 'any none'),
 pop: toEnum('Pop', 'all first last'),
 scope: toEnum('Scope', 'global local'),
 t: toEnum('T', 'id key label value')

[31/46] tinkerpop git commit: TINKERPOP-1694 Added a warning if using useMapperFromGraph

[spmallette]

TINKERPOP-1694 Added a warning if using useMapperFromGraph


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

Branch: refs/heads/TINKERPOP-1489
Commit: 9160a8ae3507ae67a2b88b656ee88580069aa342
Parents: d49548e
Author: Stephen Mallette 
Authored: Mon Jun 26 09:24:02 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:52:12 2017 -0400

--
 .../org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9160a8ae/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 5f2b785..0a784d9 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -204,6 +204,10 @@ public abstract class AbstractChannelizer extends 
ChannelInitializer

[24/46] tinkerpop git commit: EdgeVertexStep is no longer final and can be extended by providers.

[spmallette]

EdgeVertexStep is no longer final and can be extended by providers.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 2ba8debdabfdfdcdce231477b3584299746e9c8c
Parents: 1518cc4
Author: Marko A. Rodriguez 
Authored: Thu Jun 22 07:15:15 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:22 2017 -0600

--
 CHANGELOG.asciidoc | 1 +
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ba8debd/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7a69469..1b46dcf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 This release also includes changes from <>.
 
 * Added annotations to the traversal metrics pretty print.
+* `EdgeVertexStep` is no longer final and can be extended by providers.
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
 * Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ba8debd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
index 87c1561..d7ebd32 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
@@ -33,7 +33,7 @@ import java.util.Set;
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
+public class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
 
 private Direction direction;
 

[46/46] tinkerpop git commit: Javascript GLV

[spmallette]

Javascript GLV


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

Branch: refs/heads/TINKERPOP-1489
Commit: b06d197467982ff14d41d5cc7b38d91bd63abdb1
Parents: 9160a8a
Author: Jorge Bay Gondra 
Authored: Wed Oct 5 16:14:46 2016 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 gremlin-javascript/pom.xml  |  132 ++
 .../GraphTraversalSourceGenerator.groovy|  247 +++
 .../javascript/TraversalSourceGenerator.groovy  |  398 
 .../javascript/GenerateGremlinJavascript.java   |   32 +
 .../gremlin/javascript/jsr223/SymbolHelper.java |   59 +
 .../driver/remote-connection.js |  107 +
 .../main/javascript/gremlin-javascript/index.js |   85 +
 .../process/graph-traversal.js  | 2025 ++
 .../gremlin-javascript/process/traversal.js |  395 
 .../gremlin-javascript/structure/graph.js   |  146 ++
 .../structure/io/graph-serializer.js|  406 
 .../javascript/gremlin-javascript/helper.js |   84 +
 .../gremlin-javascript/test-exports.js  |   78 +
 .../gremlin-javascript/test-graphson.js |  108 +
 .../gremlin-javascript/test-traversal.js|   54 +
 pom.xml |1 +
 16 files changed, 4357 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b06d1974/gremlin-javascript/pom.xml
--
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
new file mode 100644
index 000..387e628
--- /dev/null
+++ b/gremlin-javascript/pom.xml
@@ -0,0 +1,132 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.tinkerpop
+tinkerpop
+3.2.3-SNAPSHOT
+
+gremlin-javascript
+Apache TinkerPop :: Gremlin Javascript
+
+
+org.apache.tinkerpop
+gremlin-core
+${project.version}
+
+
+org.codehaus.groovy
+groovy
+${groovy.version}
+indy
+
+
+org.apache.tinkerpop
+tinkergraph-gremlin
+${project.version}
+test
+
+
+org.apache.tinkerpop
+gremlin-test
+${project.version}
+test
+
+
+org.apache.tinkerpop
+gremlin-server
+${project.version}
+test
+
+
+org.slf4j
+slf4j-log4j12
+${slf4j.version}
+test
+
+
+
+
+false
+${maven.test.skip}
+
${project.parent.basedir}/gremlin-server
+
+
+${basedir}/target
+${project.artifactId}-${project.version}
+
+
+org.codehaus.mojo
+exec-maven-plugin
+1.2.1
+
+
+generate-javascript
+generate-test-resources
+
+java
+
+
+
org.apache.tinkerpop.gremlin.javascript.GenerateGremlinJavascript
+
+
${basedir}/src/main/javascript/gremlin-javascript/process/traversal.js
+
${basedir}/src/main/javascript/gremlin-javascript/process/graph-traversal.js
+
+
+
+
+js-tests
+test
+
+exec
+
+
+jjs
+
+
${basedir}/src/test/javascript/gremlin-javascript/test-exports.js
+
${basedir}/src/test/javascript/gremlin-javascript/test-graphson.js
+
${basedir}/src/test/javascript/gremlin-javascript/test-traversal.js
+
+
+
+
+
+
+org.codehaus.gmavenplus
+gmavenplus-plugin
+
+
+

[19/46] tinkerpop git commit: Merge branch 'TINKERPOP-1691' into tp32

[spmallette]

Merge branch 'TINKERPOP-1691' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: a104680d3eb0fa5c73855407d1fb2fd76fae1f72
Parents: 46cd072 3035af1
Author: Stephen Mallette 
Authored: Fri Jun 23 06:20:03 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 23 06:20:03 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../decoration/EventStrategyProcessTest.java| 28 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a104680d/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index e08ec3e,fcc97bc..7a69469
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,9 -28,9 +28,10 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <>.
  
 +* Added annotations to the traversal metrics pretty print.
  * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
  * Improved GraphSON serialization performance around `VertexProperty`.
+ * Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.
  
  [[release-3-2-5]]
  TinkerPop 3.2.5 (Release Date: June 12, 2017)

[16/46] tinkerpop git commit: TINKERPOP-1691 Changed semantics of EventStrategyProcessTest

[spmallette]

TINKERPOP-1691 Changed semantics of EventStrategyProcessTest

Tests no longer assume that element state is sync'd in memory.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 3035af1e18cc29454bbfa6481e77aea41aa8153b
Parents: 116205e
Author: Stephen Mallette 
Authored: Tue Jun 20 11:38:44 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 22 19:13:41 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../decoration/EventStrategyProcessTest.java| 28 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3035af1e/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0bc2c6b..fcc97bc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,6 +30,7 @@ This release also includes changes from <>.
 
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
+* Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.
 
 [[release-3-2-5]]
 TinkerPop 3.2.5 (Release Date: June 12, 2017)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3035af1e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java
index 6a20177..442847a 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java
@@ -562,9 +562,9 @@ public class EventStrategyProcessTest extends 
AbstractGremlinProcessTest {
 gts.V(v).properties("xxx").properties("to-drop").drop().iterate();
 tryCommit(graph);
 
-assertEquals(1, IteratorUtils.count(v.properties()));
-assertEquals(1, 
IteratorUtils.count(v.properties().next().properties()));
-assertEquals("yay!", vp.value("not-dropped"));
+assertEquals(1, IteratorUtils.count(g.V(v).properties()));
+assertEquals(1, IteratorUtils.count(g.V(v).properties().properties()));
+assertEquals("yay!", 
g.V(vp.element()).properties("xxx").values("not-dropped").next());
 assertThat(triggered.get(), is(true));
 }
 
@@ -601,8 +601,8 @@ public class EventStrategyProcessTest extends 
AbstractGremlinProcessTest {
 gts.V(v).properties("xxx").property("to-change","bah").iterate();
 tryCommit(graph);
 
-assertEquals(1, IteratorUtils.count(v.properties()));
-assertEquals(1, 
IteratorUtils.count(v.properties().next().properties()));
+assertEquals(1, IteratorUtils.count(g.V(v).properties()));
+assertEquals(1, IteratorUtils.count(g.V(v).properties().properties()));
 assertThat(triggered.get(), is(true));
 }
 
@@ -639,8 +639,8 @@ public class EventStrategyProcessTest extends 
AbstractGremlinProcessTest {
 gts.V(v).properties("xxx").property("new","yay!").iterate();
 tryCommit(graph);
 
-assertEquals(1, IteratorUtils.count(v.properties()));
-assertEquals(2, 
IteratorUtils.count(v.properties().next().properties()));
+assertEquals(1, IteratorUtils.count(g.V(v).properties()));
+assertEquals(2, IteratorUtils.count(g.V(v).properties().properties()));
 assertThat(triggered.get(), is(true));
 }
 
@@ -677,7 +677,7 @@ public class EventStrategyProcessTest extends 
AbstractGremlinProcessTest {
 gts.E(e).properties("to-drop").drop().iterate();
 tryCommit(graph);
 
-assertEquals(1, IteratorUtils.count(e.properties()));
+assertEquals(1, IteratorUtils.count(g.E(e).properties()));
 assertEquals("yay!", e.value("not-dropped"));
 assertThat(triggered.get(), is(true));
 }
@@ -716,7 +716,7 @@ public class EventStrategyProcessTest extends 
AbstractGremlinProcessTest {
 gts.E(e).property("to-change","yay!").iterate();
 tryCommit(graph);
 
-assertEquals(1, IteratorUtils.count(e.properties()));
+ 

[36/46] tinkerpop git commit: Update Javascript GLV

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baeabd7c/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
deleted file mode 100644
index 7f36e59..000
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
+++ /dev/null
@@ -1,2016 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
- 
-/**
- * @author Jorge Bay Gondra
- */
-(function defineGraphTraversalModule() {
-  "use strict";
-
-  var t = loadModule.call(this, './traversal.js');
-  var remote = loadModule.call(this, '../driver/remote-connection.js');
-  var Bytecode = t.Bytecode;
-  var inherits = t.inherits;
-  var parseArgs = t.parseArgs;
-
-  /**
-   *
-   * @param {Graph} graph
-   * @param {TraversalStrategies} traversalStrategies
-   * @param {Bytecode} [bytecode]
-   * @constructor
-   */
-  function GraphTraversalSource(graph, traversalStrategies, bytecode) {
-this.graph = graph;
-this.traversalStrategies = traversalStrategies;
-this.bytecode = bytecode || new Bytecode();
-  }
-
-  /**
-   * @param remoteConnection
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
-var traversalStrategy = new 
t.TraversalStrategies(this.traversalStrategies);
-traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
-return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
-  };
-
-  /**
-   * Returns the string representation of the GraphTraversalSource.
-   * @returns {string}
-   */
-  GraphTraversalSource.prototype.toString = function () {
-return 'graphtraversalsource[' + this.graph.toString() + ']';
-  };
-
-  /**
-   * withBulk GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withBulk = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withBulk', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withComputer GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withComputer = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withComputer', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withPath GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withPath = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withPath', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withSack GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withSack = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withSack', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withSideEffect GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withSideEffect = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withSideEffect', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withStrategies GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  

[07/46] tinkerpop git commit: Bump to 3.1.8-SNAPSHOT

[spmallette]

Bump to 3.1.8-SNAPSHOT


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

Branch: refs/heads/TINKERPOP-1489
Commit: 3d50f5cf48b4fe58b355fd83e25ec7218a9ca7b2
Parents: b1c0723
Author: Ted Wilmes 
Authored: Mon Jun 19 08:59:51 2017 -0500
Committer: Ted Wilmes 
Committed: Mon Jun 19 08:59:51 2017 -0500

--
 CHANGELOG.asciidoc  | 4 
 docs/src/upgrade/release-3.1.x-incubating.asciidoc  | 5 +
 giraph-gremlin/pom.xml  | 2 +-
 gremlin-archetype/gremlin-archetype-server/pom.xml  | 2 +-
 gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
 gremlin-archetype/pom.xml   | 2 +-
 gremlin-console/bin/gremlin.sh  | 2 +-
 gremlin-console/pom.xml | 2 +-
 gremlin-core/pom.xml| 2 +-
 gremlin-driver/pom.xml  | 2 +-
 gremlin-groovy-test/pom.xml | 2 +-
 gremlin-groovy/pom.xml  | 2 +-
 gremlin-server/pom.xml  | 2 +-
 gremlin-shaded/pom.xml  | 2 +-
 gremlin-test/pom.xml| 2 +-
 hadoop-gremlin/pom.xml  | 2 +-
 neo4j-gremlin/pom.xml   | 2 +-
 pom.xml | 2 +-
 spark-gremlin/pom.xml   | 2 +-
 tinkergraph-gremlin/pom.xml | 2 +-
 20 files changed, 27 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d50f5cf/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 871b2d1..d421cb5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -22,6 +22,10 @@ TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
 
 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
 
+[[release-3-1-8]]
+TinkerPop 3.1.8 (Release Date: NOT OFFICIALLY RELEASED YET)
+~~~
+
 [[release-3-1-7]]
 TinkerPop 3.1.7 (Release Date: June 12, 2017)
 ~

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d50f5cf/docs/src/upgrade/release-3.1.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index beee585..6a7bd55 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -22,6 +22,11 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 *A 187 On The Undercover Gremlinz*
 
+TinkerPop 3.1.8
+---
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
 TinkerPop 3.1.7
 ---
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d50f5cf/giraph-gremlin/pom.xml
--
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index f0f4ce0..7540cea 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
 
 org.apache.tinkerpop
 tinkerpop
-3.1.7
+3.1.8-SNAPSHOT
 
 giraph-gremlin
 Apache TinkerPop :: Giraph Gremlin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d50f5cf/gremlin-archetype/gremlin-archetype-server/pom.xml
--
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml 
b/gremlin-archetype/gremlin-archetype-server/pom.xml
index da77402..0b8f759 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
 
 org.apache.tinkerpop
 gremlin-archetype
-3.1.7
+3.1.8-SNAPSHOT
 
 
 gremlin-archetype-server

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d50f5cf/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
--
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml 
b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index a3ebead..4b6fc64 100644
--- 

[17/46] tinkerpop git commit: Merge branch 'TINKERPOP-1688' into tp32

[spmallette]

Merge branch 'TINKERPOP-1688' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: c92d2c0a94ab20c5143c385118dc099ef6997d00
Parents: 116205e a9f48df
Author: Stephen Mallette 
Authored: Thu Jun 22 19:25:21 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 22 19:25:21 2017 -0400

--
 .../traversal/util/DefaultTraversalMetrics.java | 47 +++-
 1 file changed, 46 insertions(+), 1 deletion(-)
--

[05/46] tinkerpop git commit: Added a note about reporter.apache.org in release docs CTR

[spmallette]

Added a note about reporter.apache.org in release docs CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: e6ddba1f75906c854c288eef47ce70cae831a48a
Parents: 3f7dbdc
Author: Stephen Mallette 
Authored: Mon Jun 19 07:03:23 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 07:03:23 2017 -0400

--
 docs/src/dev/developer/release.asciidoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6ddba1f/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 1586c86..121bbb6 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -225,6 +225,7 @@ Release & Promote
 . Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
 . `cd release; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
 . Wait for Apache Sonatype to sync the artifacts to Maven Central at 
(link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
+. Report the release through 
link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] 
(an email reminder should arrive shortly follwing the svn command above to do 
the release)
 . Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the 
download links work from a mirror).
 . Update home page site with references to latest distribution - specifically:
 .. Update the `template/header-footer.html`.

[21/46] tinkerpop git commit: Added a warning to docs around transaction

[spmallette]

Added a warning to docs around transaction

Different graph providers have different kinds of support for transactions. 
Better to warn users that might experience different approaches to transaction 
in various systems. CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 8bb99089af4000c6a719edd861f4913c659d7b71
Parents: 984b34d
Author: Stephen Mallette 
Authored: Fri Jun 23 08:35:34 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 23 08:35:34 2017 -0400

--
 docs/src/reference/the-graph.asciidoc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8bb99089/docs/src/reference/the-graph.asciidoc
--
diff --git a/docs/src/reference/the-graph.asciidoc 
b/docs/src/reference/the-graph.asciidoc
index 063c174..d1e341e 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -198,6 +198,11 @@ a transactional leak does occur between requests somehow, 
a fresh transaction is
 TIP: The `tx()` method is on the `Graph` interface, but it is also available 
on the `TraversalSource` spawned from a
 `Graph`.  Calls to `TraversalSource.tx()` are proxied through to the 
underlying `Graph` as a convenience.
 
+WARNING: TinkerPop provides for basic transaction control, however, like many 
aspects of TinkerPop, it is up to the
+graph system provider to choose the specific aspects of how their 
implementation will work and how it fits into the
+TinkerPop stack. Be sure to understand the transaction semantics of the 
specific graph implementation that is being
+utilized as it may present differing functionality than described here.
+
 Configuring
 ~~~
 

[01/46] tinkerpop git commit: Fixed bad gremlin-console path for 3.1.7 release. [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1489 9e0cf362b -> baeabd7c8 (forced update)


Fixed bad gremlin-console path for 3.1.7 release.


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

Branch: refs/heads/TINKERPOP-1489
Commit: b1c072375af03acb9998a9a06f1f487526269def
Parents: e3552d9
Author: Ted Wilmes 
Authored: Mon Jun 12 17:59:34 2017 -0500
Committer: Ted Wilmes 
Committed: Mon Jun 12 17:59:34 2017 -0500

--
 gremlin-console/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b1c07237/gremlin-console/bin/gremlin.sh
--
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index ebba75e..5d09262 12
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.1.7-standalone/bin/gremlin.sh
\ No newline at end of file

[26/46] tinkerpop git commit: updated CHANGELOG.

[spmallette]

updated CHANGELOG.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 3b8c62892b3369a2ada0314f33f0b5122a4d6e82
Parents: d67b88b
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:54:00 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:54:00 2017 -0600

--
 CHANGELOG.asciidoc | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3b8c6289/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d421cb5..5436fd9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.1.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* Fixed a `MessageScope` bug in `TinkerGraphComputer`.
+
 [[release-3-1-7]]
 TinkerPop 3.1.7 (Release Date: June 12, 2017)
 ~

[08/46] tinkerpop git commit: TINKERPOP-741 Deprecated Transaction.submit(Function)

[spmallette]

TINKERPOP-741 Deprecated Transaction.submit(Function)


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

Branch: refs/heads/TINKERPOP-1489
Commit: eba0a2c0a3dbb8ea1bb4d5358b8c7445cad15c85
Parents: 9af4cce
Author: Stephen Mallette 
Authored: Mon Jun 19 11:45:32 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 11:51:51 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/the-graph.asciidoc   | 20 
 .../gremlin/structure/Transaction.java  |  4 
 .../structure/util/AbstractTransaction.java |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4e6dc16..bfb7aa9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 This release also includes changes from <>.
 
+* Deprecated `Transaction.submit(Function)`.
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/docs/src/reference/the-graph.asciidoc
--
diff --git a/docs/src/reference/the-graph.asciidoc 
b/docs/src/reference/the-graph.asciidoc
index 063c174..b66f5bd 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -280,26 +280,6 @@ NOTE: It may be important to consult the documentation of 
the `Graph` implementa
 specifics of how transactions will behave.  TinkerPop allows some latitude in 
this area and implementations may not have
 the exact same behaviors and link:https://en.wikipedia.org/wiki/ACID[ACID] 
guarantees.
 
-Retries
-~~~
-
-There are times when transactions fail.  Failure may be indicative of some 
permanent condition, but other failures
-might simply require the transaction to be retried for possible future 
success. The `Transaction` object also exposes
-a method for executing automatic transaction retries:
-
-[gremlin-groovy]
-
-graph = Neo4jGraph.open('/tmp/neo4j')
-graph.tx().submit {it.addVertex("name","josh")}.retry(10)
-graph.tx().submit {it.addVertex("name","daniel")}.exponentialBackoff(10)
-graph.close()
-
-
-As shown above, the `submit` method takes a `Function` which is the 
unit of work to execute and possibly
-retry on failure.  The method returns a `Transaction.Workload` object which 
has a number of default methods for common
-retry strategies.  It is also possible to supply a custom retry function if a 
default one does not suit the required
-purpose.
-
 Threaded Transactions
 ~
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
index 82f3820..ff4232d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
@@ -63,7 +63,9 @@ public interface Transaction extends AutoCloseable {
 /**
  * Submit a unit of work that represents a transaction returning a {@link 
Workload} that can be automatically
  * retried in the event of failure.
+ * @deprecated As of release 3.2.6, not replaced.
  */
+@Deprecated
 public  Workload submit(final Function work);
 
 /**
@@ -228,7 +230,9 @@ public interface Transaction extends AutoCloseable {
  * or the unit of work succeeds with a commit operation.
  *
  * @param  The type of the result from the unit of work.
+ * @deprecated As of release 3.2.6, not replaced.
  */
+@Deprecated
 public static class Workload {
 public static final long DEFAULT_DELAY_MS = 20;
 public static final int DEFAULT_TRIES = 8;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eba0a2c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
--
diff --git 

[39/46] tinkerpop git commit: Parse Edge and VertexProperty properties

[spmallette]

Parse Edge and VertexProperty properties

To follow the decision around TINKERPOP-1474 for the GLV to parse properties.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 74fb07723a7119626c8cdff9585ccfdd203728e5
Parents: 4610854
Author: Jorge Bay Gondra 
Authored: Wed Nov 16 13:41:46 2016 +0100
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 .../javascript/gremlin-javascript/structure/graph.js | 15 +--
 .../structure/io/graph-serializer.js | 13 +++--
 2 files changed, 24 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74fb0772/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/graph.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/graph.js 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/graph.js
index 7c48819..cd408ae 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/graph.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/graph.js
@@ -68,10 +68,20 @@
 
   inherits(Vertex, Element);
 
-  function Edge(id, outV, label, inV) {
+  function Edge(id, outV, label, inV, properties) {
 Element.call(this, id, label);
 this.outV = outV;
 this.inV = inV;
+this.properties = {};
+(function adaptProperties(self) {
+  if (properties) {
+var keys = Object.keys(properties);
+for (var i = 0; i < keys.length; i++) {
+  var k = keys[i];
+  self.properties[k] = properties[k].value;
+}
+  }
+})(this);
   }
 
   inherits(Edge, Element);
@@ -80,10 +90,11 @@
 return 'e[' + this.id + '][' + this.outV.id + '-' + this.label + '->' + 
this.inV.id + ']';
   };
 
-  function VertexProperty(id, label, value) {
+  function VertexProperty(id, label, value, properties) {
 Element.call(this, id, label);
 this.value = value;
 this.key = this.label;
+this.properties = properties;
   }
 
   inherits(VertexProperty, Element);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74fb0772/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/io/graph-serializer.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/io/graph-serializer.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/io/graph-serializer.js
index 2dde340..31652da 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/io/graph-serializer.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/structure/io/graph-serializer.js
@@ -155,6 +155,9 @@
   }
 
   GraphSONReader.prototype.read = function (obj) {
+if (obj === undefined) {
+  return undefined;
+}
 if (Array.isArray(obj)) {
   return obj.map(function mapEach(item) {
 return this.read(item);
@@ -340,7 +343,12 @@
 
   VertexPropertySerializer.prototype.deserialize = function (obj) {
 var value = obj[valueKey];
-return new g.VertexProperty(this.reader.read(value['id']), value['label'], 
this.reader.read(value['value']));
+return new g.VertexProperty(
+  this.reader.read(value['id']),
+  value['label'],
+  this.reader.read(value['value']),
+  this.reader.read(value['properties'])
+);
   };
 
   function PropertySerializer() {
@@ -364,7 +372,8 @@
   this.reader.read(value['id']),
   this.reader.read(value['outV']),
   value['label'],
-  this.reader.read(value['inV'])
+  this.reader.read(value['inV']),
+  this.reader.read(value['properties'])
 );
   };
 

[14/46] tinkerpop git commit: fixed link - CTR

[spmallette]

fixed link - CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: ee05582a5979d068fad94f0c5584e3b1f836fbfa
Parents: 9105431
Author: Robert Dale 
Authored: Mon Jun 19 15:33:21 2017 -0400
Committer: Robert Dale 
Committed: Mon Jun 19 15:33:21 2017 -0400

--
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee05582a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 37b2923..8554815 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -74,7 +74,7 @@ social.persons().where(createdAtLeast(2)).count()
 
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-786[TINKERPOP-786],
-link:http://tinkerpop.apache.org/docs/3.2.5/dev/reference/#dsl[Reference 
Documentation]
+link:http://tinkerpop.apache.org/docs/3.2.5/reference/#dsl[Reference 
Documentation]
 
 Authentication Configuration
 

[25/46] tinkerpop git commit: Merge branch 'tp31' of https://github.com/sheldonkhall/tinkerpop into tp31

[spmallette]

Merge branch 'tp31' of https://github.com/sheldonkhall/tinkerpop into tp31


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

Branch: refs/heads/TINKERPOP-1489
Commit: d67b88b2bee75c68d3c5756a8dbf963f9de2df39
Parents: 3d50f5c 99679a0
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:53:22 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:53:22 2017 -0600

--
 .../process/computer/GraphComputerTest.java | 93 
 .../process/computer/TinkerMessageBoard.java|  4 +-
 .../process/computer/TinkerMessenger.java   | 22 +++--
 3 files changed, 109 insertions(+), 10 deletions(-)
--

[18/46] tinkerpop git commit: TINKERPOP-1688 updated changelog CTR

[spmallette]

TINKERPOP-1688 updated changelog CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 46cd072edcd587fa298b92b579f4c956dd4d861b
Parents: c92d2c0
Author: Stephen Mallette 
Authored: Thu Jun 22 19:26:10 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 22 19:26:10 2017 -0400

--
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46cd072e/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0bc2c6b..e08ec3e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 This release also includes changes from <>.
 
+* Added annotations to the traversal metrics pretty print.
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
 

[15/46] tinkerpop git commit: TINKERPOP-920 Added more javadoc for getCardinality()

[spmallette]

TINKERPOP-920 Added more javadoc for getCardinality()

Basically, users shouldn't rely on this method for determining a key's 
cardinality in production applications. This method is generally for internal 
use by TinkerPop (mostly for the test suite and other generalized functions) CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 116205ebc7342ae721cf76992653479a95ad2f0d
Parents: ee05582
Author: Stephen Mallette 
Authored: Tue Jun 20 12:24:39 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Jun 20 12:31:17 2017 -0400

--
 .../main/java/org/apache/tinkerpop/gremlin/structure/Graph.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/116205eb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index 1f59719..81bbed7 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -525,6 +525,11 @@ public interface Graph extends AutoCloseable, Host {
  * {@link VertexProperty.Cardinality#list}.  Implementations that 
employ a schema can consult it to
  * determine the {@link VertexProperty.Cardinality}.  Those that 
do no have a schema can return their
  * default {@link VertexProperty.Cardinality} for every key.
+ * 
+ * Note that this method is primarily used by TinkerPop for 
internal usage and may not be suitable to
+ * reliably determine the cardinality of a key. For some 
implementation it may offer little more than a
+ * hint on the actual cardinality. Generally speaking it is likely 
best to drop down to the API of the
+ * {@link Graph} implementation for any schema related queries.
  */
 public default VertexProperty.Cardinality getCardinality(final 
String key) {
 return VertexProperty.Cardinality.list;

[35/46] tinkerpop git commit: Update Javascript GLV

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baeabd7c/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
new file mode 100644
index 000..3864a4a
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
@@ -0,0 +1,73 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+'use strict';
+
+var assert = require('assert');
+var glvModule = require('../../');
+
+describe('API', function () {
+  it('should export fields under process', function () {
+assert.ok(glvModule);
+assert.ok(glvModule.process);
+assert.strictEqual(typeof glvModule.process.Bytecode, 'function');
+assert.strictEqual(typeof glvModule.process.EnumValue, 'function');
+assert.strictEqual(typeof glvModule.process.P, 'function');
+assert.strictEqual(typeof glvModule.process.Traversal, 'function');
+assert.strictEqual(typeof glvModule.process.TraversalSideEffects, 
'function');
+assert.strictEqual(typeof glvModule.process.TraversalStrategies, 
'function');
+assert.strictEqual(typeof glvModule.process.TraversalStrategy, 'function');
+assert.strictEqual(typeof glvModule.process.Traverser, 'function');
+assert.strictEqual(typeof glvModule.process.GraphTraversal, 'function');
+assert.strictEqual(typeof glvModule.process.GraphTraversalSource, 
'function');
+assert.strictEqual(typeof glvModule.process.barrier, 'object');
+assert.strictEqual(typeof glvModule.process.cardinality, 'object');
+assert.strictEqual(typeof glvModule.process.column, 'object');
+assert.strictEqual(typeof glvModule.process.direction, 'object');
+assert.strictEqual(typeof glvModule.process.direction.both, 'object');
+assert.strictEqual(glvModule.process.direction.both.elementName, 'BOTH');
+assert.strictEqual(typeof glvModule.process.operator, 'object');
+assert.strictEqual(typeof glvModule.process.order, 'object');
+assert.strictEqual(typeof glvModule.process.pop, 'object');
+assert.strictEqual(typeof glvModule.process.scope, 'object');
+assert.strictEqual(typeof glvModule.process.t, 'object');
+assert.ok(glvModule.process.statics);
+  });
+  it('should expose fields under structure', function () {
+assert.ok(glvModule.structure);
+assert.ok(glvModule.structure.io);
+assert.strictEqual(typeof glvModule.structure.io.GraphSONReader, 
'function');
+assert.strictEqual(typeof glvModule.structure.io.GraphSONWriter, 
'function');
+assert.strictEqual(typeof glvModule.structure.Edge, 'function');
+assert.strictEqual(typeof glvModule.structure.Graph, 'function');
+assert.strictEqual(typeof glvModule.structure.Path, 'function');
+assert.strictEqual(typeof glvModule.structure.Property, 'function');
+assert.strictEqual(typeof glvModule.structure.Vertex, 'function');
+assert.strictEqual(typeof glvModule.structure.VertexProperty, 'function');
+  });
+  it('should expose fields under driver', function () {
+assert.ok(glvModule.driver);
+assert.strictEqual(typeof glvModule.driver.RemoteConnection, 'function');
+assert.strictEqual(typeof glvModule.driver.RemoteStrategy, 'function');
+assert.strictEqual(typeof glvModule.driver.RemoteTraversal, 'function');
+  });
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baeabd7c/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
new file mode 100644
index 000..ed5beb3
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
@@ -0,0 +1,112 @@
+/*
+ *  Licensed to the Apache 

[42/46] tinkerpop git commit: Use null as empty result

[spmallette]

Use null as empty result


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

Branch: refs/heads/TINKERPOP-1489
Commit: 4610854277efbe4ec813d7c75288e3b51616694f
Parents: af27168
Author: Jorge Bay Gondra 
Authored: Thu Nov 3 14:34:28 2016 +0100
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 .../tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy   | 2 +-
 .../src/main/javascript/gremlin-javascript/process/traversal.js| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46108542/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
index 46f65a4..d5899f0 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
@@ -87,7 +87,7 @@ class TraversalSourceGenerator {
   /** @param {Function} callback */
   Traversal.prototype.one = function (callback) {
 this.list(function (err, result) {
-  callback(err, result ? result[0] : null);
+  callback(err, result && result.length > 0 ? result[0] : null);
 });
   };
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46108542/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
index a7a9bb7..f585161 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
@@ -50,7 +50,7 @@
   /** @param {Function} callback */
   Traversal.prototype.one = function (callback) {
 this.list(function (err, result) {
-  callback(err, result ? result[0] : null);
+  callback(err, result && result.length > 0 ? result[0] : null);
 });
   };
 

[45/46] tinkerpop git commit: Javascript GLV

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b06d1974/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
new file mode 100644
index 000..d9803ba
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
@@ -0,0 +1,2025 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+ 
+/**
+ * @author Jorge Bay Gondra
+ */
+(function defineGraphTraversalModule() {
+  "use strict";
+
+  var t = loadModule.call(this, './traversal.js');
+  var remote = loadModule.call(this, '../driver/remote-connection.js');
+  var Bytecode = t.Bytecode;
+  var inherits = t.inherits;
+  var parseArgs = t.parseArgs;
+
+  /**
+   *
+   * @param {Graph} graph
+   * @param {TraversalStrategies} traversalStrategies
+   * @param {Bytecode} [bytecode]
+   * @constructor
+   */
+  function GraphTraversalSource(graph, traversalStrategies, bytecode) {
+this._graph = graph;
+this._traversalStrategies = traversalStrategies;
+this._bytecode = bytecode || new Bytecode();
+  }
+
+  /**
+   * @param remoteConnection
+   * @returns {GraphTraversal}
+   */
+  GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
+var traversalStrategy = new 
t.TraversalStrategies(this._traversalStrategies);
+traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
+return new GraphTraversal(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
+  };
+
+  /**
+   * Returns the string representation of the GraphTraversalSource.
+   * @returns {string}
+   */
+  GraphTraversalSource.prototype.toString = function () {
+return 'graphtraversalsource[' + this._graph.toString() + ']';
+  };
+
+  /**
+   * withBulk GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withBulk = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withBulk', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withComputer GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withComputer = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withComputer', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withPath GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withPath = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withPath', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withSack GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withSack = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withSack', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withSideEffect GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withSideEffect = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withSideEffect', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withStrategies GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  

[03/46] tinkerpop git commit: bugfix

[spmallette]

bugfix


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

Branch: refs/heads/TINKERPOP-1489
Commit: 28c514da9065683ed90ea6aabc66ffdcbab99c11
Parents: b1c0723
Author: Sheldon 
Authored: Thu Jun 15 18:00:32 2017 +0100
Committer: Sheldon 
Committed: Mon Jun 19 11:20:20 2017 +0100

--
 .../process/computer/TinkerMessageBoard.java|  4 ++--
 .../process/computer/TinkerMessenger.java   | 22 +---
 2 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28c514da/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
--
diff --git 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
index b217801..422ab86 100644
--- 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
+++ 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java
@@ -32,8 +32,8 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 final class TinkerMessageBoard {
 
-public Map sendMessages = new ConcurrentHashMap<>();
-public Map receiveMessages = new ConcurrentHashMap<>();
+public Map> sendMessages = new 
ConcurrentHashMap<>();
+public Map> receiveMessages = new 
ConcurrentHashMap<>();
 public Set previousMessageScopes = new HashSet<>();
 public Set currentMessageScopes = new HashSet<>();
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28c514da/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
--
diff --git 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
index 3298aff..d3f2de5 100644
--- 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
+++ 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
@@ -37,6 +37,7 @@ import java.util.Optional;
 import java.util.Queue;
 import java.util.Spliterator;
 import java.util.Spliterators;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -59,14 +60,15 @@ public final class TinkerMessenger implements 
Messenger {
 @Override
 public Iterator receiveMessages() {
 final MultiIterator multiIterator = new MultiIterator<>();
-for (final MessageScope messageScope : 
this.messageBoard.previousMessageScopes) {
+for (final MessageScope messageScope : 
this.messageBoard.receiveMessages.keySet()) {
+//for (final MessageScope messageScope : 
this.messageBoard.previousMessageScopes) {
 if (messageScope instanceof MessageScope.Local) {
 final MessageScope.Local localMessageScope = 
(MessageScope.Local) messageScope;
 final Traversal.Admin incidentTraversal = 
TinkerMessenger.setVertexStart(localMessageScope.getIncidentTraversal().get().asAdmin(),
 this.vertex);
 final Direction direction = 
TinkerMessenger.getDirection(incidentTraversal);
 final Edge[] edge = new Edge[1]; // simulates storage 
side-effects available in Gremlin, but not Java8 streams
 
multiIterator.addIterator(StreamSupport.stream(Spliterators.spliteratorUnknownSize(VertexProgramHelper.reverse(incidentTraversal.asAdmin()),
 Spliterator.IMMUTABLE | Spliterator.SIZED), false)
-.map(e -> 
this.messageBoard.receiveMessages.get((edge[0] = e).vertices(direction).next()))
+.map(e -> 
this.messageBoard.receiveMessages.get(messageScope).get((edge[0] = 
e).vertices(direction).next()))
 .filter(q -> null != q)
 .flatMap(Queue::stream)
 .map(message -> 
localMessageScope.getEdgeFunction().apply(message, edge[0]))
@@ 

[37/46] tinkerpop git commit: Update Javascript GLV

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baeabd7c/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
new file mode 100644
index 000..5ee734a1
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
@@ -0,0 +1,2095 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+ 
+/**
+ * @author Jorge Bay Gondra
+ */
+'use strict';
+
+var t = require('./traversal.js');
+var remote = require('../driver/remote-connection');
+var utils = require('../utils');
+var Bytecode = require('./bytecode');
+var TraversalStrategies = require('./traversal-strategy').TraversalStrategies;
+var inherits = utils.inherits;
+var parseArgs = utils.parseArgs;
+
+/**
+ *
+ * @param {Graph} graph
+ * @param {TraversalStrategies} traversalStrategies
+ * @param {Bytecode} [bytecode]
+ * @constructor
+ */
+function GraphTraversalSource(graph, traversalStrategies, bytecode) {
+  this.graph = graph;
+  this.traversalStrategies = traversalStrategies;
+  this.bytecode = bytecode || new Bytecode();
+}
+
+/**
+ * @param remoteConnection
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
+  var traversalStrategy = new TraversalStrategies(this.traversalStrategies);
+  traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
+  return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
+};
+
+/**
+ * Returns the string representation of the GraphTraversalSource.
+ * @returns {string}
+ */
+GraphTraversalSource.prototype.toString = function () {
+  return 'graphtraversalsource[' + this.graph.toString() + ']';
+};
+
+/**
+ * Graph Traversal Source withBulk method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withBulk = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withBulk', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withComputer method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withComputer = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withComputer', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withPath method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withPath = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withPath', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withSack method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withSack = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withSack', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withSideEffect method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withSideEffect = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withSideEffect', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withStrategies method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withStrategies = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withStrategies', 

[32/46] tinkerpop git commit: TINKERPOP-1694 Deprecated useMapperFromGraph

[spmallette]

TINKERPOP-1694 Deprecated useMapperFromGraph


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

Branch: refs/heads/TINKERPOP-1489
Commit: d49548eacc88c5a34cc4f01f6367552604ad6cf3
Parents: aa81313
Author: Stephen Mallette 
Authored: Fri Jun 23 12:26:46 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:52:12 2017 -0400

--
 CHANGELOG.asciidoc|  1 +
 docs/src/reference/gremlin-applications.asciidoc  |  5 ++---
 docs/src/upgrade/release-3.2.x-incubating.asciidoc|  9 +
 .../src/test/resources/gremlin-server.yaml|  2 +-
 gremlin-console/conf/remote-objects.yaml  |  5 -
 .../driver/ser/AbstractGraphSONMessageSerializerV1d0.java |  5 +
 .../driver/ser/AbstractGraphSONMessageSerializerV2d0.java |  5 +
 .../driver/ser/AbstractGryoMessageSerializerV1d0.java |  6 ++
 .../python/driver/gremlin-server-modern-secure-py.yaml| 10 +-
 gremlin-server/conf/gremlin-server-classic.yaml   |  8 
 gremlin-server/conf/gremlin-server-modern-py.yaml |  8 
 gremlin-server/conf/gremlin-server-modern-readonly.yaml   |  8 
 gremlin-server/conf/gremlin-server-modern.yaml|  8 
 gremlin-server/conf/gremlin-server-neo4j.yaml |  8 
 gremlin-server/conf/gremlin-server-rest-modern.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-rest-secure.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-secure.yaml|  8 
 gremlin-server/conf/gremlin-server-spark.yaml |  8 
 gremlin-server/conf/gremlin-server.yaml   |  8 
 .../gremlin/driver/remote/gremlin-server-integration.yaml |  8 
 .../gremlin/server/gremlin-server-integration.yaml|  8 
 .../gremlin/server/gremlin-server-performance.yaml|  2 +-
 22 files changed, 79 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d49548ea/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ba9f2a7..b438248 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 This release also includes changes from <>.
 
+* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server 
serializers.
 * Added annotations to the traversal metrics pretty print.
 * `EdgeVertexStep` is no longer final and can be extended by providers.
 * Deprecated `Transaction.submit(Function)`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d49548ea/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index e62ce86..0d93194 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1518,7 +1518,7 @@ consistent with standard JSON data types.  It has the 
following configuration op
 [width="100%",cols="3,10,^2",options="header"]
 |=
 |Key |Description |Default
-|useMapperFromGraph |Specifies the name of the `Graph` (from the `graphs` 
`Map` in the configuration file) from which to plugin any custom serializers 
that are tied to it. |_none_
+|ioRegistries |A list of `IoRegistry` implementations to be applied to the 
serializer. |_none_
 |=
 
 [source,yaml]
@@ -1532,7 +1532,7 @@ type names, so interpretation from non-JVM languages will 
be required.  It has t
 [width="100%",cols="3,10,^2",options="header"]
 |=
 |Key |Description |Default
-|useMapperFromGraph |Specifies the name of the `Graph` (from the `graphs` 
`Map` in the configuration file) from which to plugin any custom serializers 
that are tied to it. |_none_
+|ioRegistries |A list of `IoRegistry` implementations to be applied to the 
serializer. |_none_
 |=
 
 Gryo
@@ -1554,7 +1554,6 @@ It has the MIME type of 
`application/vnd.gremlin-v1.0+gryo` and the following co
 |custom |A list of classes with custom kryo `Serializer` implementations 
related to them in the form of `;`. |_none_
 |ioRegistries |A list of `IoRegistry` implementations to be applied to the 

[28/46] tinkerpop git commit: tweaked the MessageScope bug fix test to use MODERN so it works with Spark and Giraph. Simple tweak to test data, not semantics. CTR.

[spmallette]

tweaked the MessageScope bug fix test to use MODERN so it works with Spark and 
Giraph. Simple tweak to test data, not semantics. CTR.


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

Branch: refs/heads/TINKERPOP-1489
Commit: e7f5ef711b1edbd130f23610d993e13d44d5df50
Parents: 3b8c628
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 09:55:35 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 09:55:35 2017 -0600

--
 .../process/computer/GraphComputerTest.java | 42 +---
 1 file changed, 10 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e7f5ef71/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 02ac5d4..e2acd5e 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -26,7 +26,6 @@ import 
org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
 import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
@@ -41,7 +40,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
@@ -1472,27 +1470,16 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 
 /
 @Test
+@LoadGraphWith(MODERN)
 public void shouldSupportMultipleScopes() throws ExecutionException, 
InterruptedException {
-Vertex a = graph.addVertex("a");
-Vertex b = graph.addVertex("b");
-Vertex c = graph.addVertex("c");
-a.addEdge("edge", b);
-b.addEdge("edge", c);
-
-// Simple graph:
-// a -> b -> c
-
-// Execute a traversal program that sends an incoming message of "2" 
and an outgoing message of "1" from "b"
-// then each vertex sums any received messages
-ComputerResult result = graph.compute().program(new 
MultiScopeVertexProgram()).submit().get();
-
-// We expect the results to be {a=2, b=0, c=1}. Instead it is {a=3, 
b=0, c=3}
-assertEquals((Long) 
result.graph().traversal().V().hasLabel("a").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(2L));
-assertEquals((Long) 
result.graph().traversal().V().hasLabel("b").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(0L));
-assertEquals((Long) 
result.graph().traversal().V().hasLabel("c").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(1L));
+final ComputerResult result = 
graph.compute(graphComputerClass.get()).program(new 
MultiScopeVertexProgram()).submit().get();
+assertEquals(result.graph().traversal().V().has("name", 
"josh").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 0L);
+assertEquals(result.graph().traversal().V().has("name", 
"lop").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
+assertEquals(result.graph().traversal().V().has("name", 
"ripple").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
+assertEquals(result.graph().traversal().V().has("name", 
"marko").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 2L);
 }
 
-public static class MultiScopeVertexProgram implements VertexProgram 
{
+public static class MultiScopeVertexProgram extends 
StaticVertexProgram {
 
 private final MessageScope.Local countMessageScopeIn = 
MessageScope.Local.of(__::inE);
 private final MessageScope.Local countMessageScopeOut = 
MessageScope.Local.of(__::outE);
@@ -1502,7 +1489,8 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 private static final Set COMPUTE_KEYS = 

[04/46] tinkerpop git commit: add the regression test

[spmallette]

add the regression test


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

Branch: refs/heads/TINKERPOP-1489
Commit: 99679a037db3e86112471a40cd454114231852b6
Parents: 28c514d
Author: Sheldon 
Authored: Mon Jun 19 10:35:16 2017 +0100
Committer: Sheldon 
Committed: Mon Jun 19 11:20:37 2017 +0100

--
 .../process/computer/GraphComputerTest.java | 93 
 1 file changed, 93 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99679a03/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 1af0830..02ac5d4 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -24,11 +24,14 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
 import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
 import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -38,9 +41,11 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
@@ -1463,6 +1468,94 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 public void storeState(final Configuration configuration) {
 VertexProgram.super.storeState(configuration);
 }
+}
+
+/
+@Test
+public void shouldSupportMultipleScopes() throws ExecutionException, 
InterruptedException {
+Vertex a = graph.addVertex("a");
+Vertex b = graph.addVertex("b");
+Vertex c = graph.addVertex("c");
+a.addEdge("edge", b);
+b.addEdge("edge", c);
+
+// Simple graph:
+// a -> b -> c
+
+// Execute a traversal program that sends an incoming message of "2" 
and an outgoing message of "1" from "b"
+// then each vertex sums any received messages
+ComputerResult result = graph.compute().program(new 
MultiScopeVertexProgram()).submit().get();
+
+// We expect the results to be {a=2, b=0, c=1}. Instead it is {a=3, 
b=0, c=3}
+assertEquals((Long) 
result.graph().traversal().V().hasLabel("a").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(2L));
+assertEquals((Long) 
result.graph().traversal().V().hasLabel("b").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(0L));
+assertEquals((Long) 
result.graph().traversal().V().hasLabel("c").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(),Long.valueOf(1L));
+}
+
+public static class MultiScopeVertexProgram implements VertexProgram 
{
+
+private final MessageScope.Local countMessageScopeIn = 
MessageScope.Local.of(__::inE);
+private final MessageScope.Local countMessageScopeOut = 
MessageScope.Local.of(__::outE);
+
+private static final String MEMORY_KEY = "count";
+
+private static final Set COMPUTE_KEYS = 
Collections.singleton(MEMORY_KEY);
+
+@Override
+public void setup(final Memory memory) {}
+
+@Override
+public GraphComputer.Persist getPreferredPersist() {
+return GraphComputer.Persist.VERTEX_PROPERTIES;
+}
+
+@Override
+public Set getElementComputeKeys() {
+return COMPUTE_KEYS;
+

[44/46] tinkerpop git commit: Javascript GLV

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b06d1974/gremlin-javascript/src/test/javascript/gremlin-javascript/test-graphson.js
--
diff --git 
a/gremlin-javascript/src/test/javascript/gremlin-javascript/test-graphson.js 
b/gremlin-javascript/src/test/javascript/gremlin-javascript/test-graphson.js
new file mode 100644
index 000..e44ef90
--- /dev/null
+++ b/gremlin-javascript/src/test/javascript/gremlin-javascript/test-graphson.js
@@ -0,0 +1,108 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+(function defineTestCases() {
+  "use strict";
+
+  var helper = loadModule.call(this, './helper.js');
+  var assert = helper.assert;
+  var graph = helper.loadLibModule.call(this, 'structure/graph.js');
+  var t = helper.loadLibModule.call(this, 'process/traversal.js');
+  var gs = helper.loadLibModule.call(this, 'structure/io/graph-serializer.js');
+  var GraphSONReader = gs.GraphSONReader;
+  var GraphSONWriter = gs.GraphSONWriter;
+  var P = t.P;
+
+  [
+function testReadNumbers() {
+  var reader = new GraphSONReader();
+  [
+[{
+  "@type": "g:Int32",
+  "@value": 31
+}, 31],
+[{
+  "@type": "g:Float",
+  "@value": 31.3
+}, 31.3],
+[{
+  "@type": "g:Double",
+  "@value": 31.2
+}, 31.2]
+  ].forEach(function (item) {
+var result = reader.read(item[0]);
+assert.strictEqual(result, item[1]);
+assert.strictEqual(typeof result, 'number');
+  });
+},
+function testReadGraph() {
+  var obj = {"@type":"g:Vertex", 
"@value":{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},
 
"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}};
+  var reader = new GraphSONReader(obj);
+  var result = reader.read(obj);
+  assert.ok(result instanceof graph.Vertex);
+  assert.strictEqual(result.label, 'person');
+  assert.strictEqual(typeof result.id, 'number');
+},
+function testReadPath() {
+  var obj = 
{"@type":"g:Path","@value":{"labels":[["a"],["b","c"],[]],"objects":[
+
{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":1},"label":"person","properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":0},"value":"marko","label":"name"}}],"age":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29},"label":"age"}}]}}},
+
{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":3},"label":"software","properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":4},"value":"lop","label":"name"}}],"lang":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":5},"value":"java","label":"lang"}}]}}},
+"lop"]}};
+  var reader = new GraphSONReader(obj);
+  var result = reader.read(obj);
+  assert.ok(result);
+  assert.ok(result.objects);
+  assert.ok(result.labels);
+  assert.strictEqual(result.objects[2], 'lop');
+  assert.ok(result.objects[0] instanceof graph.Vertex);
+  assert.ok(result.objects[1] instanceof graph.Vertex);
+  assert.strictEqual(result.objects[0].label, 'person');
+  assert.strictEqual(result.objects[1].label, 'software');
+},
+function testWriteNumber() {
+  var writer = new GraphSONWriter();
+  assert.strictEqual(writer.write(2), '2');
+},
+function testWriteBoolean() {
+  var writer = new GraphSONWriter();
+  assert.strictEqual(writer.write(true), 'true');
+

[10/46] tinkerpop git commit: TINKERPOP-1688 Add annotations to TraversalMetrics pretty print

[spmallette]

TINKERPOP-1688 Add annotations to TraversalMetrics pretty print


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

Branch: refs/heads/TINKERPOP-1489
Commit: a9f48dfe811039c357d12fac7bd7a93113750d05
Parents: b9a439a
Author: Stephen Mallette 
Authored: Thu Jun 8 12:37:34 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 13:44:27 2017 -0400

--
 .../traversal/util/DefaultTraversalMetrics.java | 47 +++-
 1 file changed, 46 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9f48dfe/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index ecf28e0..c5f290a 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -121,7 +121,7 @@ public final class DefaultTraversalMetrics implements 
TraversalMetrics, Serializ
 // Grab the values
 final Long itemCount = m.getCount(ELEMENT_COUNT_ID);
 final Long traverserCount = m.getCount(TRAVERSER_COUNT_ID);
-Double percentDur = (Double) m.getAnnotation(PERCENT_DURATION_KEY);
+final Double percentDur = (Double) 
m.getAnnotation(PERCENT_DURATION_KEY);
 
 // Build the row string
 
@@ -145,10 +145,55 @@ public final class DefaultTraversalMetrics implements 
TraversalMetrics, Serializ
 sb.append(String.format(" %8.2f", percentDur));
 }
 
+// process any annotations
+final Map annotations = m.getAnnotations();
+if (!annotations.isEmpty()) {
+// ignore the PERCENT_DURATION_KEY as that is a TinkerPop 
annotation that is displayed by default
+annotations.entrySet().stream().filter(kv -> 
!kv.getKey().equals(PERCENT_DURATION_KEY)).forEach(kv -> {
+final String prefix = "\\_";
+final String separator = "=";
+final String k = prefix + 
StringUtils.abbreviate(kv.getKey(), 30);
+final int valueIndentLen = separator.length() + k.length() 
+ indent;
+final int leftover = 110 - valueIndentLen;
+
+final String[] splitValues = 
splitOnSize(kv.getValue().toString(), leftover);
+for (int ix = 0; ix < splitValues.length; ix++) {
+// the first lines gets the annotation prefix. the 
rest are indented to the separator
+if (ix == 0) {
+sb.append(String.format("%n%s", k + separator + 
splitValues[ix]));
+} else {
+sb.append(String.format("%n%s", 
padLeft(splitValues[ix], valueIndentLen - 1)));
+}
+}
+});
+}
+
 appendMetrics(m.getNested(), sb, indent + 1);
 }
 }
 
+private static String[] splitOnSize(final String text, final int size) {
+final String[] ret = new String[(text.length() + size - 1) / size];
+
+int counter = 0;
+for (int start = 0; start < text.length(); start += size) {
+ret[counter] = text.substring(start, Math.min(text.length(), start 
+ size));
+counter++;
+}
+
+return ret;
+}
+
+private static String padLeft(final String text, final int amountToPad) {
+// not sure why this method needed to exist. stupid string format 
stuff and commons utilities wouldn't
+// work for some reason in the context this method was used above.
+String newText = text;
+for (int ix = 0; ix < amountToPad; ix++) {
+newText = " " + newText;
+}
+return newText;
+}
+
 private void computeTotals() {
 // Create temp list of ordered metrics
 final List tempMetrics = new 
ArrayList<>(this.metrics.size());

[13/46] tinkerpop git commit: fixed the 'fixed' typo in docs - CTR

[spmallette]

fixed the 'fixed' typo in docs - CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 91054319276f946149796c3b3094aa3f5d6d
Parents: 0d29fea
Author: Robert Dale 
Authored: Mon Jun 19 15:22:37 2017 -0400
Committer: Robert Dale 
Committed: Mon Jun 19 15:22:37 2017 -0400

--
 docs/src/reference/the-traversal.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/91054319/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc 
b/docs/src/reference/the-traversal.asciidoc
index f1e4145..f39fe11 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2995,7 +2995,7 @@ social.persons("marko").youngestFriendsAge()
 The following sections explain how to develop application specific DSLs for 
different <>
 using the examples above of the Social DSL as the API for the implementation.
 
-[gremlin-java-dsl]
+[[gremlin-java-dsl]]
 Gremlin-Java
 
 

[22/46] tinkerpop git commit: Fixed dev docs for expected SASL value

[spmallette]

Fixed dev docs for expected SASL value

This was changed long ago on TINKERPOP-1600 but the docs went stale. Note that 
the byte array is still supported on 3.2.x. It goes away in 3.3.0.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 1518cc420cc35939aafae790ed79eedfe3751766
Parents: 8bb9908
Author: Stephen Mallette 
Authored: Mon Jun 26 14:29:56 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 26 14:29:56 2017 -0400

--
 docs/src/dev/provider/index.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1518cc42/docs/src/dev/provider/index.asciidoc
--
diff --git a/docs/src/dev/provider/index.asciidoc 
b/docs/src/dev/provider/index.asciidoc
index 39c235b..de8be1f 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -827,7 +827,7 @@ evaluated and is committed when the script completes (or 
rolled back if an error
 [width="100%",cols="2,2,9",options="header"]
 |=
 |Key |Type |Description
-|sasl |byte[] | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server.
+|sasl |String | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server and is Base64 encoded.
 |saslMechanism |String | The SASL mechanism: `PLAIN` or `GSSAPI`. Note that it 
is up to the server implementation to use or disregard this setting (default 
implementation in Gremlin Server ignores it).
 |=
 
@@ -874,7 +874,7 @@ Gremlin Server are deployed, session state is not shared 
among them.
 |=
 |Key |Type |Description
 |saslMechanism |String | The SASL mechanism: `PLAIN` or `GSSAPI`. Note that it 
is up to the server implementation to use or disregard this setting (default 
implementation in Gremlin Server ignores it).
-|sasl |byte[] | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server.
+|sasl |String | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server and is Base64 encoded.
 |=
 
 '`eval` operation arguments'
@@ -975,7 +975,7 @@ operation is available to clear the cache of a specific 
side-effect.
 [width="100%",cols="2,2,9",options="header"]
 |=
 |Key |Type |Description
-|sasl |byte[] | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server.
+|sasl |String | *Required* The response to the server authentication 
challenge.  This value is dependent on the SASL authentication mechanism 
required by the server and is Base64 encoded.
 |=
 
 '`bytecode` operation arguments'

[02/46] tinkerpop git commit: Restore larger cutoff for total test time.

[spmallette]

Restore larger cutoff for total test time.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 67cc12f0d5c2682e40754198818a1d19d7d08fdd
Parents: bbd3ee5
Author: sjudeng 
Authored: Sat Jun 17 18:39:09 2017 -0500
Committer: sjudeng 
Committed: Sat Jun 17 18:39:09 2017 -0500

--
 .../process/traversal/TraversalInterruptionComputerTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67cc12f0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionComputerTest.java
index d3994f1..7545f18 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionComputerTest.java
@@ -95,9 +95,9 @@ public class TraversalInterruptionComputerTest extends 
AbstractGremlinProcessTes
 
 t.start();
 
-// total time for test should not exceed 1 second - this prevents the 
test from just hanging and allows
+// total time for test should not exceed 5 seconds - this prevents the 
test from just hanging and allows
 // it to finish with failure
-assertThat(startedIterating.await(1000, TimeUnit.MILLISECONDS), 
CoreMatchers.is(true));
+assertThat(startedIterating.await(5000, TimeUnit.MILLISECONDS), 
CoreMatchers.is(true));
 
 t.interrupt();
 t.join();

[23/46] tinkerpop git commit: made the Direction method protected.

[spmallette]

made the Direction method protected.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 5ac61b7af2bb19dff84e100965587bd6eae29029
Parents: 2ba8deb
Author: Marko A. Rodriguez 
Authored: Fri Jun 23 09:20:02 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:22 2017 -0600

--
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac61b7a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
index d7ebd32..8bef835 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
@@ -35,7 +35,7 @@ import java.util.Set;
  */
 public class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
 
-private Direction direction;
+protected Direction direction;
 
 public EdgeVertexStep(final Traversal.Admin traversal, final Direction 
direction) {
 super(traversal);

[12/46] tinkerpop git commit: fixed typo in docs - CTR

[spmallette]

fixed typo in docs - CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 0d29fea86377f31794fd5d2c26ccc5521c3d79e9
Parents: 8fc197e
Author: Robert Dale 
Authored: Mon Jun 19 15:20:07 2017 -0400
Committer: Robert Dale 
Committed: Mon Jun 19 15:20:07 2017 -0400

--
 docs/src/reference/the-traversal.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0d29fea8/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc 
b/docs/src/reference/the-traversal.asciidoc
index 680a5b0..f1e4145 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2995,7 +2995,7 @@ social.persons("marko").youngestFriendsAge()
 The following sections explain how to develop application specific DSLs for 
different <>
 using the examples above of the Social DSL as the API for the implementation.
 
-[[gremlin-java-dsl]
+[gremlin-java-dsl]
 Gremlin-Java
 
 

[40/46] tinkerpop git commit: Filter out __() static method

[spmallette]

Filter out __() static method


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

Branch: refs/heads/TINKERPOP-1489
Commit: af27168d889d7921f4c4cd05dda412efe180fd65
Parents: 966104e
Author: Jorge Bay Gondra 
Authored: Wed Oct 19 16:03:45 2016 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 .../javascript/GraphTraversalSourceGenerator.groovy   |  1 +
 .../gremlin-javascript/process/graph-traversal.js | 10 --
 2 files changed, 1 insertion(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af27168d/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
index a8217e2..0ae6079 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
@@ -195,6 +195,7 @@ class GraphTraversalSourceGenerator {
 __.class.getMethods().
 findAll { GraphTraversal.class.equals(it.returnType) }.
 findAll { Modifier.isStatic(it.getModifiers()) }.
+findAll { !it.name.equals("__") }.
 collect { SymbolHelper.toJs(it.name) }.
 unique().
 sort { a, b -> a <=> b }.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af27168d/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
index 663a24d..7f36e59 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
@@ -1080,16 +1080,6 @@
   };
 
   /**
-   * __() static method
-   * @param {...Object} args
-   * @returns {GraphTraversal}
-   */
-  statics.__ = function (args) {
-var g = new GraphTraversal(null, null, new Bytecode());
-return g.__.apply(g, arguments);
-  };
-
-  /**
* addE() static method
* @param {...Object} args
* @returns {GraphTraversal}

[41/46] tinkerpop git commit: Export enums and fix TraversalStrategies#applyStrategies()

[spmallette]

Export enums and fix TraversalStrategies#applyStrategies()


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

Branch: refs/heads/TINKERPOP-1489
Commit: 5d987d1f53647e7e40103c0335fc04407c61c48c
Parents: b06d197
Author: Jorge Bay Gondra 
Authored: Fri Oct 7 12:01:30 2016 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:14:02 2017 -0400

--
 .../GraphTraversalSourceGenerator.groovy|  4 +-
 .../javascript/TraversalSourceGenerator.groovy  | 52 +---
 .../driver/remote-connection.js |  2 +-
 .../main/javascript/gremlin-javascript/index.js | 11 -
 .../process/graph-traversal.js  |  4 +-
 .../gremlin-javascript/process/traversal.js | 44 -
 .../gremlin-javascript/test-exports.js  | 15 --
 .../gremlin-javascript/test-graphson.js |  2 +-
 .../gremlin-javascript/test-traversal.js| 17 ++-
 9 files changed, 87 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d987d1f/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
index 81c38dc..b569292 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
@@ -87,12 +87,12 @@ class GraphTraversalSourceGenerator {
 
   /**
* @param remoteConnection
-   * @returns {GraphTraversal}
+   * @returns {GraphTraversalSource}
*/
   GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
 var traversalStrategy = new 
t.TraversalStrategies(this._traversalStrategies);
 traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
-return new GraphTraversal(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
+return new GraphTraversalSource(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
   };
 
   /**

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d987d1f/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
index efcb826..5b07a32 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
@@ -177,11 +177,14 @@ class TraversalSourceGenerator {
 this.strategies.push(strategy);
   };
 
-  /** @param {Traversal} traversal */
-  TraversalStrategies.prototype.applyStrategies = function (traversal) {
-this.strategies.forEach(function eachStrategy(s) {
-  s.apply(traversal);
-});
+  /**
+   * @param {Traversal} traversal
+   * @param {Function} callback
+   */
+  TraversalStrategies.prototype.applyStrategies = function (traversal, 
callback) {
+eachSeries(this.strategies, function eachStrategy(s, next) {
+  s.apply(traversal, next);
+}, callback);
   };
 
   /**
@@ -195,8 +198,9 @@ class TraversalSourceGenerator {
   /**
* @abstract
* @param {Traversal} traversal
+   * @param {Function} callback
*/
-  TraversalStrategy.prototype.apply = function (traversal) {
+  TraversalStrategy.prototype.apply = function (traversal, callback) {
 
   };
 
@@ -290,24 +294,6 @@ class TraversalSourceGenerator {
 this.elementName = elementName;
   }
 
-  /**
-   * @type {{barrier, cardinality, column, direction, operator, order, pop, 
scope, t}}
-   */
-  var enums = {};\n""")
-
-for (final Class enumClass : 
CoreImports.getClassImports()
-.findAll { Enum.class.isAssignableFrom(it) }
-.sort { a, b -> a.getSimpleName() <=> b.getSimpleName() }
-.collect()) {
-moduleOutput.append("  
enums.${SymbolHelper.decapitalize(enumClass.getSimpleName())} = " +
-

[29/46] tinkerpop git commit: Merge branch 'tp31' into tp32

[spmallette]

Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: 943658531ba8a3bb8050c169ad2180f81cda96db
Parents: f1aed80 e7f5ef7
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 10:04:37 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 10:04:37 2017 -0600

--
 .../tinkerpop/gremlin/process/computer/GraphComputerTest.java  | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94365853/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index e4b40e8,e2acd5e..380887b
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@@ -73,9 -52,7 +73,8 @@@ import static org.junit.Assert.assertEq
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
 +import static org.junit.Assume.assumeNoException;
  
- 
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
@@@ -1591,7 -1472,7 +1590,7 @@@ public class GraphComputerTest extends 
  @Test
  @LoadGraphWith(MODERN)
  public void shouldSupportMultipleScopes() throws ExecutionException, 
InterruptedException {
- final ComputerResult result = graph.compute().program(new 
MultiScopeVertexProgram()).submit().get();
 -final ComputerResult result = 
graph.compute(graphComputerClass.get()).program(new 
MultiScopeVertexProgram()).submit().get();
++final ComputerResult result = 
graphProvider.getGraphComputer(graph).program(new 
MultiScopeVertexProgram()).submit().get();
  assertEquals(result.graph().traversal().V().has("name", 
"josh").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 0L);
  assertEquals(result.graph().traversal().V().has("name", 
"lop").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
  assertEquals(result.graph().traversal().V().has("name", 
"ripple").next().property(MultiScopeVertexProgram.MEMORY_KEY).value(), 1L);
@@@ -1653,968 -1535,6 +1652,965 @@@
  public GraphComputer.ResultGraph getPreferredResultGraph() {
  return GraphComputer.ResultGraph.NEW;
  }
- 
 +}
 +
 +/
 +
 +@Test
 +@LoadGraphWith(MODERN)
 +public void shouldSupportGraphFilter() throws Exception {
 +// if the graph computer does not support graph filter, then make 
sure its exception handling is correct
 +if 
(!graphProvider.getGraphComputer(graph).features().supportsGraphFilter()) {
 +try {
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("software"));
 +fail("Should throw an unsupported operation exception");
 +} catch (final UnsupportedOperationException e) {
 +
assertEquals(GraphComputer.Exceptions.graphFilterNotSupported().getMessage(), 
e.getMessage());
 +}
 +try {
 +
graphProvider.getGraphComputer(graph).edges(__.outE().limit(10));
 +fail("Should throw an unsupported operation exception");
 +} catch (final UnsupportedOperationException e) {
 +
assertEquals(GraphComputer.Exceptions.graphFilterNotSupported().getMessage(), 
e.getMessage());
 +}
 +return;
 +}
 +/// VERTEX PROGRAM
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("software")).program(new
 VertexProgramM(VertexProgramM.SOFTWARE_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("person")).program(new
 VertexProgramM(VertexProgramM.PEOPLE_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).edges(__.bothE("knows")).program(new 
VertexProgramM(VertexProgramM.KNOWS_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("person")).edges(__.bothE("knows")).program(new
 VertexProgramM(VertexProgramM.PEOPLE_KNOWS_ONLY)).submit().get();
 +
graphProvider.getGraphComputer(graph).vertices(__.hasLabel("person")).edges(__.bothE("knows").has("weight",
 P.gt(0.5f))).program(new 

[12/50] [abbrv] tinkerpop git commit: TINKERPOP-1694 Deprecated useMapperFromGraph

[spmallette]

TINKERPOP-1694 Deprecated useMapperFromGraph


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

Branch: refs/heads/TINKERPOP-1552
Commit: d49548eacc88c5a34cc4f01f6367552604ad6cf3
Parents: aa81313
Author: Stephen Mallette 
Authored: Fri Jun 23 12:26:46 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:52:12 2017 -0400

--
 CHANGELOG.asciidoc|  1 +
 docs/src/reference/gremlin-applications.asciidoc  |  5 ++---
 docs/src/upgrade/release-3.2.x-incubating.asciidoc|  9 +
 .../src/test/resources/gremlin-server.yaml|  2 +-
 gremlin-console/conf/remote-objects.yaml  |  5 -
 .../driver/ser/AbstractGraphSONMessageSerializerV1d0.java |  5 +
 .../driver/ser/AbstractGraphSONMessageSerializerV2d0.java |  5 +
 .../driver/ser/AbstractGryoMessageSerializerV1d0.java |  6 ++
 .../python/driver/gremlin-server-modern-secure-py.yaml| 10 +-
 gremlin-server/conf/gremlin-server-classic.yaml   |  8 
 gremlin-server/conf/gremlin-server-modern-py.yaml |  8 
 gremlin-server/conf/gremlin-server-modern-readonly.yaml   |  8 
 gremlin-server/conf/gremlin-server-modern.yaml|  8 
 gremlin-server/conf/gremlin-server-neo4j.yaml |  8 
 gremlin-server/conf/gremlin-server-rest-modern.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-rest-secure.yaml   |  4 ++--
 gremlin-server/conf/gremlin-server-secure.yaml|  8 
 gremlin-server/conf/gremlin-server-spark.yaml |  8 
 gremlin-server/conf/gremlin-server.yaml   |  8 
 .../gremlin/driver/remote/gremlin-server-integration.yaml |  8 
 .../gremlin/server/gremlin-server-integration.yaml|  8 
 .../gremlin/server/gremlin-server-performance.yaml|  2 +-
 22 files changed, 79 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d49548ea/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ba9f2a7..b438248 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 This release also includes changes from <>.
 
+* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server 
serializers.
 * Added annotations to the traversal metrics pretty print.
 * `EdgeVertexStep` is no longer final and can be extended by providers.
 * Deprecated `Transaction.submit(Function)`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d49548ea/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index e62ce86..0d93194 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1518,7 +1518,7 @@ consistent with standard JSON data types.  It has the 
following configuration op
 [width="100%",cols="3,10,^2",options="header"]
 |=
 |Key |Description |Default
-|useMapperFromGraph |Specifies the name of the `Graph` (from the `graphs` 
`Map` in the configuration file) from which to plugin any custom serializers 
that are tied to it. |_none_
+|ioRegistries |A list of `IoRegistry` implementations to be applied to the 
serializer. |_none_
 |=
 
 [source,yaml]
@@ -1532,7 +1532,7 @@ type names, so interpretation from non-JVM languages will 
be required.  It has t
 [width="100%",cols="3,10,^2",options="header"]
 |=
 |Key |Description |Default
-|useMapperFromGraph |Specifies the name of the `Graph` (from the `graphs` 
`Map` in the configuration file) from which to plugin any custom serializers 
that are tied to it. |_none_
+|ioRegistries |A list of `IoRegistry` implementations to be applied to the 
serializer. |_none_
 |=
 
 Gryo
@@ -1554,7 +1554,6 @@ It has the MIME type of 
`application/vnd.gremlin-v1.0+gryo` and the following co
 |custom |A list of classes with custom kryo `Serializer` implementations 
related to them in the form of `;`. |_none_
 |ioRegistries |A list of `IoRegistry` implementations to be applied to the 

[47/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Make csproj version match maven pom versions

[spmallette]

TINKERPOP-1552 Make csproj version match maven pom versions


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

Branch: refs/heads/TINKERPOP-1552
Commit: 6135a00208a55b8317085531291c9ef98e481ce2
Parents: 6457bb9
Author: Stephen Mallette 
Authored: Wed Jun 28 12:42:09 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:12 2017 -0400

--
 .../src/Gremlin.Net/Gremlin.Net.csproj  | 22 ++--
 1 file changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6135a002/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj 
b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 361ce9e..30e15a7 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -1,4 +1,22 @@
-
+
+
+
+
 
   
 netstandard1.3
@@ -7,7 +25,7 @@
   
 
   
-3.2.6-beta1
+3.2.6-SNAPSHOT
 Gremlin.Net
 Apache TinkerPop
 

[50/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 More consistent use of Gremlin.Net

[spmallette]

TINKERPOP-1552 More consistent use of Gremlin.Net


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

Branch: refs/heads/TINKERPOP-1552
Commit: 25fd472e0af744c979a681d62d4413b12e44bec7
Parents: 703e6f2
Author: Stephen Mallette 
Authored: Fri Jun 23 16:05:35 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:12 2017 -0400

--
 gremlin-dotnet/pom.xml   | 2 +-
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj| 2 +-
 gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs | 2 +-
 gremlin-dotnet/src/pom.xml   | 4 ++--
 gremlin-dotnet/test/pom.xml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/25fd472e/gremlin-dotnet/pom.xml
--
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 6cd7da3..58ac2d6 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
 3.2.6-SNAPSHOT
 
 gremlin-dotnet
-Apache TinkerPop :: Gremlin-DotNet
+Apache TinkerPop :: Gremlin.Net
 pom
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/25fd472e/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj 
b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 7ac6f8d..361ce9e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -21,7 +21,7 @@
   Gremlin.Net implements Gremlin within .NET. C# syntax has the same 
constructs as Java including “dot notation”
   for function chaining (a.b.c), round bracket function arguments 
(a(b,c))`, and support for global namespaces
   (a(b()) vs a(__.b()))`. As such, anyone familiar with Gremlin-Java will 
immediately be able to work with
-  Gremlin-DotNet. Moreover, there are a few added constructs to 
Gremlin-DotNet that make traversals a bit more succinct.
+  Gremlin.Net. Moreover, there are a few added constructs to Gremlin.Net 
that make traversals a bit more succinct.
 
   Please see the reference documentation at Apache TinkerPop for more 
information on usage.
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/25fd472e/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
index 693d331..b76f395 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
@@ -31,7 +31,7 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 /// Bytecode is simply a list of ordered instructions.
 /// Bytecode can be serialized between environments and machines by 
way of a GraphSON representation.
-/// Thus, Gremlin-DotNet can create bytecode in C# and ship it to 
Gremlin-Java for evaluation in Java.
+/// Thus, Gremlin.Net can create bytecode in C# and ship it to 
Gremlin-Java for evaluation in Java.
 /// 
 public class Bytecode
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/25fd472e/gremlin-dotnet/src/pom.xml
--
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 645921f..8f9007e 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
 3.2.6-SNAPSHOT
 
 gremlin-dotnet-source
-Apache TinkerPop :: Gremlin-DotNet - Source
+Apache TinkerPop :: Gremlin.Net - Source
 ${packaging.type}
 
 
@@ -93,7 +93,7 @@ limitations under the License.
 
 
 

[16/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Removed the dotnet generator module

[spmallette]

TINKERPOP-1552 Removed the dotnet generator module

Moved GLV generation to the gremlin-dotnet pom and gmaveplus plugin.


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

Branch: refs/heads/TINKERPOP-1552
Commit: 21843ce422aecd4bcd6b0cab9825f737f6c06f46
Parents: 1fa9a60
Author: Stephen Mallette 
Authored: Tue Jun 13 13:07:55 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:11 2017 -0400

--
 gremlin-dotnet-generator/pom.xml|  75 
 .../dotnet/AnonymousTraversalGenerator.groovy   |  98 -
 .../gremlin/dotnet/CommonContentHelper.groovy   |  49 ---
 .../gremlin/dotnet/EnumGenerator.groovy | 112 --
 .../gremlin/dotnet/GenerateGremlinDotNet.groovy |  32 --
 .../dotnet/GraphTraversalGenerator.groovy   |  90 -
 .../dotnet/GraphTraversalSourceGenerator.groovy | 142 ---
 .../gremlin/dotnet/PredicateGenerator.groovy|  64 ---
 .../gremlin/dotnet/SymbolHelper.groovy  |  89 -
 gremlin-dotnet/glv/AnonymousTraversal.template  |  45 +++
 gremlin-dotnet/glv/Enum.template|  33 ++
 gremlin-dotnet/glv/GraphTraversal.template  |  64 +++
 .../glv/GraphTraversalSource.template   |  88 
 gremlin-dotnet/glv/NamingConversions.template   |  52 +++
 gremlin-dotnet/glv/P.template   |  39 ++
 gremlin-dotnet/pom.xml  | 229 ++-
 .../Gremlin.Net/Process/Traversal/Barrier.cs|   5 +-
 .../Process/Traversal/Cardinality.cs|   9 +-
 .../src/Gremlin.Net/Process/Traversal/Column.cs |   8 +-
 .../Gremlin.Net/Process/Traversal/Direction.cs  |   9 +-
 .../Process/Traversal/GraphSONVersion.cs|  33 ++
 .../Process/Traversal/GraphTraversal.cs | 399 ++-
 .../Process/Traversal/GraphTraversalSource.cs   |  34 +-
 .../Process/Traversal/GryoVersion.cs|  33 ++
 .../Process/Traversal/NamingConversions.cs  |  67 ++--
 .../Gremlin.Net/Process/Traversal/Operator.cs   |  17 +-
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |  13 +-
 .../src/Gremlin.Net/Process/Traversal/P.cs  |   8 +-
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   |   8 +-
 .../src/Gremlin.Net/Process/Traversal/Pop.cs|   9 +-
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  |   8 +-
 .../src/Gremlin.Net/Process/Traversal/T.cs  |  10 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs |   6 +-
 gremlin-dotnet/src/pom.xml  |  17 +
 gremlin-dotnet/test/pom.xml |  16 +
 pom.xml |   1 -
 36 files changed, 967 insertions(+), 1044 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21843ce4/gremlin-dotnet-generator/pom.xml
--
diff --git a/gremlin-dotnet-generator/pom.xml b/gremlin-dotnet-generator/pom.xml
deleted file mode 100644
index a0a9ff6..000
--- a/gremlin-dotnet-generator/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.tinkerpop
-tinkerpop
-3.2.5-SNAPSHOT
-
-gremlin-dotnet-generator
-Apache TinkerPop :: Gremlin-DotNet Generator
-
-
-org.apache.tinkerpop
-gremlin-core
-${project.version}
-
-
-org.codehaus.groovy
-groovy
-${groovy.version}
-indy
-
-
-
-${basedir}/target
-${project.artifactId}-${project.version}
-
-
-org.codehaus.mojo
-exec-maven-plugin
-1.2.1
-
-
-generate-dotnet
-generate-test-resources
-
-java
-
-
-
org.apache.tinkerpop.gremlin.dotnet.GenerateGremlinDotNet
-
-
${project.parent.basedir}/gremlin-dotnet/src/Gremlin.Net
-
-
-
-
-
-
-org.codehaus.gmavenplus
-gmavenplus-plugin
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-

[39/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Minor change to dev docs as project structure changed

[spmallette]

TINKERPOP-1552 Minor change to dev docs as project structure changed


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

Branch: refs/heads/TINKERPOP-1552
Commit: a02c78b2fce3d6871c5390d8a379f1f0efedc2fe
Parents: 3c0abd0
Author: Stephen Mallette 
Authored: Wed Jun 21 09:12:17 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:12 2017 -0400

--
 docs/src/dev/developer/development-environment.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a02c78b2/docs/src/dev/developer/development-environment.asciidoc
--
diff --git a/docs/src/dev/developer/development-environment.asciidoc 
b/docs/src/dev/developer/development-environment.asciidoc
index 2e48b87..ddba0a0 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -109,7 +109,7 @@ The build optionally requires 
link:https://www.microsoft.com/net/core[.NET Core
 `gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will 
still build with Maven, but .NET projects
 will be skipped.
 
-`gremlin-dotnet` which also includes Gremlin-Csharp can be build and tested 
from the command line with:
+`gremlin-dotnet` can be build and tested from the command line with:
 
 [source,text]
 mvn clean install -Pgremlin-dotnet

[36/50] [abbrv] tinkerpop git commit: C# GLV: Generics and enum generation

[spmallette]

C# GLV: Generics and enum generation


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

Branch: refs/heads/TINKERPOP-1552
Commit: e2453a1802b3f0f91933e44d7ec5aa7b9a963c4b
Parents: 852ff1f
Author: Jorge Bay Gondra 
Authored: Wed May 31 17:19:55 2017 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:11 2017 -0400

--
 .../dotnet/AnonymousTraversalGenerator.groovy   |  53 ++-
 .../gremlin/dotnet/EnumGenerator.groovy |  60 ++-
 .../dotnet/GraphTraversalGenerator.groovy   |  40 +-
 .../dotnet/GraphTraversalSourceGenerator.groovy |  33 +-
 .../gremlin/dotnet/PredicateGenerator.groovy|   3 +-
 .../gremlin/dotnet/SymbolHelper.groovy  |  58 +++
 .../Driver/Remote/DriverRemoteConnection.cs |   4 +-
 .../Driver/Remote/DriverRemoteTraversal.cs  |   2 +-
 .../Process/Remote/IRemoteConnection.cs |   2 +-
 .../Process/Remote/RemoteStrategy.cs|   6 +-
 .../Gremlin.Net/Process/Traversal/Barrier.cs|   2 +-
 .../Process/Traversal/Cardinality.cs|   6 +-
 .../src/Gremlin.Net/Process/Traversal/Column.cs |   4 +-
 .../Process/Traversal/DefaultTraversal.cs   |  23 +-
 .../Gremlin.Net/Process/Traversal/Direction.cs  |   6 +-
 .../Process/Traversal/GraphTraversal.cs | 408 ++-
 .../Process/Traversal/GraphTraversalSource.cs   |  22 +-
 .../Gremlin.Net/Process/Traversal/ITraversal.cs |  27 +-
 .../Process/Traversal/ITraversalStrategy.cs |   4 +-
 .../Process/Traversal/NamingConversions.cs  |  86 
 .../Gremlin.Net/Process/Traversal/Operator.cs   |  22 +-
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |  14 +-
 .../src/Gremlin.Net/Process/Traversal/P.cs  |   2 +-
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   |   4 +-
 .../src/Gremlin.Net/Process/Traversal/Pop.cs|   6 +-
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  |   4 +-
 .../Strategy/AbstractTraversalStrategy.cs   |   4 +-
 .../src/Gremlin.Net/Process/Traversal/T.cs  |   8 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs | 373 -
 .../Structure/IO/GraphSON/EnumSerializer.cs |   5 +-
 .../Process/Remote/RemoteStrategyTests.cs   |   6 +-
 .../BytecodeGeneration/StrategiesTests.cs   |   6 +-
 .../DriverRemoteConnection/EnumTests.cs |   6 +-
 .../GraphTraversalSourceTests.cs|   4 +-
 .../GraphTraversalTests.cs  |  13 +-
 .../DriverRemoteConnection/SideEffectTests.cs   |   4 +-
 .../DriverRemoteConnection/StrategiesTests.cs   |   6 +-
 .../Process/Traversal/TestTraversal.cs  |   4 +-
 .../Process/Traversal/TestTraversalStrategy.cs  |   6 +-
 .../GraphSON/BytecodeGraphSONSerializerTests.cs |   4 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  |   9 +-
 41 files changed, 808 insertions(+), 551 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2453a18/gremlin-dotnet-generator/src/main/groovy/org/apache/tinkerpop/gremlin/dotnet/AnonymousTraversalGenerator.groovy
--
diff --git 
a/gremlin-dotnet-generator/src/main/groovy/org/apache/tinkerpop/gremlin/dotnet/AnonymousTraversalGenerator.groovy
 
b/gremlin-dotnet-generator/src/main/groovy/org/apache/tinkerpop/gremlin/dotnet/AnonymousTraversalGenerator.groovy
index ca5fadb..b65b2b0 100644
--- 
a/gremlin-dotnet-generator/src/main/groovy/org/apache/tinkerpop/gremlin/dotnet/AnonymousTraversalGenerator.groovy
+++ 
b/gremlin-dotnet-generator/src/main/groovy/org/apache/tinkerpop/gremlin/dotnet/AnonymousTraversalGenerator.groovy
@@ -26,43 +26,70 @@ import java.lang.reflect.Modifier
 
 class AnonymousTraversalGenerator {
 
+private static final Map METHODS_WITH_SPECIFIC_TYPES = 
new HashMap<>();
+
+static {
+String[] useE2 = ["E2", "E2"];
+METHODS_WITH_SPECIFIC_TYPES.put("constant", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("limit", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("mean", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("optional", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("range", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("select", ["IDictionary", 
"E2"] as String[]);
+METHODS_WITH_SPECIFIC_TYPES.put("sum", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("tail", useE2);
+METHODS_WITH_SPECIFIC_TYPES.put("tree", ["object"] as String[]);
+METHODS_WITH_SPECIFIC_TYPES.put("unfold", useE2);
+}
+
 public static void create(final String anonymousTraversalFile) {
 
+
 final StringBuilder csharpClass = new 

[27/50] [abbrv] tinkerpop git commit: Rename gremlin-csharp-generator to gremlin-dotnet-generator

[spmallette]

Rename gremlin-csharp-generator to gremlin-dotnet-generator


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

Branch: refs/heads/TINKERPOP-1552
Commit: 3f8d2f50122d4a04682ebe598bee28b5f37b813e
Parents: f61227b
Author: Florian Hockmann 
Authored: Tue Jun 6 17:50:55 2017 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:11 2017 -0400

--
 gremlin-csharp-generator/pom.xml|  75 --
 .../csharp/AnonymousTraversalGenerator.groovy   |  71 --
 .../gremlin/csharp/CommonContentHelper.groovy   |  49 ---
 .../gremlin/csharp/EnumGenerator.groovy |  62 -
 .../gremlin/csharp/GenerateGremlinCSharp.groovy |  32 -
 .../csharp/GraphTraversalGenerator.groovy   |  76 --
 .../csharp/GraphTraversalSourceGenerator.groovy | 139 ---
 .../gremlin/csharp/PredicateGenerator.groovy|  65 -
 .../gremlin/csharp/SymbolHelper.groovy  |  31 -
 gremlin-dotnet-generator/pom.xml|  75 ++
 .../dotnet/AnonymousTraversalGenerator.groovy   |  71 ++
 .../gremlin/dotnet/CommonContentHelper.groovy   |  49 +++
 .../gremlin/dotnet/EnumGenerator.groovy |  62 +
 .../gremlin/dotnet/GenerateGremlinDotNet.groovy |  32 +
 .../dotnet/GraphTraversalGenerator.groovy   |  76 ++
 .../dotnet/GraphTraversalSourceGenerator.groovy | 139 +++
 .../gremlin/dotnet/PredicateGenerator.groovy|  65 +
 .../gremlin/dotnet/SymbolHelper.groovy  |  31 +
 pom.xml |   2 +-
 19 files changed, 601 insertions(+), 601 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f8d2f50/gremlin-csharp-generator/pom.xml
--
diff --git a/gremlin-csharp-generator/pom.xml b/gremlin-csharp-generator/pom.xml
deleted file mode 100644
index 4e8989a..000
--- a/gremlin-csharp-generator/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.tinkerpop
-tinkerpop
-3.2.5-SNAPSHOT
-
-gremlin-csharp-generator
-Apache TinkerPop :: Gremlin-CSharp Generator
-
-
-org.apache.tinkerpop
-gremlin-core
-${project.version}
-
-
-org.codehaus.groovy
-groovy
-${groovy.version}
-indy
-
-
-
-${basedir}/target
-${project.artifactId}-${project.version}
-
-
-org.codehaus.mojo
-exec-maven-plugin
-1.2.1
-
-
-generate-csharp
-generate-test-resources
-
-java
-
-
-
org.apache.tinkerpop.gremlin.csharp.GenerateGremlinCSharp
-
-
${project.parent.basedir}/gremlin-dotnet/src/Gremlin.Net
-
-
-
-
-
-
-org.codehaus.gmavenplus
-gmavenplus-plugin
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-
-
-
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f8d2f50/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
--
diff --git 
a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
 
b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
deleted file mode 100644
index ccb22fc..000
--- 
a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The 

[19/50] [abbrv] tinkerpop git commit: Add Gremlin-CSharp and Gremlin-DotNet

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/Properties/AssemblyInfo.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/Properties/AssemblyInfo.cs 
b/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/Properties/AssemblyInfo.cs
new file mode 100644
index 000..579426b
--- /dev/null
+++ 
b/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/Properties/AssemblyInfo.cs
@@ -0,0 +1,44 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Gremlin.CSharp.IntegrationTest")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed 
to COM
+
+[assembly: Guid("232f0f2b-178e-4214-99c7-cc4dc6710f44")]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/appsettings.json
--
diff --git 
a/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/appsettings.json 
b/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/appsettings.json
new file mode 100644
index 000..38007ec
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.CSharp.IntegrationTest/appsettings.json
@@ -0,0 +1,4 @@
+{
+  "TestServerIpAddress": "localhost",
+  "TestServerPort": 45950
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/test/Gremlin.CSharp.UnitTest/GraphTraversalSourceTests.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.CSharp.UnitTest/GraphTraversalSourceTests.cs 
b/gremlin-dotnet/test/Gremlin.CSharp.UnitTest/GraphTraversalSourceTests.cs
new file mode 100644
index 000..bac2d55
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.CSharp.UnitTest/GraphTraversalSourceTests.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using Gremlin.CSharp.Structure;
+using Xunit;
+
+namespace Gremlin.CSharp.UnitTest
+{
+public class GraphTraversalSourceTests
+{
+[Fact]
+public void 
ShouldBeIndependentFromReturnedGraphTraversalModififyingBytecode()
+{
+var graph = new Graph();
+var g = graph.Traversal();
+
+g.V().Has("someKey", "someValue").Drop();
+
+Assert.Equal(0, g.Bytecode.StepInstructions.Count);
+Assert.Equal(0, g.Bytecode.SourceInstructions.Count);
+}
+
+[Fact]
+public void 
ShouldBeIndependentFromReturnedGraphTraversalSourceModififyingBytecode()
+{
+var graph = new Graph();
+var g1 = graph.Traversal();

[46/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Added basic deployment options for nuget

[spmallette]

TINKERPOP-1552 Added basic deployment options for nuget

Can't use the dotnet maven plugin on linux. it makes direct calls to nuget, 
which on linux requires mono. Used antrun plugin instead which is what was used 
with gremlin-python and works fine. Accomplished a basic push to the nuget 
staging environment. Still some bumps to sort out before this is good.


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

Branch: refs/heads/TINKERPOP-1552
Commit: 703e6f2461f176319227e2244c4cd9be2155bafe
Parents: 2274482
Author: Stephen Mallette 
Authored: Fri Jun 23 15:43:40 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:12 2017 -0400

--
 .../developer/development-environment.asciidoc  |  6 +-
 docs/src/dev/developer/release.asciidoc |  1 +
 gremlin-dotnet/pom.xml  | 10 +++
 .../src/Gremlin.Net/Gremlin.Net.csproj  | 25 --
 gremlin-dotnet/src/pom.xml  | 86 +++-
 gremlin-dotnet/test/pom.xml | 10 +++
 6 files changed, 130 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/703e6f24/docs/src/dev/developer/development-environment.asciidoc
--
diff --git a/docs/src/dev/developer/development-environment.asciidoc 
b/docs/src/dev/developer/development-environment.asciidoc
index ddba0a0..f56bcae 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -117,7 +117,11 @@ mvn clean install -Pgremlin-dotnet
 which enables the "gremlin-dotnet" Maven profile or in a more automated 
fashion simply add a `.glv` file to the `src`
 and `test` directories of the `gremlin-dotnet` module  which will signify to 
Maven that the environment is .NET-ready.
 The `.glv` file need not have any contents and is ignored by Git. A 
standard `mvn clean install` will then build
-`gremlin-dotnet` in full. 
+`gremlin-dotnet` in full.
+
+For those who will release TinkerPop, it is also necessary to install 
link:http://www.mono-project.com/[Mono]. The
+release process is known to work with 5.0.1, so it is best to probably install 
that version if possible. See release
+documentation for more information on configuration for release.
 
 [[release-environment]]
 Release Environment

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/703e6f24/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 121bbb6..48e1132 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -220,6 +220,7 @@ Release & Promote
 .. This build will likely occur from the tag for the release, so be sure to 
checkout the tag first before executing this step.
 .. `mvn clean install -DskipTests`
 .. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
+.. `mvn deploy -pl :gremlin-dotnet-source -DskipTests -Dnuget`
 . `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; 
svn up dev/xx.yy.zz`
 . `svn co --depth empty https://dist.apache.org/repos/dist/release/tinkerpop 
release; mkdir release/xx.yy.zz`
 . Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/703e6f24/gremlin-dotnet/pom.xml
--
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 3360bbc..6cd7da3 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -267,6 +267,16 @@ namingConversionsFile.newWriter().withWriter{ it << 
namingConversionsTemplate }
 
 
 
+
+
+org.apache.maven.plugins
+maven-deploy-plugin
+
+true
+
+
 
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/703e6f24/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj 
b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 0ff4537..7ac6f8d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -8,16 +8,29 @@
 
   
 3.2.6-beta1
-Gremlin-DotNet
+Gremlin.Net
 Apache 

[23/50] [abbrv] tinkerpop git commit: Add Gremlin-CSharp and Gremlin-DotNet

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs 
b/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs
new file mode 100644
index 000..e68fdee
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Collections.Generic;
+using Gremlin.Net.Process.Remote;
+using Gremlin.Net.Process.Traversal;
+using Gremlin.Net.Process.Traversal.Strategy.Decoration;
+
+namespace Gremlin.CSharp.Process
+{
+public class GraphTraversalSource
+{
+public ICollection TraversalStrategies { get; set; 
}
+public Bytecode Bytecode { get; set; }
+
+ public GraphTraversalSource()
+: this(new List(), new Bytecode())
+{
+}
+
+public GraphTraversalSource(ICollection 
traversalStrategies, Bytecode bytecode)
+{
+TraversalStrategies = traversalStrategies;
+Bytecode = bytecode;
+}
+
+public GraphTraversalSource WithBulk(params object[] args)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.Bytecode.AddSource("withBulk", args);
+return source;
+}
+
+public GraphTraversalSource WithPath(params object[] args)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.Bytecode.AddSource("withPath", args);
+return source;
+}
+
+public GraphTraversalSource WithSack(params object[] args)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.Bytecode.AddSource("withSack", args);
+return source;
+}
+
+public GraphTraversalSource WithSideEffect(params object[] args)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.Bytecode.AddSource("withSideEffect", args);
+return source;
+}
+
+public GraphTraversalSource WithStrategies(params object[] args)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.Bytecode.AddSource("withStrategies", args);
+return source;
+}
+
+public GraphTraversalSource WithoutStrategies(params object[] args)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.Bytecode.AddSource("withoutStrategies", args);
+return source;
+}
+
+public GraphTraversalSource WithBindings(object bindings)
+{
+return this;
+}
+
+public GraphTraversalSource WithRemote(IRemoteConnection 
remoteConnection)
+{
+var source = new GraphTraversalSource(new 
List(TraversalStrategies),
+new Bytecode(Bytecode));
+source.TraversalStrategies.Add(new 
RemoteStrategy(remoteConnection));
+return source;
+}
+
+public GraphTraversalSource WithComputer(string graphComputer = null, 
int? workers = null, string persist = null,
+string result = null, ITraversal vertices = null, ITraversal edges 
= null,
+Dictionary configuration = null)
+{
+return WithStrategies(new VertexProgramStrategy(graphComputer, 
workers, persist, result, vertices, edges, configuration));
+}
+
+public GraphTraversal E(params object[] args)
+{
+var traversal = new GraphTraversal(TraversalStrategies, new 
Bytecode(Bytecode));
+

[20/50] [abbrv] tinkerpop git commit: Add Gremlin-CSharp and Gremlin-DotNet

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalSerializer.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalSerializer.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalSerializer.cs
new file mode 100644
index 000..cc809aa
--- /dev/null
+++ 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalSerializer.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Collections.Generic;
+using Gremlin.Net.Process.Traversal;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+internal class TraversalSerializer : IGraphSONSerializer
+{
+public Dictionary Dictify(dynamic objectData, 
GraphSONWriter writer)
+{
+ITraversal traversal = objectData;
+var bytecode = traversal.Bytecode;
+return writer.ToDict(bytecode);
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalStrategySerializer.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalStrategySerializer.cs
 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalStrategySerializer.cs
new file mode 100644
index 000..9b70978
--- /dev/null
+++ 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraversalStrategySerializer.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Collections.Generic;
+using Gremlin.Net.Process.Traversal.Strategy;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+internal class TraversalStrategySerializer : IGraphSONSerializer
+{
+public Dictionary Dictify(dynamic objectData, 
GraphSONWriter writer)
+{
+AbstractTraversalStrategy strategy = objectData;
+return GraphSONUtil.ToTypedValue(strategy.StrategyName, 
writer.ToDict(strategy.Configuration));
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37a24719/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraverserReader.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraverserReader.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraverserReader.cs
new file mode 100644
index 000..abbb45f
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TraverserReader.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the 

[06/50] [abbrv] tinkerpop git commit: updated CHANGELOG.

[spmallette]

updated CHANGELOG.


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

Branch: refs/heads/TINKERPOP-1552
Commit: 3b8c62892b3369a2ada0314f33f0b5122a4d6e82
Parents: d67b88b
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:54:00 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:54:00 2017 -0600

--
 CHANGELOG.asciidoc | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3b8c6289/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d421cb5..5436fd9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.1.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* Fixed a `MessageScope` bug in `TinkerGraphComputer`.
+
 [[release-3-1-7]]
 TinkerPop 3.1.7 (Release Date: June 12, 2017)
 ~

[10/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-741' into tp32

[spmallette]

Merge branch 'TINKERPOP-741' into tp32

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1552
Commit: aa81313ba1e031f895c02529573bffd79a999d9c
Parents: 9436585 eba0a2c
Author: Stephen Mallette 
Authored: Wed Jun 28 13:32:11 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 13:32:11 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/the-graph.asciidoc   | 20 
 .../gremlin/structure/Transaction.java  |  4 
 .../structure/util/AbstractTransaction.java |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa81313b/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 9da8d47,bfb7aa9..ba9f2a7
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,11 -28,9 +28,12 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <>.
  
 +* Added annotations to the traversal metrics pretty print.
 +* `EdgeVertexStep` is no longer final and can be extended by providers.
+ * Deprecated `Transaction.submit(Function)`.
  * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
  * Improved GraphSON serialization performance around `VertexProperty`.
 +* Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.
  
  [[release-3-2-5]]
  TinkerPop 3.2.5 (Release Date: June 12, 2017)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa81313b/docs/src/reference/the-graph.asciidoc
--

[13/50] [abbrv] tinkerpop git commit: Remove unintended comment

[spmallette]

Remove unintended comment


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

Branch: refs/heads/TINKERPOP-1552
Commit: 1daf48b20de100e05f38202cdd1b3405fb16932a
Parents: 339e293
Author: Jorge Bay Gondra 
Authored: Fri Jun 9 10:20:55 2017 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:11 2017 -0400

--
 .../Traversal/DriverRemoteConnection/GraphTraversalTests.cs | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1daf48b2/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
index 51efa7f..e1e4338 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
@@ -98,11 +98,6 @@ namespace 
Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
 [Fact]
 public void g_V_HasXname_markoX_ValueMap_Next()
 {
-//Unable to cast object of type 
-
//'System.Collections.Generic.Dictionary`2[System.String,System.Object]' to 
type 
-
//'System.Collections.Generic.IDictionary`2[System.String,System.Collections.Generic.IList`1[System.Object]]'.
-
-
 var graph = new Graph();
 var connection = _connectionFactory.CreateRemoteConnection();
 var g = graph.Traversal().WithRemote(connection);

[04/50] [abbrv] tinkerpop git commit: EdgeVertexStep is no longer final and can be extended by providers.

[spmallette]

EdgeVertexStep is no longer final and can be extended by providers.


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

Branch: refs/heads/TINKERPOP-1552
Commit: 2ba8debdabfdfdcdce231477b3584299746e9c8c
Parents: 1518cc4
Author: Marko A. Rodriguez 
Authored: Thu Jun 22 07:15:15 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:22 2017 -0600

--
 CHANGELOG.asciidoc | 1 +
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ba8debd/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7a69469..1b46dcf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
 This release also includes changes from <>.
 
 * Added annotations to the traversal metrics pretty print.
+* `EdgeVertexStep` is no longer final and can be extended by providers.
 * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
 * Improved GraphSON serialization performance around `VertexProperty`.
 * Changed some tests in `EventStrategyProcessTest` which were enforcing some 
unintended semantics around transaction state.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ba8debd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
index 87c1561..d7ebd32 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeVertexStep.java
@@ -33,7 +33,7 @@ import java.util.Set;
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
+public class EdgeVertexStep extends FlatMapStep implements 
AutoCloseable {
 
 private Direction direction;
 

[07/50] [abbrv] tinkerpop git commit: fixed up the MultiScope test to use MODERN so that it works with Giraph and Spark. Will back tweak to tp31/.

[spmallette]

fixed up the MultiScope test to use MODERN so that it works with Giraph and 
Spark. Will back tweak to tp31/.


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

Branch: refs/heads/TINKERPOP-1552
Commit: f1aed80b056c2244ce8b23ab077e8b10ee6939d9
Parents: 5ac61b7 3b8c628
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 09:50:15 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 09:50:15 2017 -0600

--
 CHANGELOG.asciidoc  |  2 +
 .../process/computer/GraphComputerTest.java | 75 ++--
 .../process/computer/TinkerMessageBoard.java|  4 +-
 .../process/computer/TinkerMessenger.java   | 22 +++---
 4 files changed, 88 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1aed80b/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1aed80b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 5c66673,02ac5d4..e4b40e8
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@@ -24,35 -22,18 +24,32 @@@ import org.apache.commons.configuration
  import org.apache.tinkerpop.gremlin.ExceptionCoverage;
  import org.apache.tinkerpop.gremlin.LoadGraphWith;
  import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 +import 
org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
 +import 
org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder;
  import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
  import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.P;
- import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
  import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 +import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
  import org.apache.tinkerpop.gremlin.structure.Direction;
 -import org.apache.tinkerpop.gremlin.structure.Element;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
  import org.apache.tinkerpop.gremlin.structure.Graph;
 +import org.apache.tinkerpop.gremlin.structure.Property;
  import org.apache.tinkerpop.gremlin.structure.Vertex;
  import org.apache.tinkerpop.gremlin.structure.VertexProperty;
  import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
  import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 +import org.javatuples.Pair;
- import org.junit.Ignore;
  import org.junit.Test;
  
- import java.util.AbstractMap;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collections;
@@@ -70,15 -50,11 +68,14 @@@ import java.util.concurrent.Future
  
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
 +import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
- import static org.apache.tinkerpop.gremlin.structure.T.id;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
 +import static org.junit.Assume.assumeNoException;
 +
+ 
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
@@@ -1588,567 -1468,92 +1585,635 @@@ public class GraphComputerTest extends 
  public void storeState(final Configuration configuration) {
  

[34/50] [abbrv] tinkerpop git commit: Fix method reference in XML comment

[spmallette]

Fix method reference in XML comment


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

Branch: refs/heads/TINKERPOP-1552
Commit: 852ff1f699d3255c19524dff392ef634653fd7d7
Parents: 3f8d2f5
Author: Florian Hockmann 
Authored: Tue Jun 6 19:03:09 2017 +0200
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:11 2017 -0400

--
 .../src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/852ff1f6/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs
index 7e7b450..0378fe6 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs
@@ -32,7 +32,7 @@ namespace Gremlin.Net.Process.Traversal
 public interface ITraversalSideEffects : IDisposable
 {
 /// 
-/// Retrieves the keys of the side-effect that can be supplied to 
.
+/// Retrieves the keys of the side-effect that can be supplied to 
.
 /// 
 /// The keys of the side-effect.
 IReadOnlyCollection Keys();

[15/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Removed the dotnet generator module

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21843ce4/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index 0f3fbb7..5aaaef0 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -26,6 +26,9 @@ using Gremlin.Net.Structure;
 
 namespace Gremlin.Net.Process.Traversal
 {
+/// 
+/// THIS IS A GENERATED CLASS - DO NOT MODIFY THIS CLASS DIRECTLY - 
see pom.xml
+/// 
 public class GraphTraversal : DefaultTraversal
 {
 public GraphTraversal()
@@ -50,592 +53,594 @@ namespace Gremlin.Net.Process.Traversal
 }
 
 
-public GraphTraversal V(params object[] args)
+public GraphTraversal< S , Vertex > V (params object[] args)
 {
 Bytecode.AddStep("V", args);
-return Wrap(this);
+return Wrap< S , Vertex >(this);
 }
 
-public GraphTraversal AddE(params object[] args)
+public GraphTraversal< S , Edge > AddE (params object[] args)
 {
 Bytecode.AddStep("addE", args);
-return Wrap(this);
+return Wrap< S , Edge >(this);
 }
 
-public GraphTraversal AddInE(params object[] args)
+public GraphTraversal< S , Edge > AddInE (params object[] args)
 {
 Bytecode.AddStep("addInE", args);
-return Wrap(this);
+return Wrap< S , Edge >(this);
 }
 
-public GraphTraversal AddOutE(params object[] args)
+public GraphTraversal< S , Edge > AddOutE (params object[] args)
 {
 Bytecode.AddStep("addOutE", args);
-return Wrap(this);
+return Wrap< S , Edge >(this);
 }
 
-public GraphTraversal AddV(params object[] args)
+public GraphTraversal< S , Vertex > AddV (params object[] args)
 {
 Bytecode.AddStep("addV", args);
-return Wrap(this);
+return Wrap< S , Vertex >(this);
 }
 
-public GraphTraversal Aggregate(params object[] args)
+public GraphTraversal< S , E > Aggregate (params object[] args)
 {
 Bytecode.AddStep("aggregate", args);
-return Wrap(this);
+return Wrap< S , E >(this);
 }
 
-public GraphTraversal And(params object[] args)
+public GraphTraversal< S , E > And (params object[] args)
 {
 Bytecode.AddStep("and", args);
-return Wrap(this);
+return Wrap< S , E >(this);
 }
 
-public GraphTraversal As(params object[] args)
+public GraphTraversal< S , E > As (params object[] args)
 {
 Bytecode.AddStep("as", args);
-return Wrap(this);
+return Wrap< S , E >(this);
 }
 
-public GraphTraversal Barrier(params object[] args)
+public GraphTraversal< S , E > Barrier (params object[] args)
 {
 Bytecode.AddStep("barrier", args);
-return Wrap(this);
+return Wrap< S , E >(this);
 }
 
-public GraphTraversal Both(params object[] args)
+public GraphTraversal< S , Vertex > Both (params object[] args)
 {
 Bytecode.AddStep("both", args);
-return Wrap(this);
+return Wrap< S , Vertex >(this);
 }
 
-public GraphTraversal BothE(params object[] args)
+public GraphTraversal< S , Edge > BothE (params object[] args)
 {
 Bytecode.AddStep("bothE", args);
-return Wrap(this);
+return Wrap< S , Edge >(this);
 }
 
-public GraphTraversal BothV(params object[] args)
+public GraphTraversal< S , Vertex > BothV (params object[] args)
 {
 Bytecode.AddStep("bothV", args);
-return Wrap(this);
+return Wrap< S , Vertex >(this);
 }
 
-public GraphTraversal Branch(params object[] args)
+public GraphTraversal< S , E2 > Branch (params object[] args)
 {
 Bytecode.AddStep("branch", args);
-return Wrap(this);
+return Wrap< S , E2 >(this);
 }
 
-public GraphTraversal By(params object[] args)
+public GraphTraversal< S , E > By (params object[] args)
 {
 Bytecode.AddStep("by", args);
-return Wrap(this);
+return Wrap< S , E >(this);
 }
 
-

[25/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Added license to poms for dotnet

[spmallette]

TINKERPOP-1552 Added license to poms for dotnet


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

Branch: refs/heads/TINKERPOP-1552
Commit: 0cab22ede371b648985d1921cb62afd75b170be2
Parents: 37a2471
Author: Stephen Mallette 
Authored: Thu May 18 15:53:06 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 28 15:13:11 2017 -0400

--
 gremlin-csharp-generator/pom.xml | 17 -
 gremlin-dotnet/pom.xml   | 17 -
 gremlin-dotnet/src/pom.xml   | 17 -
 gremlin-dotnet/test/pom.xml  | 17 -
 4 files changed, 64 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cab22ed/gremlin-csharp-generator/pom.xml
--
diff --git a/gremlin-csharp-generator/pom.xml b/gremlin-csharp-generator/pom.xml
index f488f02..af0ae60 100644
--- a/gremlin-csharp-generator/pom.xml
+++ b/gremlin-csharp-generator/pom.xml
@@ -1,4 +1,19 @@
-
+
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cab22ed/gremlin-dotnet/pom.xml
--
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 0472324..9bdff54 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -1,4 +1,19 @@
-
+
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cab22ed/gremlin-dotnet/src/pom.xml
--
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 5fef134..2d05d7f 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -1,4 +1,19 @@
-
+
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cab22ed/gremlin-dotnet/test/pom.xml
--
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index e625d60..d91ca85 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -1,4 +1,19 @@
-
+
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>