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/ConnectionHandlerConfiguration.xml | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml
index fca0c80..379e7bc 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml
@@ -43,7 +43,6 @@
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.13</ldap:oid>
<ldap:name>ds-cfg-connection-handler</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
@@ -60,13 +59,12 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.24</ldap:oid>
- <ldap:name>ds-cfg-connection-handler-enabled</ldap:name>
+ <ldap:name>ds-cfg-enabled</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="java-implementation-class" mandatory="true" advanced="true">
+ <adm:property name="java-class" mandatory="true" advanced="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
<adm:user-friendly-name />
@@ -81,13 +79,12 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.23</ldap:oid>
- <ldap:name>ds-cfg-connection-handler-class</ldap:name>
+ <ldap:name>ds-cfg-java-class</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="allowed-clients" multi-valued="true">
+ <adm:property name="allowed-client" multi-valued="true">
<adm:synopsis>
This property specifies a set of address masks that may be used to
determine the addresses of the clients that are allowed to
@@ -112,13 +109,12 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.6</ldap:oid>
<ldap:name>ds-cfg-allowed-client</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="denied-clients" multi-valued="true">
+ <adm:property name="denied-client" multi-valued="true">
<adm:synopsis>
This property specifies a set of address masks that may be used to
determine the addresses of the clients that are not allowed to
@@ -146,7 +142,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.32</ldap:oid>
<ldap:name>ds-cfg-denied-client</ldap:name>
</ldap:attribute>
</adm:profile>
--
Gitblit v1.10.0