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 2017/04/10 20:23:20 UTC
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1010'
Merge branch 'TINKERPOP-1010'
Conflicts:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/accc0580
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/accc0580
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/accc0580
Branch: refs/heads/master
Commit: accc0580129b003690002310b2684333ed993a8d
Parents: 960fdc1 cb81861
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 10 16:22:52 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 10 16:22:52 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 +
docs/src/upgrade/release-3.3.x.asciidoc | 22 +-
.../gremlin/server/AbstractChannelizer.java | 5 -
.../server/auth/AllowAllAuthenticator.java | 9 +-
.../gremlin/server/auth/Authenticator.java | 20 +-
.../gremlin/server/auth/Krb5Authenticator.java | 9 -
.../server/auth/SimpleAuthenticator.java | 28 +--
.../gremlin/server/channel/HttpChannelizer.java | 1 -
.../gremlin/server/handler/IteratorHandler.java | 124 ----------
.../handler/NioGremlinResponseEncoder.java | 93 -------
.../server/handler/OpSelectorHandler.java | 15 --
.../handler/WsGremlinResponseEncoder.java | 105 --------
.../server/op/AbstractEvalOpProcessor.java | 25 --
.../gremlin/server/op/session/Session.java | 40 +--
.../server/op/session/SessionOpProcessor.java | 2 +-
.../GremlinServerAuthOldIntegrateTest.java | 243 -------------------
.../server/GremlinServerHttpIntegrateTest.java | 25 +-
.../server/auth/SimpleAuthenticatorTest.java | 14 +-
18 files changed, 46 insertions(+), 740 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/accc0580/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/accc0580/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index dd4eab8,b184688..cf14349
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@@ -29,8 -29,6 +29,7 @@@ import org.apache.tinkerpop.gremlin.dri
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
+import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
- import org.apache.tinkerpop.gremlin.server.handler.IteratorHandler;
import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler;
import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler;
import io.netty.channel.ChannelInitializer;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/accc0580/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/accc0580/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 1c0c289,2851cd3..a45751c
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@@ -126,34 -118,6 +122,34 @@@ public class GremlinServerHttpIntegrate
private void configureForAuthentication(final Settings settings) {
final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- authSettings.className = SimpleAuthenticator.class.getName();
++ authSettings.authenticator = SimpleAuthenticator.class.getName();
+
+ // use a credentials graph with one user in it: stephen/password
+ final Map<String,Object> authConfig = new HashMap<>();
+ authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
+
+ authSettings.config = authConfig;
+ settings.authentication = authSettings;
+ }
+
+ private void configureForAuthenticationWithHandlerClass(final Settings settings) {
+ final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- authSettings.className = SimpleAuthenticator.class.getName();
++ authSettings.authenticator = SimpleAuthenticator.class.getName();
+
+ //Add basic auth handler to make sure the reflection code path works.
+ authSettings.authenticationHandler = HttpBasicAuthenticationHandler.class.getName();
+
+ // use a credentials graph with one user in it: stephen/password
+ final Map<String,Object> authConfig = new HashMap<>();
+ authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
+
+ authSettings.config = authConfig;
+ settings.authentication = authSettings;
+ }
+
+ @Deprecated
+ private void configureForAuthenticationOld(final Settings settings) {
+ final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
authSettings.className = SimpleAuthenticator.class.getName();
// use a credentials graph with one user in it: stephen/password