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/SevenBitCleanPluginConfiguration.xml |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/SevenBitCleanPluginConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/SevenBitCleanPluginConfiguration.xml
index 44d3f76..db00cfa 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/SevenBitCleanPluginConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/SevenBitCleanPluginConfiguration.xml
@@ -47,13 +47,12 @@
 
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.167</ldap:oid>
-      <ldap:name>ds-cfg-7-bit-clean-plugin</ldap:name>
+      <ldap:name>ds-cfg-seven-bit-clean-plugin</ldap:name>
       <ldap:superior>ds-cfg-plugin</ldap:superior>
     </ldap:object-class>
   </adm:profile>
 
-  <adm:property-override name="plugin-class">
+  <adm:property-override name="java-class">
     <adm:default-behavior>
       <adm:defined>
         <adm:value>
@@ -91,8 +90,7 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.487</ldap:oid>
-        <ldap:name>ds-cfg-7-bit-clean-attribute-type</ldap:name>
+        <ldap:name>ds-cfg-attribute-type</ldap:name>
       </ldap:attribute>
     </adm:profile>
   </adm:property>
@@ -115,8 +113,7 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.488</ldap:oid>
-        <ldap:name>ds-cfg-7-bit-clean-base-dn</ldap:name>
+        <ldap:name>ds-cfg-base-dn</ldap:name>
       </ldap:attribute>
     </adm:profile>
   </adm:property>

--
Gitblit v1.10.0