You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/13 13:31:24 UTC
[37/37] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ddf609b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ddf609b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ddf609b8
Branch: refs/heads/master
Commit: ddf609b8f5adbc29e247a41f9fa2a7609cccf72e
Parents: be3ebc1 890131e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Feb 13 07:30:12 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Feb 13 07:30:12 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 11 +
LICENSE | 23 +-
NOTICE | 18 +-
docs/src/dev/developer/contributing.asciidoc | 9 +-
docs/src/dev/developer/release.asciidoc | 50 ++-
.../src/reference/gremlin-applications.asciidoc | 103 ++++--
.../upgrade/release-3.1.x-incubating.asciidoc | 62 ++++
gremlin-console/src/assembly/distribution.xml | 8 +-
gremlin-console/src/main/LICENSE | 273 ----------------
gremlin-console/src/main/NOTICE | 76 -----
gremlin-console/src/main/static/LICENSE | 238 ++++++++++++++
gremlin-console/src/main/static/NOTICE | 62 ++++
.../src/main/static/licenses/foundation | 22 ++
.../src/main/static/licenses/jbcrypt | 17 +
.../src/main/static/licenses/jcabi-log | 27 ++
.../src/main/static/licenses/jcabi-manifests | 27 ++
gremlin-console/src/main/static/licenses/jline2 | 34 ++
gremlin-console/src/main/static/licenses/kryo | 10 +
gremlin-console/src/main/static/licenses/minlog | 10 +
.../src/main/static/licenses/normalize | 7 +
gremlin-console/src/main/static/licenses/slf4j | 21 ++
.../structure/io/graphson/GraphSONModule.java | 47 ++-
.../io/graphson/GraphSONSerializers.java | 50 +--
.../io/graphson/JavaTimeSerializers.java | 326 +++++++++++++++++++
.../io/graphson/JavaUtilSerializers.java | 86 +++++
.../GraphSONMapperEmbeddedTypeTest.java | 134 ++++++++
.../io/graphson/GraphSONMapperTest.java | 133 ++++++++
.../structure/io/gryo/GryoMapperTest.java | 1 -
.../apache/tinkerpop/gremlin/driver/Client.java | 7 +-
.../tinkerpop/gremlin/driver/Cluster.java | 24 +-
.../gremlin/driver/ConnectionPool.java | 3 +
.../apache/tinkerpop/gremlin/driver/Host.java | 23 +-
.../apache/tinkerpop/gremlin/driver/Tokens.java | 11 +-
.../groovy/engine/ConcurrentBindings.java | 42 +++
.../gremlin/groovy/engine/GremlinExecutor.java | 9 +-
.../TimedInterruptCustomizerProvider.java | 1 +
.../TimedInterruptTimeoutException.java | 34 ++
.../groovy/engine/GremlinExecutorTest.java | 87 ++++-
.../jsr223/GremlinGroovyScriptEngineTest.java | 13 +-
...linGroovyScriptEngineTimedInterruptTest.java | 7 +-
gremlin-server/src/assembly/distribution.xml | 8 +-
gremlin-server/src/main/LICENSE | 274 ----------------
gremlin-server/src/main/NOTICE | 77 -----
.../handler/HttpGremlinEndpointHandler.java | 18 +-
.../server/op/AbstractEvalOpProcessor.java | 79 +++--
gremlin-server/src/main/static/LICENSE | 242 ++++++++++++++
gremlin-server/src/main/static/NOTICE | 63 ++++
.../src/main/static/licenses/foundation | 22 ++
.../src/main/static/licenses/gmetric4j | 31 ++
gremlin-server/src/main/static/licenses/jbcrypt | 17 +
.../src/main/static/licenses/jcabi-log | 27 ++
.../src/main/static/licenses/jcabi-manifests | 27 ++
gremlin-server/src/main/static/licenses/jline2 | 34 ++
gremlin-server/src/main/static/licenses/kryo | 10 +
gremlin-server/src/main/static/licenses/minlog | 10 +
.../src/main/static/licenses/normalize | 7 +
gremlin-server/src/main/static/licenses/slf4j | 21 ++
.../AbstractGremlinServerIntegrationTest.java | 4 +
.../server/GremlinDriverIntegrateTest.java | 57 +++-
.../server/GremlinServerHttpIntegrateTest.java | 23 +-
.../server/GremlinServerIntegrateTest.java | 132 +++++++-
.../gremlin/AbstractGraphProvider.java | 18 +
.../tinkerpop/gremlin/AbstractGremlinTest.java | 4 +-
.../apache/tinkerpop/gremlin/GraphManager.java | 26 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 3 +
.../tinkerpop/gremlin/structure/io/IoTest.java | 7 +-
licenses/normalize | 7 +
.../neo4j/AbstractNeo4jGraphProvider.java | 8 +-
.../neo4j/MultiMetaNeo4jGraphProvider.java | 8 +-
.../neo4j/NoMultiNoMetaNeo4jGraphProvider.java | 8 +-
pom.xml | 1 +
71 files changed, 2459 insertions(+), 960 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ddf609b8/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ddf609b8/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ddf609b8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ddf609b8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
index fa34dd0,55ffcf8..4f43a08
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
@@@ -102,15 -107,10 +108,15 @@@ public class GraphManager
}
@Override
+ public GraphComputer getGraphComputer(final Graph graph) {
+ return innerGraphProvider.getGraphComputer(graph);
+ }
+
+ @Override
public Graph standardTestGraph(final Class<?> test, final String testMethodName, final LoadGraphWith.GraphData loadGraphWith) {
- final Graph graph = innerGraphProvider.standardTestGraph(test, testMethodName, loadGraphWith);
- openGraphs.add(graph);
- return graph;
+ // call the ManagedGraphProvider.openTestGraph() so that the created Graph/Configuration instances
+ // are tracked
+ return openTestGraph(standardGraphConfiguration(test, testMethodName, loadGraphWith));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ddf609b8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ddf609b8/pom.xml
----------------------------------------------------------------------