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/backends/SchemaBackendTestCase.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index 71918e7..108a92b 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.server.backends;
@@ -35,7 +36,6 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.backends.SchemaBackend;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperationBasis;
import org.opends.server.core.DeleteOperationBasis;
@@ -744,7 +744,7 @@
String attrName = "testaddattributetypetoaltschemafile";
assertFalse(DirectoryServer.getSchema().hasAttributeType(attrName));
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-attrtype.ldif");
assertFalse(schemaFile.exists());
@@ -840,7 +840,7 @@
String attrName = "testreplaceattributetypeinaltschemafile";
assertFalse(DirectoryServer.getSchema().hasAttributeType(attrName));
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-replaceattrtype.ldif");
assertFalse(schemaFile.exists());
@@ -1714,7 +1714,7 @@
String ocName = "testaddobjectclasstoaltschemafile";
assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-oc.ldif");
assertFalse(schemaFile.exists());
@@ -2514,7 +2514,7 @@
String nameFormName = "testaddnameformtoaltschemafile";
assertFalse(DirectoryServer.getSchema().hasNameForm(nameFormName));
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-nameform.ldif");
assertFalse(schemaFile.exists());
@@ -3267,7 +3267,7 @@
String ocName = "testadddcrtoaltschemafileoc";
assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-dcr.ldif");
assertFalse(schemaFile.exists());
@@ -4324,7 +4324,7 @@
int ruleID = 999010;
assertFalse(DirectoryServer.getSchema().hasDITStructureRule(ruleID));
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-dsr.ldif");
assertFalse(schemaFile.exists());
@@ -4815,7 +4815,7 @@
"-f", path
};
- File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
+ File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
"98-schema-test-mru.ldif");
assertFalse(schemaFile.exists());
--
Gitblit v1.10.0