From 624376e2050b31eac9c4f07e254c4dc6f68e853b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 18 Dec 2008 09:25:02 +0000
Subject: [PATCH] Fix issue 3645: aggregation constraints are now correctly generated (regression introduced revision 3669)

---
 opends/resource/admin/property-types/aggregation.xsl |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opends/resource/admin/property-types/aggregation.xsl b/opends/resource/admin/property-types/aggregation.xsl
index 221b16e..ff399ab 100644
--- a/opends/resource/admin/property-types/aggregation.xsl
+++ b/opends/resource/admin/property-types/aggregation.xsl
@@ -45,10 +45,10 @@
     <xsl:if test="../../@multi-valued = 'true'">
       <import>java.util.TreeSet</import>
     </xsl:if>
-    <xsl:if test="adm:target-needs-enabling-condition">
+    <xsl:if test="adm:constraint/adm:target-needs-enabling-condition">
       <import>org.opends.server.admin.condition.Conditions</import>
     </xsl:if>
-    <xsl:if test="adm:target-is-enabled-condition">
+    <xsl:if test="adm:constraint/adm:target-is-enabled-condition">
       <import>org.opends.server.admin.condition.Conditions</import>
     </xsl:if>
     <import>
@@ -92,18 +92,18 @@
     <xsl:value-of
       select="concat('      builder.setRelationDefinition(&quot;',
                      normalize-space(@relation-name), '&quot;);&#xa;')" />
-    <xsl:if test="adm:target-needs-enabling-condition">
+    <xsl:if test="adm:constraint/adm:target-needs-enabling-condition">
       <xsl:value-of
         select="'      builder.setTargetNeedsEnablingCondition('" />
       <xsl:apply-templates
-        select="adm:target-needs-enabling-condition/*"
+        select="adm:constraint/adm:target-needs-enabling-condition/*"
         mode="compile-condition" />
       <xsl:value-of select="');&#xa;'" />
     </xsl:if>
-    <xsl:if test="adm:target-is-enabled-condition">
+    <xsl:if test="adm:constraint/adm:target-is-enabled-condition">
       <xsl:value-of
         select="'      builder.setTargetIsEnabledCondition('" />
-      <xsl:apply-templates select="adm:target-is-enabled-condition/*"
+      <xsl:apply-templates select="adm:constraint/adm:target-is-enabled-condition/*"
         mode="compile-condition" />
       <xsl:value-of select="');&#xa;'" />
     </xsl:if>

--
Gitblit v1.10.0