From 09cf0ade4fd10e5e1e7aa7b220e0b7a616a89cfc Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Switch imports from old config to new config
---
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index a1b76bb..a054445 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -47,11 +47,11 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Reject;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.RootDSEBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.RootDSEBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -138,7 +138,7 @@
@Override
public void openBackend() throws ConfigException, InitializationException
{
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
+ Entry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
@@ -149,7 +149,7 @@
}
userDefinedAttributes = new ArrayList<>();
- addAllUserDefinedAttrs(userDefinedAttributes, configEntry.getEntry());
+ addAllUserDefinedAttrs(userDefinedAttributes, configEntry);
// Create the set of base DNs that we will handle. In this case, it's just
@@ -946,8 +946,8 @@
ArrayList<Attribute> userAttrs = new ArrayList<>();
try
{
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
- addAllUserDefinedAttrs(userAttrs, configEntry.getEntry());
+ Entry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
+ addAllUserDefinedAttrs(userAttrs, configEntry);
}
catch (ConfigException e)
{
--
Gitblit v1.10.0