Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 453E018DF1 for ; Thu, 3 Dec 2015 16:43:39 +0000 (UTC) Received: (qmail 74792 invoked by uid 500); 3 Dec 2015 16:43:17 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 74767 invoked by uid 500); 3 Dec 2015 16:43:17 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 74758 invoked by uid 99); 3 Dec 2015 16:43:17 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 16:43:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 9F0FD180B41 for ; Thu, 3 Dec 2015 16:43:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.227 X-Spam-Level: X-Spam-Status: No, score=0.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id wkq0R_HbidZk for ; Thu, 3 Dec 2015 16:43:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 214BC35C41 for ; Thu, 3 Dec 2015 16:42:58 +0000 (UTC) Received: (qmail 70895 invoked by uid 99); 3 Dec 2015 16:42:57 -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; Thu, 03 Dec 2015 16:42:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C162BE6820; Thu, 3 Dec 2015 16:42:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Date: Thu, 03 Dec 2015 16:43:29 -0000 Message-Id: <9fb09eb36a77441fb535b5f0aae9fcce@git.apache.org> In-Reply-To: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org> References: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP3-981' Merge remote-tracking branch 'origin/TINKERPOP3-981' Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a54b72c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a54b72c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a54b72c7 Branch: refs/heads/TINKERPOP3-982 Commit: a54b72c7885667fd315e92de80d26b5d9e0c09bd Parents: e14019b 0f4ad25 Author: Stephen Mallette Authored: Mon Nov 30 17:02:38 2015 -0500 Committer: Stephen Mallette Committed: Mon Nov 30 17:02:38 2015 -0500 ---------------------------------------------------------------------- .../src/reference/gremlin-applications.asciidoc | 19 +- .../conf/gremlin-server-rest-secure.yaml | 3 +- gremlin-server/conf/gremlin-server-secure.yaml | 3 +- .../conf/tinkergraph-credentials.properties | 20 ++ .../server/auth/SimpleAuthenticator.java | 30 ++- .../GremlinServerAuthIntegrateOldTest.java | 235 +++++++++++++++++++ .../server/GremlinServerAuthIntegrateTest.java | 4 +- .../server/GremlinServerHttpIntegrateTest.java | 49 ++++ 8 files changed, 329 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/gremlin-server/conf/gremlin-server-rest-secure.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/gremlin-server/conf/gremlin-server-secure.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java ----------------------------------------------------------------------