From d2cfd7b07ee679c563bbc53b00e6c81d5feb3f30 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 18 Sep 2007 15:27:50 +0000
Subject: [PATCH] Modify the aggregation definition support to permit multiple source "enabled" boolean properties. This is useful in components such as the LDAP connection handler where the referenced key/trust manager must be enabled only if the connection handler is enabled and if it is using SSL.
---
opends/resource/admin/admin.xsd | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/opends/resource/admin/admin.xsd b/opends/resource/admin/admin.xsd
index 7be0679..f959740 100644
--- a/opends/resource/admin/admin.xsd
+++ b/opends/resource/admin/admin.xsd
@@ -1035,6 +1035,53 @@
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="source-enabled-property-name"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+ The optional boolean "enabled" property in the
+ aggregating managed object. When this property is
+ true, the "target-enabled-property-name" in the
+ aggregated managed objects must also be true. The
+ "target-enabled-property-name" attribute must be
+ specified when this attribute is defined.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:attribute name="name" type="tns:name-type"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The name of the source property.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="target-enabled-property-name"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The optional boolean "enabled" property in the
+ aggregated managed objects. This property must not be
+ false while the aggregated managed object is
+ referenced. This attribute must be defined when the
+ "source-enabled-property-name" attribute is specified.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:attribute name="name" type="tns:name-type"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The name of the target property.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
<xsd:attribute name="parent-path" type="tns:path-type"
use="required">
<xsd:annotation>
@@ -1072,31 +1119,6 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="source-enabled-property-name"
- type="tns:name-type" use="optional">
- <xsd:annotation>
- <xsd:documentation>
- The optional boolean "enabled" property in the
- aggregating managed object. When this property is true,
- the "target-enabled-property-name" in the aggregated
- managed objects must also be true. The
- "target-enabled-property-name" attribute must be
- specified when this attribute is defined.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="target-enabled-property-name"
- type="tns:name-type" use="optional">
- <xsd:annotation>
- <xsd:documentation>
- The optional boolean "enabled" property in the
- aggregated managed objects. This property must not be
- false while the aggregated managed object is referenced.
- This attribute must be defined when the
- "source-enabled-property-name" attribute is specified.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="attribute-type">
--
Gitblit v1.10.0