From b0629c45c2fbfad2c38f2a51a85acdc13c1f5f42 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Feb 2014 16:48:07 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support

---
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java                         |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java                      |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java                          |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java                      |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java                           |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java                              |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java                                |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java                            |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java                                |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java                    |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java         |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java                         |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java                                                  |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java                        |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java                          |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java                           |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java                                   |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java                                |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java                                   |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java                          |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java                              |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java                             |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java                           |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java                        |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java                               |   16 ++--
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java                                |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java                                          |    4 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java                         |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java                              |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java                  |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java                             |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java                               |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java                       |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java                                |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java              |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java                            |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/Schema.java                                                      |   36 ++++++------
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java                    |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java                       |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java                           |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java                                   |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java                               |    6 +-
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java                        |    2 
 opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java                        |    2 
 opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java           |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java                           |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java                             |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java                            |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java                          |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java                      |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java          |    2 
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java                     |    2 
 53 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
index 066b204..2560e56 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
@@ -59,7 +59,7 @@
   /**
    * {@inheritDoc}
    */
-  public abstract Collection<String> getAllNames();
+  public abstract Collection<String> getNames();
 
 
 
@@ -225,7 +225,7 @@
     buffer.append("( ");
     buffer.append(getOID());
     buffer.append(" NAME ");
