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/05/28 13:40:35 UTC

incubator-tinkerpop git commit: Add hadoop-gremlin/conf files to console zip distribution. TINKERPOP3-708

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 5760f16ca -> 34dfccc53


Add hadoop-gremlin/conf files to console zip distribution. TINKERPOP3-708


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

Branch: refs/heads/master
Commit: 34dfccc53ee3fd02329b24c0a48fa7195791d15e
Parents: 5760f16
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 28 07:39:38 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 28 07:39:38 2015 -0400

----------------------------------------------------------------------
 gremlin-console/src/assembly/distribution.xml | 3 ++-
 gremlin-console/src/assembly/standalone.xml   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/34dfccc5/gremlin-console/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/assembly/distribution.xml b/gremlin-console/src/assembly/distribution.xml
index 086526c..29142ce 100644
--- a/gremlin-console/src/assembly/distribution.xml
+++ b/gremlin-console/src/assembly/distribution.xml
@@ -30,7 +30,8 @@ limitations under the License.
             </includes>
         </fileSet>
         <fileSet>
-            <directory>conf</directory>
+            <directory>target/apache-${project.artifactId}-${project.version}-standalone/conf</directory>
+            <outputDirectory>conf</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>target/apache-${project.artifactId}-${project.version}-standalone/data</directory>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/34dfccc5/gremlin-console/src/assembly/standalone.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/assembly/standalone.xml b/gremlin-console/src/assembly/standalone.xml
index 65dc119..ca27a51 100644
--- a/gremlin-console/src/assembly/standalone.xml
+++ b/gremlin-console/src/assembly/standalone.xml
@@ -32,6 +32,10 @@ limitations under the License.
             <outputDirectory>/conf</outputDirectory>
         </fileSet>
         <fileSet>
+            <directory>../hadoop-gremlin/conf</directory>
+            <outputDirectory>/conf/hadoop</outputDirectory>
+        </fileSet>
+        <fileSet>
             <directory>src/main/ext</directory>
             <outputDirectory>/ext</outputDirectory>
         </fileSet>