OPENDJ-2827 additional fixes

Chris Ridd

12.25.2016 3139679a516721b5a31c0f40458679a72d861263

OPENDJ-2827 additional fixes

dsconfig's BuildVersion needed similar fixes to only compare the major/minor/release numbers.

The SchemaBackend now looks for config/upgrade/schema.ldif.<instancerevision> instead of
config/upgrade/schema.ldif.<buildversion>. This better matches what we did with svn and allows
the server to start after a patch has been applied.

 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java

@@ -12,7 +12,7 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2008 Sun Microsystems, Inc.
 * Portions Copyright 2013-2015 ForgeRock AS.
 * Portions Copyright 2013-2016 ForgeRock AS.
 */
package org.forgerock.opendj.config.dsconfig;

@@ -91,7 +91,7 @@
    public static void checkVersionMismatch(final Connection connection) throws ConfigException {
        final BuildVersion binaryVersion = BuildVersion.binaryVersion(connection);
        final BuildVersion instanceVersion = BuildVersion.instanceVersion();
        if (!binaryVersion.toString().equals(instanceVersion.toString())) {
        if (!binaryVersion.equals(instanceVersion)) {
            throw new ConfigException(ERR_BUILDVERSION_MISMATCH.get(binaryVersion, instanceVersion));
        }
    }
@@ -182,7 +182,7 @@
            return true;
        } else if (obj instanceof BuildVersion) {
            final BuildVersion other = (BuildVersion) obj;
            return major == other.major && minor == other.minor && point == other.point && rev.equals(other.rev);
            return major == other.major && minor == other.minor && point == other.point;
        } else {
            return false;
        }

 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java

@@ -113,7 +113,7 @@
import org.opends.server.types.SchemaFileElement;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.BackupManager;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
@@ -352,7 +352,8 @@
      }
      else
      {
        concatFile = new File(upgradeDirectory, SCHEMA_BASE_FILE_NAME_WITHOUT_REVISION + DynamicConstants.REVISION);
        concatFile = new File(upgradeDirectory, SCHEMA_BASE_FILE_NAME_WITHOUT_REVISION +
            BuildVersion.instanceVersion().getRevision());
        if (concatFile.exists())
        {
          concatFilePath = concatFile.getAbsolutePath();