From d42b15e420478dc45785fff6e00b863cc1f8a0f9 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 18 Sep 2008 10:14:53 +0000
Subject: [PATCH] These changes are separating the current delivery into an "Install Layout" (the binaries) and an "Instance Layout" (the user data).
---
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
index 0b5a6cb..d9afd2b 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -506,7 +506,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -567,7 +567,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -619,9 +619,9 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- String keyStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String keyStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.keystore";
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -674,9 +674,9 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- String keyStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String keyStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.keystore";
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -730,9 +730,9 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- String keyStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String keyStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.keystore";
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -786,9 +786,9 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- String keyStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String keyStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.keystore";
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
--
Gitblit v1.10.0