From 2dece15900c587dcc5fcfaf35c2acdbfb026de1f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 14 Mar 2014 15:06:25 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 0e87d29..f2f6253 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -29,25 +29,27 @@
+
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
-import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.api.MatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-
-
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+
import static org.opends.messages.SchemaMessages.*;
+
import org.forgerock.i18n.LocalizableMessageBuilder;
+
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -66,7 +68,7 @@
// The default equality matching rule for this syntax.
- private EqualityMatchingRule defaultEqualityMatchingRule;
+ private MatchingRule defaultEqualityMatchingRule;
// The default ordering matching rule for this syntax.
private OrderingMatchingRule defaultOrderingMatchingRule;
@@ -168,7 +170,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public EqualityMatchingRule getEqualityMatchingRule()
+ public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
--
Gitblit v1.10.0