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/ReplicationServerConfiguration.xml | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
index 6a391d7..81e4af8 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
@@ -39,9 +39,8 @@
<adm:tag name="replication"/>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.65</ldap:oid>
<ldap:name>
- ds-cfg-replication-server-config
+ ds-cfg-replication-server
</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
@@ -75,7 +74,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.160</ldap:oid>
<ldap:name>ds-cfg-replication-server</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -96,7 +94,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.278</ldap:oid>
<ldap:name>ds-cfg-replication-server-id</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -117,7 +114,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.288</ldap:oid>
<ldap:name>ds-cfg-window-size</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -138,8 +134,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.290</ldap:oid>
- <ldap:name>ds-cfg-replication-max-queue-size</ldap:name>
+ <ldap:name>ds-cfg-queue-size</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -158,7 +153,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.306</ldap:oid>
<ldap:name>ds-cfg-replication-db-directory</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -179,7 +173,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.319</ldap:oid>
<ldap:name>ds-cfg-replication-purge-delay</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -200,9 +193,8 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.158</ldap:oid>
- <ldap:name>ds-cfg-replication-server-port</ldap:name>
+ <ldap:name>ds-cfg-replication-port</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
-</adm:managed-object>
\ No newline at end of file
+</adm:managed-object>
--
Gitblit v1.10.0