From f2f3d93a4ea2448ad218628eef04cd93dd58c491 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 11 Jul 2007 16:35:10 +0000
Subject: [PATCH] Fix issue 1934: define which JE index properties will be displayed by default by the dsconfig list-je-indexes sub-command. Also fix the JE index index-substring-length property LDAP schema: its attribute type was not included in its object class definition.
---
opends/resource/schema/02-config.ldif | 3 ++-
opends/src/admin/defn/org/opends/server/admin/std/JEBackendConfiguration.xml | 8 +++++++-
opends/src/admin/defn/org/opends/server/admin/std/JEIndexConfiguration.xml | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/opends/resource/schema/02-config.ldif b/opends/resource/schema/02-config.ldif
index b2bffe3..201b264 100644
--- a/opends/resource/schema/02-config.ldif
+++ b/opends/resource/schema/02-config.ldif
@@ -1535,7 +1535,8 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.8 NAME 'ds-cfg-je-index' SUP top
STRUCTURAL MUST ( ds-cfg-index-attribute $ ds-cfg-index-type )
- MAY ds-cfg-index-entry-limit X-ORIGIN 'OpenDS Directory Server' )
+ MAY ( ds-cfg-index-entry-limit $ ds-cfg-index-substring-length )
+ X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.9 NAME 'ds-cfg-schema-backend'
SUP ds-cfg-backend STRUCTURAL
MAY ( ds-cfg-schema-entry-dn $ ds-cfg-show-all-attributes )
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/JEBackendConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/JEBackendConfiguration.xml
index bce44f4..7aefce2 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/JEBackendConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/JEBackendConfiguration.xml
@@ -30,7 +30,8 @@
package="org.opends.server.admin.std"
extends="backend"
xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap">
+ xmlns:ldap="http://www.opends.org/admin-ldap"
+ xmlns:cli="http://www.opends.org/admin-cli">
<adm:synopsis>
The primary backend provided by the OpenDS Directory Server uses the
Berkeley DB Java Edition to store user-provided data in a local repository.
@@ -62,6 +63,11 @@
ds-cfg-index-attribute
</ldap:naming-attribute>
</adm:profile>
+ <adm:profile name="cli">
+ <cli:relation>
+ <cli:default-property name="index-type" />
+ </cli:relation>
+ </adm:profile>
</adm:relation>
<adm:property-override name="backend-class">
<adm:default-behavior>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/JEIndexConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/JEIndexConfiguration.xml
index cdaa6d9..a62cf0d 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/JEIndexConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/JEIndexConfiguration.xml
@@ -122,7 +122,7 @@
</adm:synopsis>
<adm:description>
For equality, presence, and substring index types, the associated
- attribute type must have a corrsponding matching rule.
+ attribute type must have a corresponding matching rule.
</adm:description>
<adm:requires-admin-action>
<adm:other>
@@ -201,7 +201,7 @@
<adm:profile name="ldap">
<ldap:attribute>
<ldap:oid>1.3.6.1.4.1.26027.1.1.380</ldap:oid>
- <ldap:name>ds-cfg-ds-cfg-index-substring-length</ldap:name>
+ <ldap:name>ds-cfg-index-substring-length</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
--
Gitblit v1.10.0