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/BackendConfiguration.xml | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/BackendConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/BackendConfiguration.xml
index 8dc6d71..0f896b3 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/BackendConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/BackendConfiguration.xml
@@ -42,12 +42,11 @@
<adm:tag name="database"/>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.5</ldap:oid>
<ldap:name>ds-cfg-backend</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property name="backend-enabled"
+ <adm:property name="enabled"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -62,12 +61,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.13</ldap:oid>
- <ldap:name>ds-cfg-backend-enabled</ldap:name>
+ <ldap:name>ds-cfg-enabled</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="backend-class"
+ <adm:property name="java-class"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -89,8 +87,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.11</ldap:oid>
- <ldap:name>ds-cfg-backend-class</ldap:name>
+ <ldap:name>ds-cfg-java-class</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -108,12 +105,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.14</ldap:oid>
<ldap:name>ds-cfg-backend-id</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="backend-writability-mode"
+ <adm:property name="writability-mode"
mandatory="true"
multi-valued="false">
<adm:synopsis>
@@ -151,12 +147,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.162</ldap:oid>
- <ldap:name>ds-cfg-backend-writability-mode</ldap:name>
+ <ldap:name>ds-cfg-writability-mode</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="backend-base-dn"
+ <adm:property name="base-dn"
mandatory="true"
multi-valued="true">
<adm:synopsis>
@@ -185,8 +180,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.10</ldap:oid>
- <ldap:name>ds-cfg-backend-base-dn</ldap:name>
+ <ldap:name>ds-cfg-base-dn</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
--
Gitblit v1.10.0