From 9defd2349274d077ad120d780a6fac5f6d594c7f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 22 May 2015 15:58:46 +0000
Subject: [PATCH] OPENDJ-1631 CR-6864 Migrate server to SDK syntaxes
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
index fb92b68..bb7e11d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -35,7 +35,7 @@
import java.util.Arrays;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.AttributeSyntax;
+import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.config.ConfigConstants;
import org.forgerock.opendj.config.server.ConfigException;
@@ -69,8 +69,7 @@
new ArrayList<AttributeType>();
private final ArrayList<MatchingRule> matchingRulesToKeep =
new ArrayList<MatchingRule>();
- private final ArrayList<AttributeSyntax<?>> syntaxesToKeep =
- new ArrayList<AttributeSyntax<?>>();
+ private final ArrayList<Syntax> syntaxesToKeep = new ArrayList<>();
/**
* Constructor.
@@ -147,6 +146,7 @@
FileFilter ldifFiles = new FileFilter()
{
/** {@inheritDoc} */
+ @Override
public boolean accept(File f)
{
boolean accept = false;
@@ -202,7 +202,8 @@
// initialize the server schema.
for (String schemaFile : fileNames)
{
- SchemaConfigManager.loadSchemaFile(schema, schemaFile);
+ // no server context to pass
+ SchemaConfigManager.loadSchemaFile(null, schema, schemaFile);
}
}
@@ -221,7 +222,7 @@
{
schema.registerMatchingRule(mr, true);
}
- for (AttributeSyntax<?> syntax : syntaxesToKeep)
+ for (Syntax syntax : syntaxesToKeep)
{
schema.registerSyntax(syntax, true);
}
--
Gitblit v1.10.0