Fix issue 3645: aggregation constraints are now correctly generated (regres...

matthew_swift

18.25.2008 624376e2050b31eac9c4f07e254c4dc6f68e853b

Fix issue 3645: aggregation constraints are now correctly generated (regression introduced revision 3669)

 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>