From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/admin/defn/org/opends/server/admin/std/LocalDBVLVIndexConfiguration.xml | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/VLVJEIndexConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/LocalDBVLVIndexConfiguration.xml
similarity index 84%
rename from opends/src/admin/defn/org/opends/server/admin/std/VLVJEIndexConfiguration.xml
rename to opends/src/admin/defn/org/opends/server/admin/std/LocalDBVLVIndexConfiguration.xml
index bce92fa..adb99b5 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/VLVJEIndexConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/LocalDBVLVIndexConfiguration.xml
@@ -26,7 +26,7 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
-<adm:managed-object name="vlv-je-index" plural-name="vlv-je-indexes"
+<adm:managed-object name="local-db-vlv-index" plural-name="local-db-vlv-indexes"
package="org.opends.server.admin.std"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
@@ -44,12 +44,11 @@
<adm:tag name="database" />
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.117</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index</ldap:name>
+ <ldap:name>ds-cfg-local-db-vlv-index</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property name="vlv-index-base-dn"
+ <adm:property name="base-dn"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -68,12 +67,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.437</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index-base-dn</ldap:name>
+ <ldap:name>ds-cfg-base-dn</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="vlv-index-scope"
+ <adm:property name="scope"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -116,12 +114,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.438</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index-scope </ldap:name>
+ <ldap:name>ds-cfg-scope </ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="vlv-index-filter"
+ <adm:property name="filter"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -140,12 +137,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.439</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index-filter</ldap:name>
+ <ldap:name>ds-cfg-filter</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="vlv-index-sort-order"
+ <adm:property name="sort-order"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -165,12 +161,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.440</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index-sort-order</ldap:name>
+ <ldap:name>ds-cfg-sort-order</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="vlv-index-name"
+ <adm:property name="name"
mandatory="true"
multi-valued="false"
read-only="true">
@@ -182,12 +177,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.441</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index-name</ldap:name>
+ <ldap:name>ds-cfg-name</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="vlv-index-maximum-block-size"
+ <adm:property name="max-block-size"
mandatory="false"
multi-valued="false"
read-only="true">
@@ -211,9 +205,8 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.442</ldap:oid>
- <ldap:name>ds-cfg-vlv-je-index-maximum-block-size</ldap:name>
+ <ldap:name>ds-cfg-max-block-size</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
-</adm:managed-object>
\ No newline at end of file
+</adm:managed-object>
--
Gitblit v1.10.0