-    Collection<String> names = getAllNames();
+    Collection<String> names = getNames();
     if(names.size()>1)
     {
       buffer.append("(");
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
index fbf953b..a937883 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
@@ -63,7 +63,7 @@
    *
    * @return All names for this matching rule.
    */
-  Collection<String> getAllNames();
+  Collection<String> getNames();
 
 
 
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index 8fa153f..78c6810 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -80,7 +80,7 @@
   /**
    * {@inheritDoc}
    */
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
index 8b37614..b94134c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
@@ -70,7 +70,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 91a80f7..917c97c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -68,7 +68,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 8bf2c37..1813741 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -68,7 +68,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index ebb362d..d0b0977 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
@@ -69,7 +69,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
index 5119ab3..97e7e49 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
@@ -73,7 +73,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index e4edbb8..e26863d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
@@ -85,7 +85,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 40cd92a..29e15cf 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
@@ -72,7 +72,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 2e4bfec..634a1c1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
@@ -76,7 +76,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
index 365b1f4..dca4629 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
@@ -63,7 +63,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index 47e3601..5f90215 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
@@ -63,7 +63,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index 28d955b..92e80b3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
@@ -71,7 +71,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index bd723b7..84af237 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
@@ -71,7 +71,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
index 75e251d..0a2657e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
@@ -63,7 +63,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
index 71f1cd5..89ac067 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
@@ -63,7 +63,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index e3d028b..0769ef1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
@@ -76,7 +76,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
index a698dc5..ba20e00 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
@@ -63,7 +63,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index a3fd256..ead9ffb 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
@@ -101,7 +101,7 @@
   /**
    * {@inheritDoc}
    */
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index 3c0a210..1f327f9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -440,7 +440,7 @@
     MatchingRule matchingRule = getMatchingRule(oid);
     if (matchingRule != null)
     {
-      for (String name : matchingRule.getAllNames())
+      for (String name : matchingRule.getNames())
       {
         names.add(name);
       }
@@ -476,7 +476,7 @@
     MatchingRule matchingRule = getMatchingRule(oid);
     if (matchingRule != null)
     {
-      for (String name : matchingRule.getAllNames())
+      for (String name : matchingRule.getNames())
       {
         names.add(name);
       }
@@ -516,7 +516,7 @@
     Collection<String> defaultNames = new HashSet<String>();
     if (matchingRule != null)
     {
-      for (String name : matchingRule.getAllNames())
+      for (String name : matchingRule.getNames())
       {
         defaultNames.add(name);
       }
@@ -534,7 +534,7 @@
     MatchingRule equalityMatchingRule = getMatchingRule(OID);
     if (equalityMatchingRule != null)
     {
-      for (String name : equalityMatchingRule.getAllNames())
+      for (String name : equalityMatchingRule.getNames())
       {
         names.add(name);
       }
@@ -570,7 +570,7 @@
     MatchingRule matchingRule = getMatchingRule(oid);
     if (matchingRule != null)
     {
-      for (String name : matchingRule.getAllNames())
+      for (String name : matchingRule.getNames())
       {
         names.add(name);
       }
@@ -606,7 +606,7 @@
     MatchingRule matchingRule = getMatchingRule(oid);
     if (matchingRule != null)
     {
-      for (String name : matchingRule.getAllNames())
+      for (String name : matchingRule.getNames())
       {
         names.add(name);
       }
@@ -641,7 +641,7 @@
     MatchingRule matchingRule = getMatchingRule(oid);
     if (matchingRule != null)
     {
-      for (String name : matchingRule.getAllNames())
+      for (String name : matchingRule.getNames())
       {
         names.add(name);
       }
@@ -763,7 +763,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Collection<String> getAllNames()
+    public Collection<String> getNames()
     {
       return Collections.unmodifiableCollection(names);
     }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index 8931ef2..bcdaef2 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
@@ -68,7 +68,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
index 2c89950..3e9bb99 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
@@ -69,7 +69,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index d0c75e4..3c71ee5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
@@ -81,7 +81,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index 8820865..154bf79 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -67,7 +67,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index 6a682ff..50ea0c7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -79,7 +79,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index 8836d74..810b55e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
@@ -69,7 +69,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
index be50460..0ca385f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
@@ -76,7 +76,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index 130450f..a95f358 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -81,7 +81,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
index acc2fa5..b5e76ec 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
@@ -54,7 +54,7 @@
   /**
    * {@inheritDoc}
    */
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 44a0dce..692645b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -1582,7 +1582,7 @@
        * {@inheritDoc}
        */
       @Override
-      public Collection<String> getAllNames()
+      public Collection<String> getNames()
       {
         return Collections.singleton(getName());
       }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index b6771df..77aeac3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
@@ -72,7 +72,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index e56969a..fa584cd 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -84,7 +84,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index d2902cf..92e47c7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
@@ -71,7 +71,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index 6ec0fd0..d5bb068 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -71,7 +71,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
index 4d48e2f..5597894 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
@@ -73,7 +73,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
index 31c2d2a..935e3c5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
@@ -62,7 +62,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 616ca51..6bcad3d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -75,7 +75,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
index 16a4d59..43f8f9e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
@@ -62,7 +62,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
index 1086863..8d0e46b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
@@ -65,7 +65,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
index d31b320..82676f4 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
@@ -65,7 +65,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
index 6e89c1a..321a3b3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
@@ -64,7 +64,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
index 4201d4a..877c293 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
@@ -67,7 +67,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
index b53b730..6d6b02f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
@@ -473,7 +473,7 @@
       * {@inheritDoc}
       */
     @Override
-    public Collection<String> getAllNames()
+    public Collection<String> getNames()
     {
       return Collections.unmodifiableList(names);
     }
@@ -572,7 +572,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Collection<String> getAllNames()
+    public Collection<String> getNames()
     {
       return Collections.unmodifiableList(names);
     }
@@ -761,7 +761,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Collection<String> getAllNames()
+    public Collection<String> getNames()
     {
       return Collections.singleton(getName());
     }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index b30fb85..2b830de 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -69,7 +69,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index 440bc42..955779e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -82,7 +82,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 804f45a..65cc86e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -74,7 +74,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index 9976bdc..006847e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -69,7 +69,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
index cf980da..dcdde21 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
@@ -63,7 +63,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
index c2cf579..2de1ec1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
@@ -79,7 +79,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/Schema.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
index 827c7f4..efd26f7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
@@ -1214,7 +1214,7 @@
                            ResultCode.CONSTRAINT_VIOLATION, message);
           }
 
-          for(String name:matchingRule.getAllNames())
+          for(String name:matchingRule.getNames())
           {
             if (name != null)
             {
@@ -1237,7 +1237,7 @@
         matchingRules.put(toLowerCase(matchingRule.getOID()),
                           matchingRule);
 
-        for(String name:matchingRule.getAllNames())
+        for(String name:matchingRule.getNames())
         {
           if (name != null)
           {
@@ -1296,7 +1296,7 @@
         matchingRules.remove(toLowerCase(matchingRule.getOID()),
                              matchingRule);
 
-        for(String name:matchingRule.getAllNames())
+        for(String name:matchingRule.getNames())
         {
           if (name != null)
           {
@@ -1407,7 +1407,7 @@
                          ResultCode.CONSTRAINT_VIOLATION, message);
         }
 
-       for(String name:matchingRule.getAllNames())
+       for(String name:matchingRule.getNames())
        {
         if (name != null)
         {
@@ -1430,7 +1430,7 @@
       approximateMatchingRules.put(oid, matchingRule);
       matchingRules.put(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1470,7 +1470,7 @@
       approximateMatchingRules.remove(oid, matchingRule);
       matchingRules.remove(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1579,7 +1579,7 @@
                          ResultCode.CONSTRAINT_VIOLATION, message);
         }
 
-        for(String name:matchingRule.getAllNames())
+        for(String name:matchingRule.getNames())
         {
            if (name != null)
            {
@@ -1604,7 +1604,7 @@
       equalityMatchingRules.put(oid, matchingRule);
       matchingRules.put(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1644,7 +1644,7 @@
       equalityMatchingRules.remove(oid, matchingRule);
       matchingRules.remove(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1754,7 +1754,7 @@
                          ResultCode.CONSTRAINT_VIOLATION, message);
         }
 
-        for(String name:matchingRule.getAllNames())
+        for(String name:matchingRule.getNames())
         {
           if (name != null)
           {
@@ -1778,7 +1778,7 @@
       orderingMatchingRules.put(oid, matchingRule);
       matchingRules.put(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1818,7 +1818,7 @@
       orderingMatchingRules.remove(oid, matchingRule);
       matchingRules.remove(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1927,7 +1927,7 @@
                          ResultCode.CONSTRAINT_VIOLATION, message);
         }
 
-        for(String name:matchingRule.getAllNames())
+        for(String name:matchingRule.getNames())
         {
           if (name != null)
           {
@@ -1951,7 +1951,7 @@
       substringMatchingRules.put(oid, matchingRule);
       matchingRules.put(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -1991,7 +1991,7 @@
       substringMatchingRules.remove(oid, matchingRule);
       matchingRules.remove(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -2107,7 +2107,7 @@
                          ResultCode.CONSTRAINT_VIOLATION, message);
         }
 
-       for(String name:matchingRule.getAllNames())
+       for(String name:matchingRule.getNames())
        {
         if (name != null)
         {
@@ -2130,7 +2130,7 @@
       extensibleMatchingRules.put(oid, matchingRule);
       matchingRules.put(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
@@ -2170,7 +2170,7 @@
       extensibleMatchingRules.remove(oid, matchingRule);
       matchingRules.remove(oid, matchingRule);
 
-      for(String name:matchingRule.getAllNames())
+      for(String name:matchingRule.getNames())
       {
         if (name != null)
         {
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index 406d25c..9f80d61 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
@@ -119,7 +119,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
index 74cfa78..8d58229 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
@@ -62,7 +62,7 @@
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> getAllNames()
+  public Collection<String> getNames()
   {
     return Collections.singleton(getName());
   }

--
Gitblit v1.10.0