mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Ludovic Poitou
21.46.2011 b6c6775748f02e2485d23041e4c9d32baa667c8b
Fix OPENDJ-70 : Build does not create the proper reference schema in the config/upgrade directory
ldapSyntaxes were not copied over.
1 files modified
12 ■■■■■ changed files
opends/src/build-tools/org/opends/build/tools/ConcatSchema.java 12 ●●●●● patch | view | raw | blame | history
opends/src/build-tools/org/opends/build/tools/ConcatSchema.java
@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 */
package org.opends.build.tools;
@@ -113,6 +114,7 @@
    LinkedList<String> ditContentRules   = new LinkedList<String>();
    LinkedList<String> ditStructureRules = new LinkedList<String>();
    LinkedList<String> matchingRuleUses  = new LinkedList<String>();
    LinkedList<String> ldapSyntaxes      = new LinkedList<String>();
    // Open each of the files in order and read the elements that they contain,
@@ -207,6 +209,10 @@
        {
          matchingRuleUses.add(line);
        }
        else if (lowerLine.startsWith("ldapsyntaxes:"))
        {
          ldapSyntaxes.add(line);
        }
      }
    }
@@ -224,6 +230,12 @@
      writer.write("objectClass: subschema");
      writer.newLine();
      for (String line : ldapSyntaxes)
      {
        writer.write(line);
        writer.newLine();
      }
      for (String line : attributeTypes)
      {
        writer.write(line);