From e555bb332dec342beea7291a4b9710ca24b25dbe Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 02 Sep 2007 20:19:52 +0000
Subject: [PATCH] Update the configuration definitions for several virtual attribute implementations to provide default values for the conflict-behavior property.
---
opends/src/admin/defn/org/opends/server/admin/std/NumSubordinatesVirtualAttributeConfiguration.xml | 10 +++++
opends/src/admin/defn/org/opends/server/admin/std/EntryUUIDVirtualAttributeConfiguration.xml | 10 +++++
opends/src/admin/defn/org/opends/server/admin/std/MemberVirtualAttributeConfiguration.xml | 22 +++++++++--
opends/src/admin/defn/org/opends/server/admin/std/IsMemberOfVirtualAttributeConfiguration.xml | 10 +++++
opends/src/admin/defn/org/opends/server/admin/std/SubschemaSubentryVirtualAttributeConfiguration.xml | 10 +++++
opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml | 10 +++++
opends/src/admin/defn/org/opends/server/admin/std/EntryDNVirtualAttributeConfiguration.xml | 10 +++++
7 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/EntryDNVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/EntryDNVirtualAttributeConfiguration.xml
index a7ad9e4..a8eee55 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/EntryDNVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/EntryDNVirtualAttributeConfiguration.xml
@@ -58,5 +58,15 @@
</adm:default-behavior>
</adm:property-override>
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ virtual-overrides-real
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
</adm:managed-object>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/EntryUUIDVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/EntryUUIDVirtualAttributeConfiguration.xml
index 91250c3..7c85142 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/EntryUUIDVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/EntryUUIDVirtualAttributeConfiguration.xml
@@ -60,5 +60,15 @@
</adm:default-behavior>
</adm:property-override>
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ real-overrides-virtual
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
</adm:managed-object>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml
index 17b9e5c..50d4b32 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml
@@ -57,5 +57,15 @@
</adm:default-behavior>
</adm:property-override>
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ virtual-overrides-real
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
</adm:managed-object>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/IsMemberOfVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/IsMemberOfVirtualAttributeConfiguration.xml
index 1effab1..d14e026 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/IsMemberOfVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/IsMemberOfVirtualAttributeConfiguration.xml
@@ -57,5 +57,15 @@
</adm:default-behavior>
</adm:property-override>
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ virtual-overrides-real
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
</adm:managed-object>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/MemberVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/MemberVirtualAttributeConfiguration.xml
index 270cd89..428ab9a 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/MemberVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/MemberVirtualAttributeConfiguration.xml
@@ -27,10 +27,11 @@
! -->
<adm:managed-object name="member-virtual-attribute"
-plural-name="user-defined-virtual-attributes"
-package="org.opends.server.admin.std" extends="virtual-attribute"
-xmlns:adm="http://www.opends.org/admin"
-xmlns:ldap="http://www.opends.org/admin-ldap">
+ plural-name="user-defined-virtual-attributes"
+ package="org.opends.server.admin.std" extends="virtual-attribute"
+ xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
@@ -40,6 +41,7 @@
looks like a static group but obtains all of its membership from a dynamic
group (or some other type of group, including another static group).
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.101</ldap:oid>
@@ -47,6 +49,7 @@
<ldap:superior>ds-cfg-virtual-attribute</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="provider-class">
<adm:default-behavior>
<adm:defined>
@@ -56,6 +59,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="allow-retrieving-membership" mandatory="true">
<adm:synopsis>
Indicates whether to handle requests that request all values for the
@@ -74,5 +78,15 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ virtual-overrides-real
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
</adm:managed-object>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/NumSubordinatesVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/NumSubordinatesVirtualAttributeConfiguration.xml
index 6c4f051..cedbbf1 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/NumSubordinatesVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/NumSubordinatesVirtualAttributeConfiguration.xml
@@ -57,5 +57,15 @@
</adm:default-behavior>
</adm:property-override>
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ virtual-overrides-real
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
</adm:managed-object>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/SubschemaSubentryVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/SubschemaSubentryVirtualAttributeConfiguration.xml
index d8fb2f8..48f5207 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/SubschemaSubentryVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/SubschemaSubentryVirtualAttributeConfiguration.xml
@@ -57,5 +57,15 @@
</adm:default-behavior>
</adm:property-override>
+ <adm:property-override name="conflict-behavior">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ virtual-overrides-real
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
</adm:managed-object>
--
Gitblit v1.10.0