Fix for OPENDJ-925, OPENDJ-926, and overall schema management. Review CR-18...

Ludovic Poitou

07.08.2013 0d97a7da226d93b8b87467efde523aa2120ceabc

 opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java

@@ -23,12 +23,12 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2013 ForgeRock AS.
 */
package org.opends.server.tasks;

import org.opends.messages.Message;



import java.io.File;
import java.util.LinkedList;
import java.util.List;
@@ -113,10 +113,8 @@

    // Get the name(s) of the schema files to add and make sure they exist in
    // the schema directory.
    String schemaInstallDirectory  =
      SchemaConfigManager.getSchemaDirectoryPath(false);
    String schemaInstanceDirectory =
      SchemaConfigManager.getSchemaDirectoryPath(true);
      SchemaConfigManager.getSchemaDirectoryPath();
    filesToAdd = new TreeSet<String>();
    for (Attribute a : attrList)
    {
@@ -127,19 +125,13 @@

        try
        {
          File schemaFile = new File(schemaInstallDirectory, filename);
          if ((! schemaFile.exists()) ||
              (! schemaFile.getParent().equals(schemaInstallDirectory)))
          File schemaFile = new File(schemaInstanceDirectory, filename);
          if (! schemaFile.exists())
          {
            // try in the instance
            schemaFile = new File(schemaInstanceDirectory, filename);
            if (! schemaFile.exists())
            {
            Message message = ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE.get(
                filename, schemaInstallDirectory, schemaInstanceDirectory);
                filename, schemaInstanceDirectory);
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
            }
          }
        }
        catch (Exception e)
@@ -150,7 +142,7 @@
          }

          Message message = ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE.get(
              filename, schemaInstallDirectory, schemaInstanceDirectory,
              filename, schemaInstanceDirectory,
              getExceptionMessage(e));
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       message, e);
@@ -240,7 +232,7 @@
            for (AttributeValue v : a)
            {
              String s = v.getValue().toString();
              if (s.indexOf(SCHEMA_PROPERTY_FILENAME) < 0)
              if (!s.contains(SCHEMA_PROPERTY_FILENAME))
              {
                if (s.endsWith(" )"))
                {