From c774b2033e8d1f109bee0d5f022c292546356772 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.
---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml | 36 ++++++++++--------------------------
opendj-sdk/opends/src/admin/messages/ReplicationDomainCfgDefn.properties | 4 ++--
2 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
index c30c0e6..8c08015 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
+++ b/opendj-sdk/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>
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationDomainCfgDefn.properties b/opendj-sdk/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
index 3399a0c..00502ae 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
@@ -16,10 +16,10 @@
property.conflicts-historical-purge-delay.synopsis=This delay indicates the time (in minutes) the domain keeps the historical information necessary to solve conflicts.When a change stored in the historical part of the user entry has a date (from its replication ChangeNumber) older than this delay, it is candidate to be purged. The purge is applied on 2 events: modify of the entry, dedicated purge task.
property.fractional-exclude.synopsis=Allows to exclude some attributes to replicate to this server.
property.fractional-exclude.description=If fractional-exclude configuration attribute is used, attributes specified in this attribute will be ignored (not added/modified/deleted) when an operation performed from another directory server is being replayed in the local server. Note that the usage of this configuration attribute is mutually exclusive with the usage of the fractional-include attribute.
-property.fractional-exclude.syntax.string.pattern.synopsis=Defines attribute(s) of one particular class or of all possible classes, to exclude from the replication.
+property.fractional-exclude.syntax.string.pattern.synopsis=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.
property.fractional-include.synopsis=Allows to include some attributes to replicate to this server.
property.fractional-include.description=If fractional-include configuration attribute is used, only attributes specified in this attribute will be added/modified/deleted when an operation performed from another directory server is being replayed in the local server. Note that the usage of this configuration attribute is mutually exclusive with the usage of the fractional-exclude attribute.
-property.fractional-include.syntax.string.pattern.synopsis=Defines attribute(s) of one particular class or of all possible classes, to include in the replication.
+property.fractional-include.syntax.string.pattern.synopsis=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.
property.group-id.synopsis=The group ID associated with this replicated domain.
property.group-id.description=This value defines the group ID of the replicated domain. The replication system will preferably connect and send updates to replicate to a replication server with the same group ID as its own one (the local server group ID).
property.heartbeat-interval.synopsis=Specifies the heart-beat interval that the directory server will use when communicating with Replication Servers.
--
Gitblit v1.10.0