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

matthew_swift

26.21.2007 a052caad0008ede711b0c43d9955eccc3bb858ba

 opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TraditionalWorkQueueConfiguration.xml

@@ -40,7 +40,6 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.73</ldap:oid>
      <ldap:name>ds-cfg-traditional-work-queue</ldap:name>
      <ldap:superior>ds-cfg-work-queue</ldap:superior>
    </ldap:object-class>
@@ -56,7 +55,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.73</ldap:oid>
        <ldap:name>ds-cfg-num-worker-threads</ldap:name>
      </ldap:attribute>
    </adm:profile>
@@ -81,7 +79,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.68</ldap:oid>
        <ldap:name>ds-cfg-max-work-queue-capacity</ldap:name>
      </ldap:attribute>
    </adm:profile>