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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

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

@@ -38,7 +38,6 @@
  <adm:tag name="user-management"/>
  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.60</ldap:oid>
      <ldap:name>ds-cfg-password-generator</ldap:name>
      <ldap:superior>top</ldap:superior>
    </ldap:object-class>
@@ -54,12 +53,11 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.173</ldap:oid>
        <ldap:name>ds-cfg-password-generator-enabled</ldap:name>
        <ldap:name>ds-cfg-enabled</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>
  <adm:property name="generator-class" mandatory="true">
  <adm:property name="java-class" mandatory="true">
    <adm:synopsis>
      The fully-qualified name of the Java class that provides the
      <adm:user-friendly-name />
@@ -74,8 +72,7 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.172</ldap:oid>
        <ldap:name>ds-cfg-password-generator-class</ldap:name>
        <ldap:name>ds-cfg-java-class</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>