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/BlindTrustManagerProviderConfiguration.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerProviderConfiguration.xml
similarity index 87%
rename from opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerConfiguration.xml
rename to opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerProviderConfiguration.xml
index c83e23f..167351f 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerProviderConfiguration.xml
@@ -26,9 +26,9 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
-<adm:managed-object name="blind-trust-manager"
- plural-name="blind-trust-managers"
- package="org.opends.server.admin.std" extends="trust-manager"
+<adm:managed-object name="blind-trust-manager-provider"
+ plural-name="blind-trust-manager-providers"
+ package="org.opends.server.admin.std" extends="trust-manager-provider"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
@@ -42,13 +42,12 @@
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.154</ldap:oid>
<ldap:name>ds-cfg-blind-trust-manager-provider</ldap:name>
<ldap:superior>ds-cfg-trust-manager-provider</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property-override name="java-implementation-class">
+ <adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
<adm:value>
--
Gitblit v1.10.0