Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DF42D200B92 for ; Wed, 28 Sep 2016 19:38:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DE0C8160AB8; Wed, 28 Sep 2016 17:38:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D129A160AFB for ; Wed, 28 Sep 2016 19:38:03 +0200 (CEST) Received: (qmail 84616 invoked by uid 500); 28 Sep 2016 17:38:03 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 84042 invoked by uid 99); 28 Sep 2016 17:38:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 17:38:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7AA1E0BAB; Wed, 28 Sep 2016 17:38:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Wed, 28 Sep 2016 17:38:34 -0000 Message-Id: <66d87dca44764fb2899b45ac2459b16e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/41] tinkerpop git commit: fixed conf dir references archived-at: Wed, 28 Sep 2016 17:38:06 -0000 fixed conf dir references Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3cbd3719 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3cbd3719 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3cbd3719 Branch: refs/heads/TINKERPOP-790 Commit: 3cbd3719084e5dcbb9b470228bd6a40e6d050478 Parents: 33225c5 Author: Robert Dale Authored: Mon Sep 26 11:01:53 2016 -0400 Committer: Robert Dale Committed: Tue Sep 27 20:42:15 2016 -0400 ---------------------------------------------------------------------- docs/src/reference/gremlin-applications.asciidoc | 4 ++-- gremlin-console/src/main/bin/gremlin.sh | 4 ++-- gremlin-driver/src/main/bin/config-eval.sh | 4 ++-- gremlin-driver/src/main/bin/profile-driver.sh | 4 ++-- gremlin-server/src/main/bin/gremlin-server.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index cedd98f..7e827f1 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -775,7 +775,7 @@ Configuring ~~~~~~~~~~~ As mentioned earlier, Gremlin Server is configured though a YAML file. By default, Gremlin Server will look for a -file called `config/gremlin-server.yaml` to configure itself on startup. To override this default, supply the file +file called `conf/gremlin-server.yaml` to configure itself on startup. To override this default, supply the file to use to `bin/gremlin-server.sh` as in: [source,text] @@ -920,7 +920,7 @@ Cluster cluster = Cluster.build().credentials("stephen", "password") .enableSsl(true).create(); If connecting with Gremlin Console, which utilizes `gremlin-driver` for remote script execution, use the provided -`config/remote-secure.yaml` file when defining the remote. That file contains configuration for the username and +`conf/remote-secure.yaml` file when defining the remote. That file contains configuration for the username and password as well as enablement of SSL from the client side. Similarly, Gremlin Server can be configured for REST and security. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-console/src/main/bin/gremlin.sh ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh index 84ba8179..fe28773 100755 --- a/gremlin-console/src/main/bin/gremlin.sh +++ b/gremlin-console/src/main/bin/gremlin.sh @@ -36,11 +36,11 @@ fi case `uname` in CYGWIN*) - CP="`dirname $0`"/../config + CP="`dirname $0`"/../conf CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config + CP="`dirname $0`"/../conf CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-driver/src/main/bin/config-eval.sh ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/bin/config-eval.sh b/gremlin-driver/src/main/bin/config-eval.sh index c55ebf5..764d732 100644 --- a/gremlin-driver/src/main/bin/config-eval.sh +++ b/gremlin-driver/src/main/bin/config-eval.sh @@ -20,11 +20,11 @@ # case `uname` in CYGWIN*) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac #echo $CP http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-driver/src/main/bin/profile-driver.sh ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/bin/profile-driver.sh b/gremlin-driver/src/main/bin/profile-driver.sh index ce747e5..7b4ac1b 100644 --- a/gremlin-driver/src/main/bin/profile-driver.sh +++ b/gremlin-driver/src/main/bin/profile-driver.sh @@ -20,11 +20,11 @@ # case `uname` in CYGWIN*) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac #echo $CP http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-server/src/main/bin/gremlin-server.sh ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/bin/gremlin-server.sh b/gremlin-server/src/main/bin/gremlin-server.sh index a82f73f..fcede2b 100755 --- a/gremlin-server/src/main/bin/gremlin-server.sh +++ b/gremlin-server/src/main/bin/gremlin-server.sh @@ -20,11 +20,11 @@ # case `uname` in CYGWIN*) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac #echo $CP