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/TrustManagerProviderConfiguration.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/TrustManagerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/TrustManagerProviderConfiguration.xml
similarity index 84%
rename from opends/src/admin/defn/org/opends/server/admin/std/TrustManagerConfiguration.xml
rename to opends/src/admin/defn/org/opends/server/admin/std/TrustManagerProviderConfiguration.xml
index 99cfa94..ccb5d90 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/TrustManagerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/TrustManagerProviderConfiguration.xml
@@ -26,7 +26,7 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
-<adm:managed-object name="trust-manager" plural-name="trust-managers"
+<adm:managed-object name="trust-manager-provider" plural-name="trust-manager-providers"
package="org.opends.server.admin.std" abstract="false"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
@@ -37,7 +37,6 @@
<adm:tag name="security"/>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.51</ldap:oid>
<ldap:name>ds-cfg-trust-manager-provider</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
@@ -53,12 +52,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.128</ldap:oid>
- <ldap:name>ds-cfg-trust-manager-provider-enabled</ldap:name>
+ <ldap:name>ds-cfg-enabled</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="java-implementation-class" mandatory="true">
+ <adm:property name="java-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that should to provide
the
@@ -74,8 +72,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.127</ldap:oid>
- <ldap:name>ds-cfg-trust-manager-provider-class</ldap:name>
+ <ldap:name>ds-cfg-java-class</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
--
Gitblit v1.10.0