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/VirtualAttributeConfiguration.xml |  122 +++++++++++++++++++---------------------
 1 files changed, 57 insertions(+), 65 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 5529537..7f2309c 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
@@ -1,49 +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="virtual-attribute"
-plural-name="virtual-attributes"
-package="org.opends.server.admin.std"
-xmlns:adm="http://www.opends.org/admin"
-xmlns:ldap="http://www.opends.org/admin-ldap">
+  plural-name="virtual-attributes" package="org.opends.server.admin.std"
+  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 dynamically generating attribute values that appear in
-    entries but are not persistently stored in the backend.
+    are responsible for dynamically generating attribute values which
+    appear in entries but are not persistently stored in the backend.
   </adm:synopsis>
-  <adm:tag name="core"/>
+  <adm:tag name="core" />
   <adm:profile name="ldap">
     <ldap:object-class>
       <ldap:name>ds-cfg-virtual-attribute</ldap:name>
       <ldap:superior>top</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
@@ -63,7 +60,6 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
   <adm:property name="enabled" mandatory="true">
     <adm:synopsis>
       Indicate whether the
@@ -79,11 +75,10 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
   <adm:property name="attribute-type" mandatory="true">
     <adm:synopsis>
-      Specifies the attribute type for the attribute whose values should be
-      dynamically assigned by the virtual attribute.
+      Specifies the attribute type for the attribute whose values should
+      be dynamically assigned by the virtual attribute.
     </adm:synopsis>
     <adm:syntax>
       <adm:attribute-type />
@@ -94,18 +89,17 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
-  <adm:property name="base-dn" mandatory="false" multi-valued="true">
+  <adm:property name="base-dn" multi-valued="true">
     <adm:synopsis>
-      Specifies the base DNs for the branches containing entries that may be
-      eligible to use this virtual attribute.
+      Specifies the base DNs for the branches containing entries that
+      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 will not be taken into account
-          when determining whether an entry is eligible to use this virtual
-          attribute.
+          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>
       </adm:alias>
     </adm:default-behavior>
@@ -118,17 +112,17 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
-  <adm:property name="group-dn" mandatory="false" multi-valued="true">
+  <adm:property name="group-dn" multi-valued="true">
     <adm:synopsis>
-      Specifies the DNs for the groups whose members may be eligible to use this
-      virtual attribute.
+      Specifies the DNs of the groups whose members may be eligible to
+      use this virtual attribute.
     </adm:synopsis>
     <adm:default-behavior>
       <adm:alias>
         <adm:synopsis>
-          Group membership will not be taken into account when determining
-          whether an entry is eligible to use this virtual attribute.
+          Group membership will not be taken into account when
+          determining whether an entry is eligible to use this virtual
+          attribute.
         </adm:synopsis>
       </adm:alias>
     </adm:default-behavior>
@@ -141,11 +135,10 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
-  <adm:property name="filter" mandatory="false" multi-valued="true">
+  <adm:property name="filter" multi-valued="true">
     <adm:synopsis>
-      Specifies the search filters for entries that may be eligible to use this
-      virtual attribute.
+      Specifies the search filters for entries that may be eligible to
+      use this virtual attribute.
     </adm:synopsis>
     <adm:default-behavior>
       <adm:defined>
@@ -161,11 +154,10 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
-  <adm:property name="conflict-behavior" mandatory="false">
+  <adm:property name="conflict-behavior">
     <adm:synopsis>
-      Specifies the behavior that the server should exhibit for entries that
-      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>
@@ -176,20 +168,20 @@
       <adm:enumeration>
         <adm:value name="real-overrides-virtual">
           <adm:synopsis>
-            Any real values contained in the entry should be preserved and
-            virtual values should not be 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>
-            Any real values contained in the entry should be suppressed and
-            virtual values should be generated.
+            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>
-            Any real values contained in the entry should be preserved and
-            merged with the set of generated virtual values.
+            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