From 0d97a7da226d93b8b87467efde523aa2120ceabc Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 07 Jun 2013 14:08:13 +0000
Subject: [PATCH] Fix for OPENDJ-925, OPENDJ-926, and overall schema management. Review CR-1806. Back a few years ago, when we did the SVR4 package, we split the schema into read-only (Install) and writable (Instance). With the template model in 2.6, the whole schema is under config, and we should never edit/change the one in the template. So, I've removed all code related to the 2 locations for schema, reverted some I10N messages to their previous versions, and tidy up code and tests. All unit-tests are passing. And it's also possible to change the instance.loc and run setup and have a fully functioning server :-)
---
opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index be5c860..270f459 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.server.tasks;
@@ -93,7 +94,7 @@
DirectoryServer.registerMatchingRule(matchingRule, false);
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath(true);
+ String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
String[] fileLines =
{
@@ -166,7 +167,7 @@
Thread.sleep(2);
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath(true);
+ String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
SchemaTestMatchingRule matchingRule1 =
@@ -340,7 +341,7 @@
Thread.sleep(2);
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath(true);
+ String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
File emptyFile = new File(schemaDirectory, "05-empty.ldif");
emptyFile.createNewFile();
@@ -375,7 +376,7 @@
public void testAddInvalidSchemaFile()
throws Exception
{
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath(true);
+ String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
File invalidFile = new File(schemaDirectory, "05-invalid.ldif");
BufferedWriter writer = new BufferedWriter(new FileWriter(invalidFile));
--
Gitblit v1.10.0