From 7fade20a7d9c1bf7ced6f802e354663a308f5940 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:26 +0000
Subject: [PATCH] OPENDJ-3089 Move code to create server's specific syntaxes and matching rules to SchemaHandler class
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
index 48f1e2e..4f3bce1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
@@ -38,9 +38,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.opends.admin.ads.util.ConnectionWrapper;
-import org.opends.server.replication.plugin.HistoricalCsnOrderingMatchingRuleImpl;
-import org.opends.server.schema.AciSyntax;
-import org.opends.server.schema.SubtreeSpecificationSyntax;
+import org.opends.server.schema.SchemaHandler;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
@@ -84,10 +82,7 @@
// Add missing matching rules and attribute syntaxes to base schema to allow read of remote server schema
// (see OPENDJ-1122 for more details)
- AciSyntax.addAciSyntax(schemaBuilder);
- SubtreeSpecificationSyntax.addSubtreeSpecificationSyntax(schemaBuilder);
- addMatchingRuleIfMissing(schemaBuilder, baseSchema, "1.3.6.1.4.1.26027.1.4.4", "historicalCsnOrderingMatch",
- "1.3.6.1.4.1.1466.115.121.1.40", new HistoricalCsnOrderingMatchingRuleImpl());
+ SchemaHandler.addServerSyntaxesAndMatchingRules(schemaBuilder);
// Add remote schema entry
final SearchRequest request = newSearchRequest(
--
Gitblit v1.10.0