From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/admin/defn/org/opends/server/admin/std/VirtualAttributeConfiguration.xml | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 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 b7ba8f2..5529537 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
@@ -39,13 +39,12 @@
<adm:tag name="core"/>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.91</ldap:oid>
<ldap:name>ds-cfg-virtual-attribute</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property name="provider-class" mandatory="true">
+ <adm:property name="java-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
<adm:user-friendly-name />
@@ -60,8 +59,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.325</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-class</ldap:name>
+ <ldap:name>ds-cfg-java-class</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -77,8 +75,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.326</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-enabled</ldap:name>
+ <ldap:name>ds-cfg-enabled</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -93,8 +90,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.327</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-type</ldap:name>
+ <ldap:name>ds-cfg-attribute-type</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -118,8 +114,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.328</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-base-dn</ldap:name>
+ <ldap:name>ds-cfg-base-dn</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -142,8 +137,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.329</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-group-dn</ldap:name>
+ <ldap:name>ds-cfg-group-dn</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -163,8 +157,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.330</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-filter</ldap:name>
+ <ldap:name>ds-cfg-filter</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -203,9 +196,8 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.331</ldap:oid>
- <ldap:name>ds-cfg-virtual-attribute-conflict-behavior</ldap:name>
+ <ldap:name>ds-cfg-conflict-behavior</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
-</adm:managed-object>
\ No newline at end of file
+</adm:managed-object>
--
Gitblit v1.10.0