From b6c6775748f02e2485d23041e4c9d32baa667c8b Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 21 Feb 2011 13:46:50 +0000
Subject: [PATCH] Fix OPENDJ-70 : Build does not create the proper reference schema in the config/upgrade directory ldapSyntaxes were not copied over.
---
opends/src/build-tools/org/opends/build/tools/ConcatSchema.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/opends/src/build-tools/org/opends/build/tools/ConcatSchema.java b/opends/src/build-tools/org/opends/build/tools/ConcatSchema.java
index 3137504..bc5ea2f 100644
--- a/opends/src/build-tools/org/opends/build/tools/ConcatSchema.java
+++ b/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);
--
Gitblit v1.10.0