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

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/AttributeValuePasswordValidatorConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/AttributeValuePasswordValidatorConfiguration.xml
index 151d2ba..3e70e30 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/AttributeValuePasswordValidatorConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/AttributeValuePasswordValidatorConfiguration.xml
@@ -38,13 +38,12 @@
   </adm:synopsis>
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.96</ldap:oid>
       <ldap:name>ds-cfg-attribute-value-password-validator</ldap:name>
       <ldap:superior>ds-cfg-password-validator</ldap:superior>
     </ldap:object-class>
   </adm:profile>
 
-  <adm:property-override name="validator-class">
+  <adm:property-override name="java-class">
     <adm:default-behavior>
       <adm:defined>
         <adm:value>
@@ -74,7 +73,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.146</ldap:oid>
         <ldap:name>ds-cfg-match-attribute</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -90,7 +88,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.337</ldap:oid>
         <ldap:name>ds-cfg-test-reversed-password</ldap:name>
       </ldap:attribute>
     </adm:profile>

--
Gitblit v1.10.0