You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/01 17:27:11 UTC
incubator-tinkerpop git commit: Removed more references to neo4j.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master db7e19582 -> 323ba3f9f
Removed more references to neo4j.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/323ba3f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/323ba3f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/323ba3f9
Branch: refs/heads/master
Commit: 323ba3f9fda658a61cddd8216fb51bbdec74d346
Parents: db7e195
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 1 11:26:54 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 1 11:26:54 2015 -0400
----------------------------------------------------------------------
gremlin-server/conf/gremlin-server-neo4j.yaml | 59 --------------------
gremlin-server/conf/neo4j-empty.properties | 20 -------
gremlin-server/pom.xml | 12 ----
.../server/GremlinDriverIntegrateTest.java | 5 ++
4 files changed, 5 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/323ba3f9/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
deleted file mode 100644
index 0b33bdb..0000000
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ /dev/null
@@ -1,59 +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.
-
-host: localhost
-port: 8182
-threadPoolWorker: 1
-gremlinPool: 8
-scriptEvaluationTimeout: 30000
-serializedResponseTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
-graphs: {
- g: conf/neo4j-empty.properties}
-plugins:
- - tinkerpop.neo4j
-scriptEngines: {
- gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI]},
- nashorn: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI]}}
-serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0 }
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 }
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
-metrics: {
- consoleReporter: {enabled: true, interval: 180000},
- csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
- jmxReporter: {enabled: true},
- slf4jReporter: {enabled: true, interval: 180000},
- gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST},
- graphiteReporter: {enabled: false, interval: 180000}}
-threadPoolBoss: 1
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 65536
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
-writeBufferHighWaterMark: 32768
-writeBufferHighWaterMark: 65536
-ssl: {
- enabled: false}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/323ba3f9/gremlin-server/conf/neo4j-empty.properties
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/neo4j-empty.properties b/gremlin-server/conf/neo4j-empty.properties
deleted file mode 100644
index df1267b..0000000
--- a/gremlin-server/conf/neo4j-empty.properties
+++ /dev/null
@@ -1,20 +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.
-gremlin.graph=org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
-gremlin.neo4j.directory=/tmp/neo4j
-gremlin.neo4j.conf.node_auto_indexing=true
-gremlin.neo4j.conf.relationship_auto_indexing=true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/323ba3f9/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index bfe02dd..39aa72d 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -67,18 +67,6 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>neo4j-gremlin</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>junit-benchmarks</artifactId>
<version>0.7.2</version>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/323ba3f9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index a228a06..5ab7cc7 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -65,12 +65,16 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Override
public Settings overrideSettings(final Settings settings) {
final String nameOfTest = name.getMethodName();
+
+ // todo: how do we do transactional testing?
+ /** removed neo4j - how do we test transactions now??
switch (nameOfTest) {
case "shouldExecuteScriptInSessionOnTransactionalGraph":
deleteDirectory(new File("/tmp/neo4j"));
settings.graphs.put("g", "conf/neo4j-empty.properties");
break;
}
+ */
return settings;
}
@@ -333,6 +337,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
+ @org.junit.Ignore("Dropping neo4j prevents us from doing transactional tests")
public void shouldExecuteScriptInSessionOnTransactionalGraph() throws Exception {
final Cluster cluster = Cluster.build().create();
final Client client = cluster.connect(name.getMethodName());