You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by da...@apache.org on 2017/02/15 18:24:35 UTC

[19/40] tinkerpop git commit: CTR: minor fixes in the Docs pre-processor's plugin installation procedure.

CTR: minor fixes in the Docs pre-processor's plugin installation procedure.


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

Branch: refs/heads/TINKERPOP-1599
Commit: f6805997724bb058ae7487bfa032bdf8b0c57731
Parents: dff6893
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Feb 3 18:27:53 2017 +0100
Committer: Jason Plurad <pl...@apache.org>
Committed: Mon Feb 6 19:15:55 2017 +0000

----------------------------------------------------------------------
 docs/preprocessor/install-plugins.groovy | 2 +-
 docs/preprocessor/install-plugins.sh     | 2 +-
 docs/preprocessor/preprocess-file.sh     | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6805997/docs/preprocessor/install-plugins.groovy
----------------------------------------------------------------------
diff --git a/docs/preprocessor/install-plugins.groovy b/docs/preprocessor/install-plugins.groovy
index 1935072..b0a1b30 100644
--- a/docs/preprocessor/install-plugins.groovy
+++ b/docs/preprocessor/install-plugins.groovy
@@ -20,7 +20,7 @@
 /**
  * @author Daniel Kuppitz (http://gremlin.guru)
  */
-import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact
+import org.apache.tinkerpop.gremlin.groovy.util.Artifact
 import org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber
 
 installPlugin = { def artifact ->

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6805997/docs/preprocessor/install-plugins.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/install-plugins.sh b/docs/preprocessor/install-plugins.sh
index d37489e..418fdfe 100755
--- a/docs/preprocessor/install-plugins.sh
+++ b/docs/preprocessor/install-plugins.sh
@@ -39,7 +39,7 @@ while [ ${i} -lt ${pluginsCount} ]; do
   for part in $(tr '-' '\n' <<< ${pluginName}); do
     className="${className}$(tr '[:lower:]' '[:upper:]' <<< ${part:0:1})${part:1}"
   done
-  pluginClassFile=$(find . -name "${className}Plugin.java")
+  pluginClassFile=$(find . -name "${className}Plugin.java" | grep plugin)
   pluginClass=`sed -e 's@.*src/main/java/@@' -e 's/\.java$//' <<< ${pluginClassFile} | tr '/' '.'`
   installed=`grep -c "${pluginClass}" ${CONSOLE_HOME}/ext/plugins.txt`
   if [ ${installed} -eq 0 ]; then

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6805997/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index c7b4f5e..421d1e6 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -120,10 +120,7 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
       mv ext/spark-gremlin .ext/
       mv ext/giraph-gremlin .ext/
       mv ext/hadoop-gremlin .ext/
-      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'Neo4jGremlinPlugin' > .ext/plugins.txt
-      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'SparkGremlinPlugin' > .ext/plugins.txt
-      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'GiraphGremlinPlugin' > .ext/plugins.txt
-      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'HadoopGremlinPlugin' > .ext/plugins.txt
+      cat ext/plugins.txt | tee .ext/plugins.all | grep -v 'Neo4jGremlinPlugin\|SparkGremlinPlugin\|GiraphGremlinPlugin\|HadoopGremlinPlugin' > .ext/plugins.txt
       ;;
   esac