You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/12/27 22:47:36 UTC

geode git commit: GEODE-419: Added test to test that for ssl it fails over to javax properties.

Repository: geode
Updated Branches:
  refs/heads/develop adaacaa98 -> bbbbd385d


GEODE-419: Added test to test that for ssl it fails over to javax properties.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bbbbd385
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bbbbd385
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bbbbd385

Branch: refs/heads/develop
Commit: bbbbd385d63b604ffb549ebb206f5c68d192ab4f
Parents: adaacaa
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Dec 27 14:47:18 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Dec 27 14:47:18 2016 -0800

----------------------------------------------------------------------
 .../geode/internal/net/SSLConfigurationFactoryJUnitTest.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/bbbbd385/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index e95cc7a..0304b16 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -212,7 +212,13 @@ public class SSLConfigurationFactoryJUnitTest {
     Properties properties = new Properties();
     properties.setProperty(CLUSTER_SSL_ENABLED, "true");
     System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE, "keystore");
-
+    System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_TYPE, "JKS");
+    System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_PASSWORD, "keystorePassword");
+    System.setProperty(SSLConfigurationFactory.JAVAX_TRUSTSTORE, "truststore");
+    System.setProperty(SSLConfigurationFactory.JAVAX_TRUSTSTORE_PASSWORD, "truststorePassword");
+    System.setProperty(SSLConfigurationFactory.JAVAX_TRUSTSTORE_TYPE, "JKS");
+    DistributionConfigImpl distributionConfig = new DistributionConfigImpl(properties);
+    SSLConfigurationFactory.setDistributionConfig(distributionConfig);
     SSLConfig sslConfig =
         SSLConfigurationFactory.getSSLConfigForComponent(SecurableCommunicationChannel.CLUSTER);