Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/admin/defn/org/opends/server/admin/std/SHA1PasswordStorageSchemeConfiguration.xml

@@ -43,13 +43,12 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.147</ldap:oid>
      <ldap:name>ds-cfg-sha1-password-storage-scheme</ldap:name>
      <ldap:superior>ds-cfg-password-storage-scheme</ldap:superior>
    </ldap:object-class>
  </adm:profile>

  <adm:property-override name="scheme-class">
  <adm:property-override name="java-class">
    <adm:default-behavior>
      <adm:defined>
        <adm:value>