You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/26 18:51:45 UTC

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

Merge remote-tracking branch 'origin/tp31'


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

Branch: refs/heads/TINKERPOP-1166
Commit: 5f74281456429df9d9568426d7d86e6f60fd7107
Parents: 5dd337d 00e9b20
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 24 14:06:56 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Feb 24 14:06:56 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  3 +
 docs/src/dev/developer/contributing.asciidoc    | 13 +++
 .../src/reference/gremlin-applications.asciidoc | 22 +++++
 .../upgrade/release-3.1.x-incubating.asciidoc   | 15 +++-
 .../gremlin-archetype-server/pom.xml            | 59 ++++++++++++++
 .../META-INF/maven/archetype-metadata.xml       | 47 +++++++++++
 .../archetype-resources/README.asciidoc         | 71 +++++++++++++++++
 .../conf/log4j-test.properties                  | 21 +++++
 .../archetype-resources/conf/log4j.properties   | 21 +++++
 .../conf/tinkergraph-empty.properties           | 18 +++++
 .../main/resources/archetype-resources/pom.xml  | 79 ++++++++++++++++++
 .../scripts/generate-modern.groovy              | 33 ++++++++
 .../archetype-resources/src/main/java/App.java  | 42 ++++++++++
 .../src/main/java/Service.java                  | 70 ++++++++++++++++
 .../src/test/java/ServiceTest.java              | 84 ++++++++++++++++++++
 .../src/test/resources/gremlin-server.yaml      | 45 +++++++++++
 .../projects/standard/archetype.properties      | 21 +++++
 .../test/resources/projects/standard/goal.txt   |  1 +
 .../gremlin-archetype-tinkergraph/pom.xml       | 59 ++++++++++++++
 .../META-INF/maven/archetype-metadata.xml       | 38 +++++++++
 .../archetype-resources/README.asciidoc         | 35 ++++++++
 .../main/resources/archetype-resources/pom.xml  | 58 ++++++++++++++
 .../archetype-resources/src/main/java/App.java  | 78 ++++++++++++++++++
 .../src/test/java/AppTest.java                  | 40 ++++++++++
 .../projects/standard/archetype.properties      | 21 +++++
 .../test/resources/projects/standard/goal.txt   |  1 +
 gremlin-archetype/pom.xml                       | 70 ++++++++++++++++
 .../traversal/util/TraversalExplanation.java    |  4 +-
 .../util/TraversalExplanationTest.java          | 38 +++++++++
 .../gremlin/groovy/engine/ScriptEngines.java    |  2 +-
 .../groovy/engine/GremlinExecutorTest.java      | 10 ++-
 pom.xml                                         |  5 ++
 32 files changed, 1116 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5f742814/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 17143f6,06fe0cc..a8d21be
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -1880,3 -1880,25 +1880,25 @@@ The following shows the output for `Had
  ----
  describeGraph(HadoopGraph)
  ----
+ 
+ [[gremlin-archetypes]]
+ Gremlin Archetypes
+ ==================
+ 
+ TinkerPop has a number of link:https://maven.apache.org/guides/introduction/introduction-to-archetypes.html[Maven archetypes],
+ which provide example project templates to quickly get started with TinkerPop. The available archetypes are as follows:
+ 
+ * `gremlin-archetype-server` - An example project that demonstrates the basic structure of a
+ <<gremlin-server,Gremlin Server>> project, how to connect with the Gremlin Driver, and how to embed Gremlin Server in
+ a testing framework.
+ * `gremlin-archetype-tinkergraph` - A basic example of how to structure a TinkerPop project with Maven.
+ 
+ You can use Maven to generate these example projects with a command like:
+ 
+ [source,shell]
+ $ mvn archetype:generate -DarchetypeGroupId=org.apache.tinkerpop -DarchetypeArtifactId=gremlin-archetype-server
+       -DarchetypeVersion=x.y.z -DgroupId=com.my -DartifactId=app -Dversion=0.1 -DinteractiveMode=false
+ 
+ This command will generate a new Maven project in a directory called "app" with a `pom.xml` specifying a `groupId` of
+ `com.my`. Please see the `README.asciidoc` in the root of each generated project for information on how to build and
 -execute it.
++execute it.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5f742814/pom.xml
----------------------------------------------------------------------