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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

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

@@ -55,13 +55,12 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.10</ldap:oid>
      <ldap:name>ds-cfg-task-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>
@@ -85,7 +84,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.97</ldap:oid>
        <ldap:name>ds-cfg-task-backing-file</ldap:name>
      </ldap:attribute>
    </adm:profile>
@@ -108,7 +106,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.106</ldap:oid>
        <ldap:name>ds-cfg-task-retention-time</ldap:name>
      </ldap:attribute>
    </adm:profile>
@@ -136,7 +133,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.465</ldap:oid>
        <ldap:name>ds-cfg-notification-sender-address</ldap:name>
      </ldap:attribute>
    </adm:profile>