From 0d97a7da226d93b8b87467efde523aa2120ceabc Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 07 Jun 2013 14:08:13 +0000
Subject: [PATCH] Fix for OPENDJ-925, OPENDJ-926, and overall schema management. Review CR-1806. Back a few years ago, when we did the SVR4 package, we split the schema into read-only (Install) and writable (Instance). With the template model in 2.6, the whole schema is under config, and we should never edit/change the one in the template. So, I've removed all code related to the 2 locations for schema, reverted some I10N messages to their previous versions, and tidy up code and tests. All unit-tests are passing. And it's also possible to change the instance.loc and run setup and have a fully functioning server :-)
---
opends/build.xml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 6799322..8b35ae1 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1011,26 +1011,25 @@
location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" />
<mkdir dir="${pdir}" />
- <mkdir dir="${pdir}/bak" />
<mkdir dir="${pdir}/bat" />
<mkdir dir="${pdir}/bin" />
- <mkdir dir="${pdir}/classes" />
- <mkdir dir="${pdir}/config" />
- <mkdir dir="${pdir}/db" />
- <mkdir dir="${pdir}/import-tmp" />
- <mkdir dir="${pdir}/changelogDb" />
- <mkdir dir="${pdir}/ldif" />
<mkdir dir="${pdir}/legal-notices" />
<mkdir dir="${pdir}/lib" />
<mkdir dir="${pdir}/lib/extensions" />
- <mkdir dir="${pdir}/locks" />
- <mkdir dir="${pdir}/logs" />
<mkdir dir="${pdir}/template" />
+ <mkdir dir="${pdir}/template/bak" />
+ <mkdir dir="${pdir}/template/changelogDb" />
+ <mkdir dir="${pdir}/template/classes" />
<mkdir dir="${pdir}/template/config" />
<mkdir dir="${pdir}/template/config/schema" />
<mkdir dir="${pdir}/template/config/messages" />
<mkdir dir="${pdir}/template/config/MakeLDIF" />
<mkdir dir="${pdir}/template/config/upgrade" />
+ <mkdir dir="${pdir}/template/db" />
+ <mkdir dir="${pdir}/template/import-tmp" />
+ <mkdir dir="${pdir}/template/ldif" />
+ <mkdir dir="${pdir}/template/locks" />
+ <mkdir dir="${pdir}/template/logs" />
<mkdir dir="${pdir}/bin/ControlPanel.app" />
<mkdir dir="${pdir}/bin/ControlPanel.app/Contents" />
<mkdir dir="${pdir}/bin/ControlPanel.app/Contents/MacOS" />
--
Gitblit v1.10.0