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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

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

@@ -41,7 +41,6 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.2</ldap:oid>
      <ldap:name>ds-cfg-alert-handler</ldap:name>
      <ldap:superior>top</ldap:superior>
    </ldap:object-class>
@@ -58,13 +57,12 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.4</ldap:oid>
        <ldap:name>ds-cfg-alert-handler-enabled</ldap:name>
        <ldap:name>ds-cfg-enabled</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>

  <adm:property name="alert-handler-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 />
@@ -79,8 +77,7 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.3</ldap:oid>
        <ldap:name>ds-cfg-alert-handler-class</ldap:name>
        <ldap:name>ds-cfg-java-class</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>
@@ -107,7 +104,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.459</ldap:oid>
        <ldap:name>ds-cfg-enabled-alert-type</ldap:name>
      </ldap:attribute>
    </adm:profile>
@@ -136,7 +132,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.460</ldap:oid>
        <ldap:name>ds-cfg-disabled-alert-type</ldap:name>
      </ldap:attribute>
    </adm:profile>