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 <[email protected]>
Authored: Wed Jun 28 13:58:54 2017 -0400
Committer: Stephen Mallette <[email protected]>
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: 30000
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: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-modern.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { 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.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
----------------------------------------------------------------------
diff --cc
gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
index 73ed526,c87f4de..4241ca6
---
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
+++
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
@@@ -40,12 -41,12 +40,12 @@@ scriptEngines:
gremlin-python: {}
}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-classic.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-classic.yaml
index 00d304f,9315ac8..7413c4f
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@@ -20,19 -20,20 +20,19 @@@ port: 818
scriptEvaluationTimeout: 30000
graphs: {
graph: conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/generate-classic.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-classic.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-modern-py.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-modern-py.yaml
index 1e24914,89b204f..430cc39
--- a/gremlin-server/conf/gremlin-server-modern-py.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-py.yaml
@@@ -42,12 -43,12 +42,12 @@@ scriptEngines:
gremlin-python: {}
}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-modern-readonly.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-modern-readonly.yaml
index 7750ad3,8c32f1f..030cd7c
--- a/gremlin-server/conf/gremlin-server-modern-readonly.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
@@@ -20,19 -20,20 +20,19 @@@ port: 818
scriptEvaluationTimeout: 30000
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-readonly.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-modern-readonly.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-modern.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-modern.yaml
index 5d0a67d,d8c6a45..50de824
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@@ -20,19 -20,20 +20,19 @@@ port: 818
scriptEvaluationTimeout: 30000
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: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-modern.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-neo4j.yaml
index d95db94,da53572..1a9cff9
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@@ -31,19 -31,20 +31,19 @@@ scriptEvaluationTimeout: 3000
channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
graphs: {
graph: conf/neo4j-empty.properties}
-plugins:
- - tinkerpop.neo4j
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/empty-sample.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.neo4j.jsr223.Neo4jGremlinPlugin:
{},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/empty-sample.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
- { className:
org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config:
{ cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-rest-modern.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-rest-modern.yaml
index a2d4327,e77241b..195149e
--- a/gremlin-server/conf/gremlin-server-rest-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-modern.yaml
@@@ -21,16 -21,17 +21,16 @@@ scriptEvaluationTimeout: 3000
channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
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: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-modern.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-rest-secure.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-rest-secure.yaml
index 5c75cf3,ab21b33..35c9b5d
--- a/gremlin-server/conf/gremlin-server-rest-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-secure.yaml
@@@ -29,17 -29,22 +29,17 @@@ scriptEvaluationTimeout: 3000
channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/empty-sample-secure.groovy],
- config: {
- compilerCustomizerProviders: {
-
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.ThreadInterruptCustomizerProvider":[],
-
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider":[10000],
-
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.CompileStaticCustomizerProvider":["org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension"]}}}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin:
{enableThreadInterrupt: true, timedInterrupt: 10000, compilation:
COMPILE_STATIC, extensions:
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/empty-sample-secure.groovy]}}}}
serializers:
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
- { className:
org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config:
{ cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-secure.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-secure.yaml
index e09b644,6ea21d0..f91b0fe
--- a/gremlin-server/conf/gremlin-server-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-secure.yaml
@@@ -29,20 -29,25 +29,20 @@@ scriptEvaluationTimeout: 3000
channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
graphs: {
graph: conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/empty-sample-secure.groovy],
- config: {
- compilerCustomizerProviders: {
-
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.ThreadInterruptCustomizerProvider":[],
-
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider":[10000],
-
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.CompileStaticCustomizerProvider":["org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension"]}}}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin:
{enableThreadInterrupt: true, timedInterrupt: 10000, compilation:
COMPILE_STATIC, extensions:
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/empty-sample-secure.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
- { className:
org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config:
{ cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server-spark.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server-spark.yaml
index 17c9638,f096d41..c1b6862
--- a/gremlin-server/conf/gremlin-server-spark.yaml
+++ b/gremlin-server/conf/gremlin-server-spark.yaml
@@@ -44,19 -44,20 +44,19 @@@ scriptEvaluationTimeout: 3000
channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
graphs: {
graph: conf/hadoop-gryo.properties}
-plugins:
- - tinkerpop.spark
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/spark.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.spark.jsr223.SparkGremlinPlugin:
{},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/spark.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
- { className:
org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config:
{ cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/conf/gremlin-server.yaml
----------------------------------------------------------------------
diff --cc gremlin-server/conf/gremlin-server.yaml
index 83a3fc7,6ffc7b5..f86fec4
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@@ -21,19 -21,20 +21,19 @@@ scriptEvaluationTimeout: 3000
channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
graphs: {
graph: conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/empty-sample.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/empty-sample.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
+ - { 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.GryoLiteMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo-lite
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
serializeResultToString: true }} #
application/vnd.gremlin-v1.0+gryo-stringd
- { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/json
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
- { className:
org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config:
{ cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --cc
gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
index a755be2,96db32f..1fcb89e
---
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
@@@ -24,19 -24,20 +24,19 @@@ graphs:
modern: conf/tinkergraph-empty.properties,
crew: conf/tinkergraph-empty.properties,
grateful: conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/generate-all.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph, custom:
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph, custom:
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
+ - { 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.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] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
metrics: {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4540cd4a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --cc
gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index dc41190,18ac22e..e6f6f8e
---
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
@@@ -20,19 -20,20 +20,19 @@@ port: 4594
scriptEvaluationTimeout: 30000
graphs: {
graph: conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [scripts/empty-sample.groovy]}}
+ plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/empty-sample.groovy]}}}}
serializers:
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: {
useMapperFromGraph: graph, custom:
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config:
{ useMapperFromGraph: graph, custom:
[groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
+ - { 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.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] }} #
application/vnd.gremlin-v1.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} #
application/vnd.gremlin-v2.0+json
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ useMapperFromGraph: graph }} #
application/json,application/vnd.gremlin-v3.0+json
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
+ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
++ - { className:
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config:
{ ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
processors:
- { className:
org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: {
sessionTimeout: 28800000 }}
metrics: {
