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/01ff414c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/01ff414c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/01ff414c

Branch: refs/heads/TINKERPOP-1612
Commit: 01ff414c7ec44a4715e1230f7434745a73561e9c
Parents: 52bd673 1f11dd3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Feb 23 08:01:03 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Feb 23 08:01:03 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +
 .../AbstractGremlinScriptEngineFactory.java     | 118 +++++++++++++++++++
 .../gremlin/jsr223/BindingsGremlinPlugin.java   |  49 ++------
 .../jsr223/DefaultBindingsCustomizer.java       |  17 +--
 .../DefaultGremlinScriptEngineManager.java      |  53 +++++----
 .../gremlin/jsr223/LazyBindingsCustomizer.java  |  18 +--
 .../AbstractImportCustomizerProvider.java       |   2 +
 .../groovy/CompilerCustomizerProvider.java      |   3 +
 .../groovy/DefaultImportCustomizerProvider.java |   4 +
 .../groovy/EmptyImportCustomizerProvider.java   |   2 +
 .../groovy/ImportCustomizerProvider.java        |   4 +
 .../groovy/NoImportCustomizerProvider.java      |   2 +
 .../GremlinGroovyScriptEngineFactory.java       |  75 ++----------
 gremlin-server/scripts/spark.groovy             |   2 +-
 .../jsr223/BindingsScriptEngineTest.java        |  67 +++++++----
 .../gremlin/jsr223/MockGremlinScriptEngine.java |  62 ++++++++++
 .../jsr223/MockGremlinScriptEngineFactory.java  |  51 ++++++++
 ...op.gremlin.jsr223.GremlinScriptEngineFactory |   1 +
 .../gremlin/jsr223/bindings-init.groovy         |  22 ++++
 .../hadoop/jsr223/HadoopGremlinPlugin.java      |  11 +-
 .../hadoop/jsr223/HadoopGremlinPluginTest.java  |  51 ++++++++
 21 files changed, 446 insertions(+), 170 deletions(-)
----------------------------------------------------------------------


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

Reply via email to