[03/17] incubator-tinkerpop git commit: merged master and merged conflicts from @spmallettes changes to SparkGremlinPlugin and HadoopGremlinPlugin.

[ok...@apache.org]

merged master and merged conflicts from @spmallettes changes to SparkGremlinPlugin and HadoopGremlinPlugin.


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

Branch: refs/heads/master
Commit: 2c0d327c04219de9fdf20444a100d3cb3dd1d221
Parents: 58d9240 5a9ba5f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Dec 9 13:48:49 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Dec 9 13:48:49 2015 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../src/reference/gremlin-applications.asciidoc | 29 +++++++++
 .../upgrade/release-3.1.x-incubating.asciidoc   | 24 ++++++++
 .../groovy/plugin/GiraphGremlinPlugin.java      |  1 -
 gremlin-console/conf/log4j-console.properties   | 15 +++--
 .../gremlin/groovy/engine/GremlinExecutor.java  |  1 -
 gremlin-server/conf/log4j-server.properties     | 17 ++++--
 .../server/op/AbstractEvalOpProcessor.java      | 63 +++++++++++++++-----
 .../gremlin/server/op/session/Session.java      |  1 -
 .../server/GremlinDriverIntegrateTest.java      |  4 +-
 .../groovy/plugin/HadoopGremlinPlugin.java      | 10 ----
 .../spark/groovy/plugin/SparkGremlinPlugin.java |  4 --
 12 files changed, 125 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c0d327c/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java
----------------------------------------------------------------------
diff --cc hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java
index b4f5cd2,e8ed4c2..55ba020
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java
@@@ -81,16 -78,10 +79,8 @@@ public final class HadoopGremlinPlugin 
      public void afterPluginTo(final PluginAcceptor pluginAcceptor) throws PluginInitializationException, IllegalEnvironmentException {
          pluginAcceptor.addImports(IMPORTS);
          try {
-             pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", JobClient.class.getName()));
-             pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", Job.class.getName()));
-             ///
-             pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", MapReduceGraphComputer.class.getName()));
-             ///
-             pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", HadoopGraph.class.getName()));
-             //pluginAcceptor.eval(HadoopLoader.class.getCanonicalName() + ".load()");
 -            pluginAcceptor.eval(HadoopLoader.class.getCanonicalName() + ".load()");
--
 -            pluginAcceptor.addBinding("hdfs", FileSystem.get(new Configuration()));
 -            pluginAcceptor.addBinding("local", FileSystem.getLocal(new Configuration()));
 +            pluginAcceptor.addBinding("hdfs", new FileSystemStorage(FileSystem.get(new Configuration())));
 +            pluginAcceptor.addBinding("local", new FileSystemStorage(FileSystem.getLocal(new Configuration())));
              if (null == System.getenv(Constants.HADOOP_GREMLIN_LIBS))
                  HadoopGraph.LOGGER.warn("Be sure to set the environmental variable: " + Constants.HADOOP_GREMLIN_LIBS);
              else

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c0d327c/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
----------------------------------------------------------------------
diff --cc spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
index 7711435,616676c..fcb234c
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
@@@ -41,10 -39,8 +40,9 @@@ public final class SparkGremlinPlugin e
      protected static String NAME = "tinkerpop.spark";
  
      protected static final Set<String> IMPORTS = new HashSet<String>() {{
-         add("import org.apache.log4j.*");
          add(IMPORT_SPACE + SparkGraphComputer.class.getPackage().getName() + DOT_STAR);
          add(IMPORT_SPACE + Spark.class.getPackage().getName() + DOT_STAR);
 +        add(IMPORT_SPACE + SparkContextStorage.class.getPackage().getName() + DOT_STAR);
      }};
  
      @Override
@@@ -56,9 -52,8 +54,7 @@@
      public void afterPluginTo(final PluginAcceptor pluginAcceptor) throws PluginInitializationException, IllegalEnvironmentException {
          pluginAcceptor.addImports(IMPORTS);
          try {
-             pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", SparkGraphComputer.class.getName()));
-             pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.ERROR)", MetricsSystem.class.getName()));
 -            pluginAcceptor.eval("spark = Spark");
 -            pluginAcceptor.eval(SparkLoader.class.getCanonicalName() + ".load()");
 +            pluginAcceptor.eval("spark = SparkContextStorage.open()");
          } catch (final Exception e) {
              throw new PluginInitializationException(e.getMessage(), e);
          }