From d4e41526c8ba73d82f59b683afa9029a648a1cf3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 18 Dec 2014 10:40:01 +0000
Subject: [PATCH] OPENDJ-1602 New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
index 543344e..9770a7d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
@@ -34,7 +34,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.messages.UtilityMessages;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.PersistitBackendCfg;
import org.opends.server.api.Backend;
@@ -43,7 +42,6 @@
import org.opends.server.backends.pluggable.spi.ReadOperation;
import org.opends.server.backends.pluggable.spi.ReadableStorage;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
-import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.backends.pluggable.spi.WriteOperation;
import org.opends.server.backends.pluggable.spi.WriteableStorage;
import org.opends.server.core.DefaultCompressedSchema;
@@ -64,8 +62,8 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.JebMessages.*;
-import static org.opends.messages.UtilityMessages.ERR_LDIF_SKIP;
-import static org.opends.server.core.DirectoryServer.getServerErrorResultCode;
+import static org.opends.messages.UtilityMessages.*;
+import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -373,26 +371,13 @@
databasePrefix = name;
}
- EntryContainer ec = new EntryContainer(baseDN, toSuffixName(databasePrefix),
+ EntryContainer ec = new EntryContainer(baseDN, storage.toSuffixName(databasePrefix),
backend, config, storage, this);
ec.open(txn);
return ec;
}
/**
- * Transform a database prefix string to one usable by the DB.
- *
- * @param databasePrefix
- * the database prefix
- * @return a new string when non letter or digit characters have been replaced
- * with underscore
- */
- private TreeName toSuffixName(String databasePrefix)
- {
- return TreeName.of(storage.toSuffixName(databasePrefix));
- }
-
- /**
* Registers the entry container for a base DN.
*
* @param baseDN The base DN of the entry container to close.
--
Gitblit v1.10.0