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/RootConfiguration.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
index fb079ae..2e662c8 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
@@ -262,8 +262,8 @@
     </adm:profile>
     <adm:profile name="cli">
       <cli:relation>
-        <cli:default-property name="backend-enabled" />
-        <cli:default-property name="backend-base-dn" />
+        <cli:default-property name="enabled" />
+        <cli:default-property name="base-dn" />
       </cli:relation>
     </adm:profile>
   </adm:relation>
@@ -385,7 +385,7 @@
       </cli:relation>
     </adm:profile>
   </adm:relation>
-  <adm:relation name="key-manager">
+  <adm:relation name="key-manager-provider">
     <adm:one-to-many />
     <adm:profile name="ldap">
       <ldap:rdn-sequence>
@@ -398,7 +398,7 @@
       </cli:relation>
     </adm:profile>
   </adm:relation>
-  <adm:relation name="trust-manager">
+  <adm:relation name="trust-manager-provider">
     <adm:one-to-many />
     <adm:profile name="ldap">
       <ldap:rdn-sequence>
@@ -418,7 +418,7 @@
     </adm:profile>
     <adm:profile name="cli">
       <cli:relation>
-        <cli:default-property name="work-queue-class" />
+        <cli:default-property name="java-class" />
       </cli:relation>
     </adm:profile>
   </adm:relation>

--
Gitblit v1.10.0