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/TrustStoreBackendConfiguration.xml | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml
index 38c31c1..fa0d874 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml
@@ -40,12 +40,11 @@
</adm:synopsis>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.164</ldap:oid>
<ldap:name>ds-cfg-trust-store-backend</ldap:name>
<ldap:superior>ds-cfg-backend</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property-override name="backend-class">
+ <adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
<adm:value>
@@ -75,7 +74,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>
@@ -103,7 +101,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