From 270c01b95c4b0208f65d9a3a2d3e9ac50b06a76b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 06 Oct 2016 09:12:10 +0000
Subject: [PATCH] OPENDJ-2860: support JSON syntaxes and matching rules in the server
---
opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
index 354cf36..378d73f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
@@ -15,6 +15,7 @@
*/
package org.opends.server.schema;
+import static org.forgerock.opendj.rest2ldap.schema.JsonSchema.addJsonSyntaxesAndMatchingRulesToSchema;
import static org.opends.server.util.SchemaUtils.is02ConfigLdif;
import static java.util.Collections.emptyList;
@@ -209,10 +210,10 @@
// Start from the core schema
final SchemaBuilder schemaBuilder = new SchemaBuilder(Schema.getCoreSchema());
- loadSchemaFromProviders(serverContext.getRootConfig(), schemaBuilder);
-
+ // Load core syntaxes and matching rules first then let providers adjust them if needed.
addServerSyntaxesAndMatchingRules(schemaBuilder);
+ loadSchemaFromProviders(serverContext.getRootConfig(), schemaBuilder);
loadSchemaFromFiles(schemaBuilder);
try
@@ -244,6 +245,7 @@
addHistoricalCsnOrderingMatchingRule(schemaBuilder);
addAuthPasswordEqualityMatchingRule(schemaBuilder);
addUserPasswordEqualityMatchingRule(schemaBuilder);
+ addJsonSyntaxesAndMatchingRulesToSchema(schemaBuilder);
}
catch (ConflictingSchemaElementException e)
{
@@ -705,8 +707,6 @@
* The root to retrieve schema provider configurations.
* @param schemaBuilder
* The schema builder that providers should update.
- * @param schemaUpdater
- * The updater that providers should use when applying a configuration change.
*/
private void loadSchemaFromProviders(final RootCfg rootConfiguration, final SchemaBuilder schemaBuilder)
throws ConfigException, InitializationException {
--
Gitblit v1.10.0