You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/18 17:57:59 UTC
[1/7] incubator-tinkerpop git commit: Remove plus sign from output of
describeGraph.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 3c9356edb -> 57bf98c00
Remove plus sign from output of describeGraph.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b6360968
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b6360968
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b6360968
Branch: refs/heads/master
Commit: b63609684e4b97e29f7f369d6503a6d56e1ef52e
Parents: 2e8d052
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 10:32:23 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 10:32:23 2015 -0400
----------------------------------------------------------------------
.../console/groovy/plugin/UtilitiesGremlinPluginScript.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b6360968/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
index b1e5d42..3727675 100644
--- a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
+++ b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
@@ -38,7 +38,7 @@ describeGraph = { Class<? extends org.apache.tinkerpop.gremlin.structure.Graph>
return "${lf}" +
"IMPLEMENTATION - ${c.getCanonicalName()} ${lf}" +
"TINKERPOP TEST SUITE ${lf}" +
-"- Compliant with ($optInCount of 10 suites) + ${lf}" +
+"- Compliant with ($optInCount of 10 suites) ${lf}" +
"$suitesSupported ${lf}" +
"- Opts out of $optOutCount individual tests ${lf}" +
"$testsOptedOut ${lf}" +
[2/7] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/49858109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/49858109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/49858109
Branch: refs/heads/master
Commit: 4985810988407725de93fc779d32d43087adb196
Parents: 3c9356e b636096
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 10:32:55 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 10:32:55 2015 -0400
----------------------------------------------------------------------
.../console/groovy/plugin/UtilitiesGremlinPluginScript.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/7] incubator-tinkerpop git commit: Remove groovy-sandbox from
console binary notice.
Posted by sp...@apache.org.
Remove groovy-sandbox from console binary notice.
It is no longer packaged with the console.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bb921ff5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bb921ff5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bb921ff5
Branch: refs/heads/master
Commit: bb921ff52b1cbcf8cfca4e20e7d20771575d45a3
Parents: b636096
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 11:52:21 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 11:52:21 2015 -0400
----------------------------------------------------------------------
gremlin-console/src/main/NOTICE | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb921ff5/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index 7b89f04..c9a45e7 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -212,11 +212,6 @@ Copyright (c) 2004-2007 QOS.ch
All rights reserved.
------------------------------------------------------------------------
-Groovy Sandbox
-------------------------------------------------------------------------
-Copyright (c) 2012-2014 Kohsuke Kawaguchi, CloudBees, Inc., other contributors
-
-------------------------------------------------------------------------
Xerces
------------------------------------------------------------------------
Apache Xerces Java
[6/7] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cc84b122
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cc84b122
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cc84b122
Branch: refs/heads/master
Commit: cc84b122905d082715f29d86a0e5bfcca2829317
Parents: d597a3c 97d708e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 11:53:58 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 11:53:58 2015 -0400
----------------------------------------------------------------------
gremlin-console/src/main/NOTICE | 5 -----
gremlin-server/src/main/NOTICE | 5 -----
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
[7/7] incubator-tinkerpop git commit: Added FastClasspathScanner to
NOTICE/LICENSE.
Posted by sp...@apache.org.
Added FastClasspathScanner to NOTICE/LICENSE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/57bf98c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/57bf98c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/57bf98c0
Branch: refs/heads/master
Commit: 57bf98c0027d49dc8e4cadd0c0903b1eb55e069f
Parents: cc84b12
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 11:57:36 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 11:57:36 2015 -0400
----------------------------------------------------------------------
gremlin-console/src/main/LICENSE | 1 +
gremlin-console/src/main/NOTICE | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/57bf98c0/gremlin-console/src/main/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/LICENSE b/gremlin-console/src/main/LICENSE
index 7b7a146..cfce5b8 100644
--- a/gremlin-console/src/main/LICENSE
+++ b/gremlin-console/src/main/LICENSE
@@ -286,6 +286,7 @@ MIT Licenses
The Apache TinkerPop project bundles the following components under the MIT License:
+ FastClasspathScanner (io.github.lukehutch:fast-classpath-scanner - https://github.com/lukehutch/fast-classpath-scanner)
Mockito (org.mockito:mockito-all - http://www.mockito.org)
JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j - http://www.slf4j.org)
SLF4J API Module (org.slf4j:slf4j-api - http://www.slf4j.org)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/57bf98c0/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index c9a45e7..2a2dbdb 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -206,6 +206,11 @@ Copyright (C) 2010-2015 Daniel Pocock <da...@pocock.com.au>
Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
------------------------------------------------------------------------
+FastClasspathScanner
+------------------------------------------------------------------------
+Copyright (c) 2015 Luke Hutchison
+
+------------------------------------------------------------------------
SLF4j
------------------------------------------------------------------------
Copyright (c) 2004-2007 QOS.ch
[3/7] incubator-tinkerpop git commit: Add FastClasspathScanner and
create describeSteps utility method.
Posted by sp...@apache.org.
Add FastClasspathScanner and create describeSteps utility method.
Prints a table of all steps on the classpath and the important base classes and marker interfaces they implement. TINKERPOP3-622
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d597a3c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d597a3c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d597a3c8
Branch: refs/heads/master
Commit: d597a3c87144c2de76bed8c72aceefbe237cc8fd
Parents: 4985810
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 11:50:21 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 11:50:21 2015 -0400
----------------------------------------------------------------------
gremlin-console/pom.xml | 5 ++
.../plugin/UtilitiesGremlinPluginScript.groovy | 56 ++++++++++++++++++++
2 files changed, 61 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d597a3c8/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index f2a2e9d..4ca869e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -77,6 +77,11 @@ limitations under the License.
<artifactId>gprof</artifactId>
<version>0.3.1-groovy-2.4</version>
</dependency>
+ <dependency>
+ <groupId>io.github.lukehutch</groupId>
+ <artifactId>fast-classpath-scanner</artifactId>
+ <version>1.6.0</version>
+ </dependency>
<!-- TESTING -->
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d597a3c8/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
index 3727675..3b9d268 100644
--- a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
+++ b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy
@@ -50,3 +50,59 @@ describeGraph = { Class<? extends org.apache.tinkerpop.gremlin.structure.Graph>
"honestly supply these Annotations to provide the most accurate depiction of ${lf}" +
"their support."
}
+
+describeSteps = {
+ def lf = System.getProperty("line.separator")
+ def steps = []
+ new io.github.lukehutch.fastclasspathscanner.FastClasspathScanner("org.apache.tinkerpop")
+ .matchClassesImplementing(org.apache.tinkerpop.gremlin.process.traversal.Step, { implementingClass ->
+ if (!java.lang.reflect.Modifier.isAbstract(implementingClass.modifiers))
+ steps << implementingClass
+ }).scan()
+
+ def longestNameLength = steps.collect{it.simpleName.length()}.max()
+ def header = "STEP".padRight(longestNameLength) + " | B | F | L | M | S |BYP|CON|MUT|PRO|RDB|RNG|SCO|"
+ def content = lf + header + lf
+ def lengthOfLine = header.length()
+ content = content + "-".multiply(lengthOfLine) + lf
+
+ def printXIfAssignable = { Class stepClass, Class marker ->
+ (marker.isAssignableFrom(stepClass) ? " X " : " ") + "|"
+ }
+
+ steps.sort{a,b -> a.simpleName <=> b.simpleName }.each { stepClass ->
+ def line = "${stepClass.simpleName}".padRight(longestNameLength) + " |"
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.map.MapStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.Bypassing)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.Mutating)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.Profiling)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierStep)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.Ranging)
+ line = line + printXIfAssignable(stepClass, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping)
+ line = line + lf
+ content = content + line
+ }
+
+ content = content + "-".multiply(lengthOfLine) + lf
+
+ content = content + "LEGEND${lf}" +
+ "B=" + org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchStep.simpleName + lf +
+ "F=" + org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep.simpleName + lf +
+ "L=" + org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapStep.simpleName + lf +
+ "M=" + org.apache.tinkerpop.gremlin.process.traversal.step.map.MapStep.simpleName + lf +
+ "S=" + org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectStep.simpleName + lf +
+ "BYP=" + org.apache.tinkerpop.gremlin.process.traversal.step.Bypassing.simpleName + lf +
+ "CON=" + org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep.simpleName + lf +
+ "MUT=" + org.apache.tinkerpop.gremlin.process.traversal.step.Mutating.simpleName + lf +
+ "PRO=" + org.apache.tinkerpop.gremlin.process.traversal.step.Profiling.simpleName + lf +
+ "RDB=" + org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierStep.simpleName + lf +
+ "RNG=" + org.apache.tinkerpop.gremlin.process.traversal.step.Ranging.simpleName + lf +
+ "SCO=" + org.apache.tinkerpop.gremlin.process.traversal.step.Scoping.simpleName
+
+ return content
+}
[5/7] incubator-tinkerpop git commit: Remove the groovy-sandbox from
gremlin server NOTICE.
Posted by sp...@apache.org.
Remove the groovy-sandbox from gremlin server NOTICE.
It is no longer packaged.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/97d708e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/97d708e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/97d708e6
Branch: refs/heads/master
Commit: 97d708e6ddc59aae028b221b5738e83a92b418fc
Parents: bb921ff
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 18 11:53:22 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 18 11:53:22 2015 -0400
----------------------------------------------------------------------
gremlin-server/src/main/NOTICE | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/97d708e6/gremlin-server/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/NOTICE b/gremlin-server/src/main/NOTICE
index 51c7713..cb533dd 100644
--- a/gremlin-server/src/main/NOTICE
+++ b/gremlin-server/src/main/NOTICE
@@ -198,11 +198,6 @@ Copyright (c) 2004-2007 QOS.ch
All rights reserved.
------------------------------------------------------------------------
-Groovy Sandbox
-------------------------------------------------------------------------
-Copyright (c) 2012-2014 Kohsuke Kawaguchi, CloudBees, Inc., other contributors
-
-------------------------------------------------------------------------
Netty
------------------------------------------------------------------------
Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)