OPENDJ-3089 Move code to create server's specific syntaxes and matching rul...

Nicolas Capponi

19.51.2016 7fade20a7d9c1bf7ced6f802e354663a308f5940

 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(