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/LDAPSearchTestCase.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
index be4fcb6..11250af 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -672,7 +672,7 @@
@Test()
public void testSimpleSearchSSLTrustStore()
{
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -721,7 +721,7 @@
@Test()
public void testSimpleSearchStartTLSTrustStore()
{
- String trustStorePath = DirectoryServer.getServerRoot() + File.separator +
+ String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "client.truststore";
String[] args =
@@ -771,9 +771,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 =
@@ -826,9 +826,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 =
@@ -882,9 +882,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 =
@@ -938,9 +938,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