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/src/server/org/opends/server/util/LDIFWriter.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/LDIFWriter.java b/opends/src/server/org/opends/server/util/LDIFWriter.java
index 3124669..4517388 100644
--- a/opends/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opends/src/server/org/opends/server/util/LDIFWriter.java
@@ -23,12 +23,14 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.server.util;
import java.io.BufferedWriter;
+import java.io.Closeable;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -36,11 +38,9 @@
import java.util.Collection;
import org.opends.messages.Message;
-import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.tools.makeldif.TemplateEntry;
import org.opends.server.types.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.Validator.*;
@@ -54,13 +54,8 @@
mayInstantiate=true,
mayExtend=false,
mayInvoke=true)
-public final class LDIFWriter
+public final class LDIFWriter implements Closeable
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
-
// FIXME -- Add support for generating a hash when writing the data.
// FIXME -- Add support for signing the hash that is generated.
@@ -263,7 +258,8 @@
* to LDIF.
*
* @throws LDIFException If a problem occurs while trying to determine
- * whether to include the temlate entry in the export.
+ * whether to include the template entry in the
+ * export.
*/
public boolean writeTemplateEntry(TemplateEntry templateEntry)
throws IOException, LDIFException
--
Gitblit v1.10.0