From e958eb5bcfc9feccbda7c0841b05939506143ad8 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 16 Nov 2007 10:47:40 +0000
Subject: [PATCH] Advanced properties phase 1: tag advanced properties and perform various clean-up to the XML definitions:

---
 opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml |  138 ++++++++++++++++++++++-----------------------
 1 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
index e494743..d82fc4a 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License").  You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
- ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
- !      Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- !
- !      Portions Copyright 2007 Sun Microsystems, Inc.
- ! -->
-
+  ! CDDL HEADER START
+  !
+  ! The contents of this file are subject to the terms of the
+  ! Common Development and Distribution License, Version 1.0 only
+  ! (the "License").  You may not use this file except in compliance
+  ! with the License.
+  !
+  ! You can obtain a copy of the license at
+  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! See the License for the specific language governing permissions
+  ! and limitations under the License.
+  !
+  ! When distributing Covered Code, include this CDDL HEADER in each
+  ! file and include the License file at
+  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+  ! add the following below this CDDL HEADER, with the fields enclosed
+  ! by brackets "[]" replaced with your own identifying information:
+  !      Portions Copyright [yyyy] [name of copyright owner]
+  !
+  ! CDDL HEADER END
+  !
+  !
+  !      Portions Copyright 2007 Sun Microsystems, Inc.
+  ! -->
 <adm:managed-object name="error-log-publisher"
-plural-name="error-log-publishers"
-package="org.opends.server.admin.std"
-extends="log-publisher"
-abstract="true"
-xmlns:adm="http://www.opends.org/admin"
-xmlns:ldap="http://www.opends.org/admin-ldap">
-
+  plural-name="error-log-publishers"
+  package="org.opends.server.admin.std" extends="log-publisher"
+  xmlns:adm="http://www.opends.org/admin"
+  xmlns:ldap="http://www.opends.org/admin-ldap">
   <adm:synopsis>
     <adm:user-friendly-plural-name />
-    are responsible for distributing error log messages from the error logger to
-    a destination.
+    are responsible for distributing error log messages from the error
+    logger to a destination.
   </adm:synopsis>
-
   <adm:profile name="ldap">
     <ldap:object-class>
       <ldap:name>ds-cfg-error-log-publisher</ldap:name>
       <ldap:superior>ds-cfg-log-publisher</ldap:superior>
     </ldap:object-class>
   </adm:profile>
-
   <adm:property name="java-class" mandatory="true">
     <adm:synopsis>
       The fully-qualified name of the Java class that provides the
@@ -66,18 +60,16 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
   <adm:property name="default-severity" multi-valued="true">
     <adm:synopsis>
       Property to specify the default severity levels for the logger.
     </adm:synopsis>
     <adm:default-behavior>
-      <adm:alias>
-        <adm:synopsis>
-          Severities fatal-error, severe-warning, and severe-error will
-          be used for the logger.
-        </adm:synopsis>
-      </adm:alias>
+      <adm:defined>
+        <adm:value>fatal-error</adm:value>
+        <adm:value>severe-warning</adm:value>
+        <adm:value>severe-error</adm:value>
+      </adm:defined>
     </adm:default-behavior>
     <adm:syntax>
       <adm:enumeration>
@@ -88,32 +80,33 @@
         </adm:value>
         <adm:value name="none">
           <adm:synopsis>
-            No messages of any severity will be logged by default.
-            This value is intended to be used in conjunction with
-            the override-severity property to define an error
-            logger that will publish no error message beside the errors
-            of a given category.
+            No messages of any severity will be logged by default. This
+            value is intended to be used in conjunction with the
+            override-severity property to define an error logger that
+            will publish no error message beside the errors of a given
+            category.
           </adm:synopsis>
         </adm:value>
         <adm:value name="fatal-error">
           <adm:synopsis>
             The error log severity that will be used for messages that
-            provide information about fatal errors which may force the server
-            to shut down or operate in a significantly degraded state.
+            provide information about fatal errors which may force the
+            server to shut down or operate in a significantly degraded
+            state.
           </adm:synopsis>
         </adm:value>
         <adm:value name="info">
           <adm:synopsis>
             The error log severity that will be used for messages that
-            provide information about significant events within the server
-            that are not warnings or errors.
+            provide information about significant events within the
+            server that are not warnings or errors.
           </adm:synopsis>
         </adm:value>
         <adm:value name="mild-error">
           <adm:synopsis>
             The error log severity that will be used for messages that
-            provide information about mild (recoverable) errors encountered
-            during processing.
+            provide information about mild (recoverable) errors
+            encountered during processing.
           </adm:synopsis>
         </adm:value>
         <adm:value name="mild-warning">
@@ -125,10 +118,10 @@
         </adm:value>
         <adm:value name="notice">
           <adm:synopsis>
-            The error log severity that will be used for the most important
-            informational messages (i.e., information that should almost
-            always be logged but is not associated with a warning or error
-            condition).
+            The error log severity that will be used for the most
+            important informational messages (i.e., information that
+            should almost always be logged but is not associated with a
+            warning or error condition).
           </adm:synopsis>
         </adm:value>
         <adm:value name="severe-error">
@@ -148,8 +141,7 @@
         <adm:value name="debug">
           <adm:synopsis>
             The error log severity that will be used for messages that
-            provide debugging information triggered during
-            processing.
+            provide debugging information triggered during processing.
           </adm:synopsis>
         </adm:value>
       </adm:enumeration>
@@ -160,19 +152,25 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
   <adm:property name="override-severity" multi-valued="true">
+    <adm:TODO>
+      This should be split into per-category properties whose value
+      defaults to the default-severity. See issue 2503.
+    </adm:TODO>
     <adm:synopsis>
       Property to specify the override severity levels for the logger
-      based on the category of the messages. Each override severity
-      level should include the category and the severity levels to log
-      for that category. (i.e., core=mild-error,info,mild-warning). Valid
-      categories are: core, extensions, protocol, config, log, util, schema,
-      plugin, jeb, backend, tools, task, access-control, admin, sync, version,
-      quicksetup, admin-tool, dsconfig, user-defined. Valid severities are:
-      all, fatal-error, info, mild-error, mild-warning, notice, severe-error,
-      severe-warning, debug.
+      based on the category of the messages.
     </adm:synopsis>
+    <adm:description>
+      Each override severity level should include the category and the
+      severity levels to log for that category. (i.e.,
+      core=mild-error,info,mild-warning). Valid categories are: core,
+      extensions, protocol, config, log, util, schema, plugin, jeb,
+      backend, tools, task, access-control, admin, sync, version,
+      quicksetup, admin-tool, dsconfig, user-defined. Valid severities
+      are: all, fatal-error, info, mild-error, mild-warning, notice,
+      severe-error, severe-warning, debug.
+    </adm:description>
     <adm:default-behavior>
       <adm:alias>
         <adm:synopsis>

--
Gitblit v1.10.0