You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2017/10/10 17:03:01 UTC
[1/2] tinkerpop git commit: add three missing config
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 a278edd85 -> dd48dcc0f
add three missing config
1. keyCertChainFile
2. keyFile
3. keyPassword
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3cdaaea5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3cdaaea5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3cdaaea5
Branch: refs/heads/tp32
Commit: 3cdaaea5ee192b1875dd86217f864d30df287243
Parents: 7b0bd95
Author: Ranger Tsao <ca...@gmail.com>
Authored: Tue Oct 3 22:44:12 2017 +0800
Committer: Ranger Tsao <ca...@gmail.com>
Committed: Tue Oct 3 22:44:12 2017 +0800
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/driver/Settings.java | 9 +++++++++
.../org/apache/tinkerpop/gremlin/driver/SettingsTest.java | 10 ++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cdaaea5/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index 41a697c..8a2517d 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@ -169,6 +169,15 @@ final class Settings {
if (connectionPoolConf.containsKey("enableSsl"))
cpSettings.enableSsl = connectionPoolConf.getBoolean("enableSsl");
+ if (connectionPoolConf.containsKey("keyCertChainFile"))
+ cpSettings.keyCertChainFile = connectionPoolConf.getString("keyCertChainFile");
+
+ if (connectionPoolConf.containsKey("keyFile"))
+ cpSettings.keyFile = connectionPoolConf.getString("keyFile");
+
+ if (connectionPoolConf.containsKey("keyPassword"))
+ cpSettings.keyPassword = connectionPoolConf.getString("keyPassword");
+
if (connectionPoolConf.containsKey("trustCertChainFile"))
cpSettings.trustCertChainFile = connectionPoolConf.getString("trustCertChainFile");
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cdaaea5/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
index a6a2298..c373879 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import static org.junit.Assert.assertEquals;
+
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.junit.Test;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -45,6 +45,9 @@ public class SettingsTest {
conf.setProperty("serializer.className", "my.serializers.MySerializer");
conf.setProperty("serializer.config.any", "thing");
conf.setProperty("connectionPool.enableSsl", true);
+ conf.setProperty("connectionPool.keyCertChainFile", "X.509");
+ conf.setProperty("connectionPool.keyFile", "PKCS#8");
+ conf.setProperty("connectionPool.keyPassword", "password1");
conf.setProperty("connectionPool.trustCertChainFile", "pem");
conf.setProperty("connectionPool.minSize", 100);
conf.setProperty("connectionPool.maxSize", 200);
@@ -71,6 +74,9 @@ public class SettingsTest {
assertEquals("my.serializers.MySerializer", settings.serializer.className);
assertEquals("thing", settings.serializer.config.get("any"));
assertEquals(true, settings.connectionPool.enableSsl);
+ assertEquals("X.509", settings.connectionPool.keyCertChainFile);
+ assertEquals("PKCS#8", settings.connectionPool.keyFile);
+ assertEquals("password1", settings.connectionPool.keyPassword);
assertEquals("pem", settings.connectionPool.trustCertChainFile);
assertEquals(100, settings.connectionPool.minSize);
assertEquals(200, settings.connectionPool.maxSize);
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1796' into tp32
This closes #727
Posted by rd...@apache.org.
Merge branch 'TINKERPOP-1796' into tp32
This closes #727
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dd48dcc0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dd48dcc0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dd48dcc0
Branch: refs/heads/tp32
Commit: dd48dcc0f7d3230a072afa8908830892193d6c0b
Parents: a278edd 3cdaaea
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Oct 10 12:58:30 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Oct 10 12:58:30 2017 -0400
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/driver/Settings.java | 9 +++++++++
.../org/apache/tinkerpop/gremlin/driver/SettingsTest.java | 10 ++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------