Repository: geode-native Updated Branches: refs/heads/develop f0410fbe1 -> 0c5c809bf
GEODE-2423: Remove unused keystore files and rename to geode.keystore This closes #2. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/0c5c809b Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/0c5c809b Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/0c5c809b Branch: refs/heads/develop Commit: 0c5c809bf82e250b395a0a2faff0f5b38d0a76f2 Parents: f0410fb Author: Mike Martell <[email protected]> Authored: Fri Feb 10 08:05:05 2017 -0800 Committer: Jacob Barrett <[email protected]> Committed: Mon Feb 13 14:11:53 2017 -0800 ---------------------------------------------------------------------- .../integration-test/keystore/gemfire1.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire10.keystore | Bin 1546 -> 0 bytes .../integration-test/keystore/gemfire11.keystore | Bin 1546 -> 0 bytes .../integration-test/keystore/gemfire2.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire3.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire4.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire5.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire6.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire7.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire8.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/gemfire9.keystore | Bin 1536 -> 0 bytes .../integration-test/keystore/geode1.keystore | Bin 0 -> 1536 bytes .../integration-test/keystore/geode11.keystore | Bin 0 -> 1546 bytes .../integration-test/keystore/geode2.keystore | Bin 0 -> 1536 bytes .../integration-test/testThinClientSecurityDH.cpp | 4 ++-- .../testThinClientSecurityDH_MU.cpp | 4 ++-- 16 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire1.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire1.keystore b/src/cppcache/integration-test/keystore/gemfire1.keystore deleted file mode 100644 index 15270bb..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire1.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire10.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire10.keystore b/src/cppcache/integration-test/keystore/gemfire10.keystore deleted file mode 100644 index bb6f827..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire10.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire11.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire11.keystore b/src/cppcache/integration-test/keystore/gemfire11.keystore deleted file mode 100644 index 6839c74..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire11.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire2.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire2.keystore b/src/cppcache/integration-test/keystore/gemfire2.keystore deleted file mode 100644 index fcb7ab8..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire2.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire3.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire3.keystore b/src/cppcache/integration-test/keystore/gemfire3.keystore deleted file mode 100644 index 19afc4b..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire3.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire4.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire4.keystore b/src/cppcache/integration-test/keystore/gemfire4.keystore deleted file mode 100644 index c65916a..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire4.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire5.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire5.keystore b/src/cppcache/integration-test/keystore/gemfire5.keystore deleted file mode 100644 index d738cca..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire5.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire6.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire6.keystore b/src/cppcache/integration-test/keystore/gemfire6.keystore deleted file mode 100644 index 1fea2d3..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire6.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire7.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire7.keystore b/src/cppcache/integration-test/keystore/gemfire7.keystore deleted file mode 100644 index 7a3187c..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire7.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire8.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire8.keystore b/src/cppcache/integration-test/keystore/gemfire8.keystore deleted file mode 100644 index a3bb886..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire8.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/gemfire9.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/gemfire9.keystore b/src/cppcache/integration-test/keystore/gemfire9.keystore deleted file mode 100644 index 674b4e6..0000000 Binary files a/src/cppcache/integration-test/keystore/gemfire9.keystore and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/geode1.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/geode1.keystore b/src/cppcache/integration-test/keystore/geode1.keystore new file mode 100644 index 0000000..15270bb Binary files /dev/null and b/src/cppcache/integration-test/keystore/geode1.keystore differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/geode11.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/geode11.keystore b/src/cppcache/integration-test/keystore/geode11.keystore new file mode 100644 index 0000000..6839c74 Binary files /dev/null and b/src/cppcache/integration-test/keystore/geode11.keystore differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/keystore/geode2.keystore ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/keystore/geode2.keystore b/src/cppcache/integration-test/keystore/geode2.keystore new file mode 100644 index 0000000..fcb7ab8 Binary files /dev/null and b/src/cppcache/integration-test/keystore/geode2.keystore differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/testThinClientSecurityDH.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientSecurityDH.cpp b/src/cppcache/integration-test/testThinClientSecurityDH.cpp index e2b3d40..501eed9 100644 --- a/src/cppcache/integration-test/testThinClientSecurityDH.cpp +++ b/src/cppcache/integration-test/testThinClientSecurityDH.cpp @@ -224,14 +224,14 @@ void initSecurityServer(int instance) { std::string testsrc = ACE_OS::getenv("TESTSRC"); if (instance == 1) { - testsrc += "/keystore/gemfire1.keystore"; + testsrc += "/keystore/geode1.keystore"; cmdServerAuthenticator += " security-server-kspath="; cmdServerAuthenticator += testsrc; cmdServerAuthenticator += " security-server-ksalias=geode1 " "security-server-kspasswd=geode"; } else if (instance == 2) { - testsrc += "/keystore/gemfire2.keystore"; + testsrc += "/keystore/geode2.keystore"; cmdServerAuthenticator += " security-server-kspath="; cmdServerAuthenticator += testsrc; cmdServerAuthenticator += http://git-wip-us.apache.org/repos/asf/geode-native/blob/0c5c809b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp index 384885d..a9dd2e6 100644 --- a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp +++ b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp @@ -256,14 +256,14 @@ void initSecurityServer(int instance) { std::string testsrc = ACE_OS::getenv("TESTSRC"); if (instance == 1) { - testsrc += "/keystore/gemfire1.keystore"; + testsrc += "/keystore/geode1.keystore"; cmdServerAuthenticator += " security-server-kspath="; cmdServerAuthenticator += testsrc; cmdServerAuthenticator += " security-server-ksalias=geode1 " "security-server-kspasswd=geode"; } else if (instance == 2) { - testsrc += "/keystore/gemfire2.keystore"; + testsrc += "/keystore/geode2.keystore"; cmdServerAuthenticator += " security-server-kspath="; cmdServerAuthenticator += testsrc; cmdServerAuthenticator +=
