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/FileBasedTrustManagerProviderConfiguration.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml
similarity index 91%
rename from opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerConfiguration.xml
rename to opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml
index 5d507d3..fd3c43a 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml
@@ -26,9 +26,9 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
-<adm:managed-object name="file-based-trust-manager"
- plural-name="file-based-trust-managers"
- package="org.opends.server.admin.std" extends="trust-manager"
+<adm:managed-object name="file-based-trust-manager-provider"
+ plural-name="file-based-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">
<adm:TODO>
@@ -48,12 +48,11 @@
</adm:synopsis>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.52</ldap:oid>
<ldap:name>ds-cfg-file-based-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>
@@ -80,7 +79,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.129</ldap:oid>
<ldap:name>ds-cfg-trust-store-file</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -108,7 +106,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.134</ldap:oid>
<ldap:name>ds-cfg-trust-store-type</ldap:name>
</ldap:attribute>
</adm:profile>
--
Gitblit v1.10.0