From 15950e7198fcb6e99c9a7e03b5ac0defc16a6277 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 24 Oct 2011 15:32:22 +0000
Subject: [PATCH] Fix overly verbose usage which was messing up the output of dsconfig list-properties.

---
 opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml |   36 ++++++++++--------------------------
 1 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
index c30c0e6..8c08015 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
@@ -399,20 +399,12 @@
           This can be read as: (oid|\*):oid(,oid)*+
           -->
           <adm:regex>^((([a-zA-Z]([a-zA-Z]|[0-9]|-|;)*+)|(0|([1-9]([0-9])*+))(\\.(0|([1-9]([0-9])*+)))*+)|\\*):(([a-zA-Z]([a-zA-Z]|[0-9]|-|;)*+)|(0|([1-9]([0-9])*+))(\\.(0|([1-9]([0-9])*+)))*+)(,(([a-zA-Z]([a-zA-Z]|[0-9]|-|;)*+)|(0|([1-9]([0-9])*+))(\\.(0|([1-9]([0-9])*+)))*+))*+$</adm:regex>
-          <adm:usage>Syntax:
-          className:attributeName[,attributeName]
-          or
-          *:attributeName[,attributeName]
-          Note that any class (className) or attribute (attributeName) definition can be replaced with its OID definition.
-          Examples:
-          - inetOrgPerson:uid,employeeNumber : 'uid' and 'employeeNumber' attributes of any entry of type 'inetOrgPerson' class.
-          This can also be 2.16.840.1.113730.3.2.2:0.9.2342.19200300.100.1.1,2.16.840.1.113730.3.1.3 or a mix.
-          - *:description : the 'description' attribute of any entry that has this attribute.
-          This can also be *:2.5.4.13
-          </adm:usage>
+          <adm:usage>OC:AT[,...,AT]</adm:usage>
           <adm:synopsis>
-            Defines attribute(s) of one particular class or of all possible
-            classes, to include in the replication.
+            The name of one or more attribute types in the named object class to
+            be included. The object class may be "*" indicating that the
+            attribute type(s) should be included regardless of the type of entry
+            they belong to.
           </adm:synopsis>
         </adm:pattern>
       </adm:string>
@@ -446,20 +438,12 @@
           This can be read as: (oid|\*):oid(,oid)*+
           -->
           <adm:regex>^((([a-zA-Z]([a-zA-Z]|[0-9]|-|;)*+)|(0|([1-9]([0-9])*+))(\\.(0|([1-9]([0-9])*+)))*+)|\\*):(([a-zA-Z]([a-zA-Z]|[0-9]|-|;)*+)|(0|([1-9]([0-9])*+))(\\.(0|([1-9]([0-9])*+)))*+)(,(([a-zA-Z]([a-zA-Z]|[0-9]|-|;)*+)|(0|([1-9]([0-9])*+))(\\.(0|([1-9]([0-9])*+)))*+))*+$</adm:regex>
-          <adm:usage>Syntax:
-          className:attributeName[,attributeName]
-          or
-          *:attributeName[,attributeName].
-          Note that any class (className) or attribute (attributeName) definition can be replaced with its OID definition.
-          Examples:
-          inetOrgPerson:photo,jpegPhoto : 'photo' and 'jpegPhoto' attributes of any entry of type 'inetOrgPerson' class.
-          This can also be 2.16.840.1.113730.3.2.2:0.9.2342.19200300.100.1.7,0.9.2342.19200300.100.1.60 or a mix.
-          *:jpegPhoto : the 'jpegPhoto' attribute of any entry that has this attribute.
-          This can also be *:0.9.2342.19200300.100.1.60
-          </adm:usage>
+          <adm:usage>OC:AT[,...,AT]</adm:usage>
           <adm:synopsis>
-            Defines attribute(s) of one particular class or of all possible
-            classes, to exclude from the replication.
+            The name of one or more attribute types in the named object class to
+            be excluded. The object class may be "*" indicating that the
+            attribute type(s) should be excluded regardless of the type of entry
+            they belong to.
           </adm:synopsis>
         </adm:pattern>
       </adm:string>

--
Gitblit v1.10.0