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/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
index 85f5935..6aaf943 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
@@ -61,7 +61,7 @@
<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>
@@ -89,7 +89,7 @@
<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>
@@ -104,7 +104,7 @@
<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>
@@ -127,7 +127,7 @@
<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>
--
Gitblit v1.10.0