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/LDAPConnectionHandlerConfiguration.xml | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
index 2e877fb..97bc100 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
@@ -40,13 +40,12 @@
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.14</ldap:oid>
<ldap:name>ds-cfg-ldap-connection-handler</ldap:name>
<ldap:superior>ds-cfg-connection-handler</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property-override name="java-implementation-class">
+ <adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
<adm:value>
@@ -62,11 +61,11 @@
<adm:property-reference name="ssl-cert-nickname" />
- <adm:property-reference name="key-manager-provider-dn" />
+ <adm:property-reference name="key-manager-provider" />
- <adm:property-reference name="trust-manager-provider-dn" />
+ <adm:property-reference name="trust-manager-provider" />
- <adm:property name="listen-addresses" multi-valued="true">
+ <adm:property name="listen-address" multi-valued="true">
<adm:synopsis>
Specifies the address or set of addresses on which this
<adm:user-friendly-name />
@@ -91,7 +90,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.56</ldap:oid>
<ldap:name>ds-cfg-listen-address</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -118,8 +116,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.7</ldap:oid>
- <ldap:name>ds-cfg-allow-ldapv2</ldap:name>
+ <ldap:name>ds-cfg-allow-ldap-v2</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -146,7 +143,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.47</ldap:oid>
<ldap:name>ds-cfg-keep-stats</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -178,8 +174,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.138</ldap:oid>
- <ldap:name>ds-cfg-use-tcp-keepalive</ldap:name>
+ <ldap:name>ds-cfg-use-tcp-keep-alive</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -210,8 +205,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.139</ldap:oid>
- <ldap:name>ds-cfg-use-tcp-nodelay</ldap:name>
+ <ldap:name>ds-cfg-use-tcp-no-delay</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -243,7 +237,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.9</ldap:oid>
<ldap:name>ds-cfg-allow-tcp-reuse-address</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -270,7 +263,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.114</ldap:oid>
<ldap:name>ds-cfg-send-rejection-notice</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -300,7 +292,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.67</ldap:oid>
<ldap:name>ds-cfg-max-request-size</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -334,7 +325,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.72</ldap:oid>
<ldap:name>ds-cfg-num-request-handlers</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -364,7 +354,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.8</ldap:oid>
<ldap:name>ds-cfg-allow-start-tls</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -414,7 +403,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.119</ldap:oid>
<ldap:name>ds-cfg-ssl-client-auth-policy</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -449,13 +437,12 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.153</ldap:oid>
<ldap:name>ds-cfg-accept-backlog</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="ssl-protocols" multi-valued="true">
+ <adm:property name="ssl-protocol" multi-valued="true">
<adm:synopsis>
Specifies the names of the SSL protocols that will be allowed for
use in SSL or StartTLS communication.
@@ -482,13 +469,12 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.461</ldap:oid>
<ldap:name>ds-cfg-ssl-protocol</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="ssl-cipher-suites" multi-valued="true">
+ <adm:property name="ssl-cipher-suite" multi-valued="true">
<adm:synopsis>
Specifies the names of the SSL cipher suites that will be allowed
for use in SSL or StartTLS communication.
@@ -515,7 +501,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.462</ldap:oid>
<ldap:name>ds-cfg-ssl-cipher-suite</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -540,7 +525,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.486</ldap:oid>
<ldap:name>ds-cfg-max-blocked-write-time-limit</ldap:name>
</ldap:attribute>
</adm:profile>
--
Gitblit v1.10.0