From 5833fe40996c75adcf1e116104ffe6169c4866e6 Mon Sep 17 00:00:00 2001
From: rhaggard <rhaggard@localhost>
Date: Fri, 01 Feb 2008 18:37:01 +0000
Subject: [PATCH] Uncommitting last changes to configuration .xml files, second try
---
opends/src/admin/defn/org/opends/server/admin/std/VirtualAttributeConfiguration.xml | 68 ++++++++++-----------------------
1 files changed, 21 insertions(+), 47 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/VirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/VirtualAttributeConfiguration.xml
index bc19f89..dfa217e 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/VirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/VirtualAttributeConfiguration.xml
@@ -32,10 +32,8 @@
xmlns:cli="http://www.opends.org/admin-cli">
<adm:synopsis>
<adm:user-friendly-plural-name />
- are responsible for dynamically generating attribute values that
+ are responsible for dynamically generating attribute values which
appear in entries but are not persistently stored in the backend.
- Virtual attributes are associated with a virtual attribute
- provider, which contains the logic for generating the value.
</adm:synopsis>
<adm:tag name="core" />
<adm:profile name="ldap">
@@ -49,12 +47,10 @@
</adm:profile>
<adm:property name="java-class" mandatory="true">
<adm:synopsis>
- Specifies the fully-qualified name of the virtual attribute
- provider class that generates the attribute values.
+ The fully-qualified name of the Java class that provides the
+ <adm:user-friendly-name />
+ implementation.
</adm:synopsis>
- <adm:requires-admin-action>
- <adm:component-restart />
- </adm:requires-admin-action>
<adm:syntax>
<adm:java-class>
<adm:instance-of>
@@ -70,7 +66,7 @@
</adm:property>
<adm:property name="enabled" mandatory="true">
<adm:synopsis>
- Indicates whether the
+ Indicate whether the
<adm:user-friendly-name />
is enabled for use.
</adm:synopsis>
@@ -85,7 +81,7 @@
</adm:property>
<adm:property name="attribute-type" mandatory="true">
<adm:synopsis>
- Specifies the attribute type for the attribute whose values are to
+ Specifies the attribute type for the attribute whose values should
be dynamically assigned by the virtual attribute.
</adm:synopsis>
<adm:syntax>
@@ -100,14 +96,12 @@
<adm:property name="base-dn" multi-valued="true">
<adm:synopsis>
Specifies the base DNs for the branches containing entries that
- are eligible to use this virtual attribute.
- If no values are given, then the server generates virtual attributes
- anywhere in the server.
+ may be eligible to use this virtual attribute.
</adm:synopsis>
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- The location of the entry in the server is not taken into
+ The location of the entry in the server will not be taken into
account when determining whether an entry is eligible to use
this virtual attribute.
</adm:synopsis>
@@ -124,17 +118,13 @@
</adm:property>
<adm:property name="group-dn" multi-valued="true">
<adm:synopsis>
- Specifies the DNs of the groups whose members can be eligible to
+ Specifies the DNs of the groups whose members may be eligible to
use this virtual attribute.
- If no values are given, then group
- membership is not taken into account when generating the virtual
- attribute. If one or more group DNs are specified, then only
- members of those groups are allowed to have the virtual attribute.
</adm:synopsis>
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- Group membership is not taken into account when
+ Group membership will not be taken into account when
determining whether an entry is eligible to use this virtual
attribute.
</adm:synopsis>
@@ -151,12 +141,8 @@
</adm:property>
<adm:property name="filter" multi-valued="true">
<adm:synopsis>
- Specifies the search filters to be applied against entries to
- determine if the virtual attribute is to be generated for those
- entries. If no values are given, then any entry is eligible to
- have the value generated. If one or more filters are specified,
- then only entries that match at least one of those filters are
- allowed to have the virtual attribute.
+ Specifies the search filters for entries that may be eligible to
+ use this virtual attribute.
</adm:synopsis>
<adm:default-behavior>
<adm:defined>
@@ -164,15 +150,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:string>
- <adm:pattern>
- <adm:regex />
- <adm:usage>STRING</adm:usage>
- <adm:synopsis>
- Any valid search filter string.
- </adm:synopsis>
- </adm:pattern>
- </adm:string>
+ <adm:string />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -182,9 +160,8 @@
</adm:property>
<adm:property name="conflict-behavior">
<adm:synopsis>
- Specifies the behavior that the server is to exhibit for entries
- that already contain one or more real values for the associated
- attribute.
+ Specifies the behavior that the server should exhibit for entries
+ that contain one or more real values for the associated attribute.
</adm:synopsis>
<adm:default-behavior>
<adm:defined>
@@ -195,23 +172,20 @@
<adm:enumeration>
<adm:value name="real-overrides-virtual">
<adm:synopsis>
- Indicates that any real values contained in the entry are
- preserved and used, and virtual values are not generated.
+ Any real values contained in the entry should be preserved
+ and virtual values should not be generated.
</adm:synopsis>
</adm:value>
<adm:value name="virtual-overrides-real">
<adm:synopsis>
- Indicates that the virtual attribute provider suppresses
- any real values contained in the entry
- and generates virtual values and uses them.
+ Any real values contained in the entry should be suppressed
+ and virtual values should be generated.
</adm:synopsis>
</adm:value>
<adm:value name="merge-real-and-virtual">
<adm:synopsis>
- Indicates that the virtual attribute provider
- is to preserve any real values contained in the entry
- and merge them with the set of generated virtual values
- so that both the real and virtual values are used.
+ Any real values contained in the entry should be preserved
+ and merged with the set of generated virtual values.
</adm:synopsis>
</adm:value>
</adm:enumeration>
--
Gitblit v1.10.0