[4/4] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

[sp...@apache.org]

Merge remote-tracking branch 'origin/tp31'

Conflicts:
	docs/src/reference/gremlin-applications.asciidoc


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

Branch: refs/heads/master
Commit: 7348e4722096f8130b147b2bcdbafb0c4ff0355a
Parents: 66a6ef4 704b023
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 2 10:15:53 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 2 10:15:53 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 bin/init-tp-spark.sh                            | 75 --------------------
 .../src/reference/gremlin-applications.asciidoc |  3 +-
 .../reference/implementations-hadoop.asciidoc   |  2 +-
 .../upgrade/release-3.1.x-incubating.asciidoc   | 25 +++++++
 gremlin-console/src/assembly/distribution.xml   |  9 +++
 gremlin-console/src/assembly/standalone.xml     |  5 ++
 .../groovy/plugin/DriverRemoteAcceptor.java     | 32 ++++++---
 .../groovy/plugin/DriverRemoteAcceptorTest.java | 23 ++++++
 spark-gremlin/src/main/bin/init-tp-spark.sh     | 75 ++++++++++++++++++++
 10 files changed, 165 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7348e472/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7348e472/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7348e472/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7348e472/spark-gremlin/src/main/bin/init-tp-spark.sh
----------------------------------------------------------------------
diff --cc spark-gremlin/src/main/bin/init-tp-spark.sh
index 0000000,51eca6b..670a2a9
mode 000000,100755..100755
--- a/spark-gremlin/src/main/bin/init-tp-spark.sh
+++ b/spark-gremlin/src/main/bin/init-tp-spark.sh
@@@ -1,0 -1,75 +1,75 @@@
+ #!/bin/bash
+ #
+ #
+ # 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.
+ #
+ 
+ if [ -z $2 ]; then
+   echo
+   echo "Usage:"
+   echo
+   echo "  $0 SPARK_HOME SPARK_NODE_1 SPARK_NODE_2 ..."
+   echo
+   echo "Example:"
+   echo
 -  echo "  $0 /usr/local/spark-1.5.2-bin-hadoop2.6 spark@master spark@slave1 spark@slave2 spark@slave3"
++  echo "  $0 /usr/local/spark-1.6.1-bin-hadoop2.6 spark@master spark@slave1 spark@slave2 spark@slave3"
+   echo
+   exit 1
+ fi
+ 
+ if [ -z ${HADOOP_GREMLIN_LIBS} ]; then
+   echo
+   echo "HADOOP_GREMLIN_LIBS is not set; thus no jars to deploy."
+   echo
+   exit 1
+ fi
+ 
+ LOCAL_SPARK_GREMLIN_LIBS=$(tr ':' $'\n' <<< ${HADOOP_GREMLIN_LIBS} | grep 'spark-gremlin')
+ LIB_DIRNAME="hadoop-gremlin-libs"
+ TMP_DIR=/tmp/init-tp-spark
+ TMP_DIR2=${TMP_DIR}/${LIB_DIRNAME}
+ 
+ mkdir -p ${TMP_DIR2}
+ cp -R ${LOCAL_SPARK_GREMLIN_LIBS}/*.jar ${TMP_DIR2}
+ 
+ DIR=`dirname $0`
+ 
+ SPARK_HOME=${1}
+ SPARK_LIBS=${SPARK_HOME}/lib
+ SPARK_NODES=${@:2}
+ 
+ cat > ${TMP_DIR}/init-conf.sh <<EOF
+ #!/bin/bash
+ 
+ if [ ! -f "${SPARK_HOME}/conf/spark-env.sh" ]; then
+   cp ${SPARK_HOME}/conf/spark-env.sh.template ${SPARK_HOME}/conf/spark-env.sh
+ fi
+ grep -F GREMLIN_LIBS ${SPARK_HOME}/conf/spark-env.sh > /dev/null || {
+   echo >> ${SPARK_HOME}/conf/spark-env.sh
+   echo "GREMLIN_LIBS=\\\$(find ${SPARK_LIBS}/${LIB_DIRNAME} -name '*.jar' | paste -sd ':')" >> ${SPARK_HOME}/conf/spark-env.sh
+   echo "export SPARK_CLASSPATH=\\\${SPARK_CLASSPATH}:\\\${GREMLIN_LIBS}" >> ${SPARK_HOME}/conf/spark-env.sh
+ }
+ EOF
+ 
+ for node in ${SPARK_NODES}
+ do
+   rsync -az --delete ${TMP_DIR2} ${node}:${SPARK_LIBS}
+   ssh ${node} "bash -s" -- < ${TMP_DIR}/init-conf.sh
+ done
+ 
+ rm -rf ${TMP_DIR}