From a052caad0008ede711b0c43d9955eccc3bb858ba 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.
---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/Package.xml | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/Package.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/Package.xml
index dade79b..88d87ba 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/Package.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/Package.xml
@@ -48,7 +48,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.57</ldap:oid>
<ldap:name>ds-cfg-listen-port</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -77,7 +76,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.137</ldap:oid>
<ldap:name>ds-cfg-use-ssl</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -108,7 +106,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.120</ldap:oid>
<ldap:name>ds-cfg-ssl-cert-nickname</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -137,7 +134,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.51</ldap:oid>
<ldap:name>ds-cfg-key-store-pin</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -168,7 +164,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.54</ldap:oid>
<ldap:name>ds-cfg-key-store-pin-property</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -198,7 +193,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.52</ldap:oid>
<ldap:name>ds-cfg-key-store-pin-environment-variable</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -229,17 +223,14 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.53</ldap:oid>
<ldap:name>ds-cfg-key-store-pin-file</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="key-manager-provider-dn">
+ <adm:property name="key-manager-provider">
<adm:synopsis>
- Specifies the DN of the configuration entry for the key manager
- provider that should be used with this
- <adm:user-friendly-name />
- .
+ Specifies the name of the key manager that should be used
+ with this <adm:user-friendly-name />.
</adm:synopsis>
<adm:requires-admin-action>
<adm:none>
@@ -254,14 +245,15 @@
<adm:undefined />
</adm:default-behavior>
<adm:syntax>
- <adm:dn>
- <adm:base>cn=key manager providers,cn=config</adm:base>
- </adm:dn>
+ <adm:aggregation relation-name="key-manager-provider" parent-path="/">
+ <adm:source-enabled-property-name name="enabled" />
+ <adm:source-enabled-property-name name="use-ssl" />
+ <adm:target-enabled-property-name name="enabled" />
+ </adm:aggregation>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.310</ldap:oid>
- <ldap:name>ds-cfg-key-manager-provider-dn</ldap:name>
+ <ldap:name>ds-cfg-key-manager-provider</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -289,7 +281,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.130</ldap:oid>
<ldap:name>ds-cfg-trust-store-pin</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -320,7 +311,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.133</ldap:oid>
<ldap:name>ds-cfg-trust-store-pin-property</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -350,7 +340,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.131</ldap:oid>
<ldap:name>ds-cfg-trust-store-pin-environment-variable</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -381,17 +370,14 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.132</ldap:oid>
<ldap:name>ds-cfg-trust-store-pin-file</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="trust-manager-provider-dn">
+ <adm:property name="trust-manager-provider">
<adm:synopsis>
- Specifies the DN of the configuration entry for the trust manager
- provider that should be used with this
- <adm:user-friendly-name />
- .
+ Specifies the name of the trust manager that should be used with
+ this <adm:user-friendly-name />.
</adm:synopsis>
<adm:requires-admin-action>
<adm:none>
@@ -406,14 +392,15 @@
<adm:undefined />
</adm:default-behavior>
<adm:syntax>
- <adm:dn>
- <adm:base>cn=trust manager providers,cn=config</adm:base>
- </adm:dn>
+ <adm:aggregation relation-name="trust-manager-provider" parent-path="/">
+ <adm:source-enabled-property-name name="enabled" />
+ <adm:source-enabled-property-name name="use-ssl" />
+ <adm:target-enabled-property-name name="enabled" />
+ </adm:aggregation>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.311</ldap:oid>
- <ldap:name>ds-cfg-trust-manager-provider-dn</ldap:name>
+ <ldap:name>ds-cfg-trust-manager-provider</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -431,7 +418,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.43</ldap:oid>
<ldap:name>ds-cfg-include-filter</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -450,7 +436,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.38</ldap:oid>
<ldap:name>ds-cfg-exclude-filter</ldap:name>
</ldap:attribute>
</adm:profile>
--
Gitblit v1.10.0