From 383ff591182ce9730728c938d9b86e95f86ad676 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:24 +0000
Subject: [PATCH] OPENDJ-3089 Update SchemaLoader and RemoteSchemaLoader to use SchemaHandler and SDK Schema
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
index 91f773b..e8ddc02 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -31,6 +31,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
@@ -42,7 +43,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.OpenDsException;
-import org.opends.server.types.Schema;
/**
* An abstract class providing some common interface for the class that read
@@ -251,18 +251,20 @@
/**
* Reads the schema from the files.
+ *
+ * @return the schema
* @throws ConfigException if an error occurs reading the schema.
* @throws InitializationException if an error occurs initializing
* configuration to read schema.
* @throws DirectoryException if there is an error registering the minimal
* objectclasses.
*/
- protected void readSchema() throws ConfigException, InitializationException,
+ protected Schema readSchema() throws ConfigException, InitializationException,
DirectoryException
{
SchemaLoader loader = new SchemaLoader();
- loader.readSchema();
- schema = loader.getSchema();
+ schema = loader.readSchema();
+ return schema;
}
/**
--
Gitblit v1.10.0