Fix issue 1884: remove support for operand names in CLI profile.

matthew_swift

06.37.2007 1b4ff452e52e09a039acad0aa35efa336c93a7ec

Fix issue 1884: remove support for operand names in CLI profile.

 opends/resource/admin/admin-cli.xsd

@@ -45,24 +45,6 @@
          </xsd:complexType>
        </xsd:element>
      </xsd:sequence>
      <xsd:attribute name="operand-name" default="NAME">
        <xsd:annotation>
          <xsd:documentation>
            The operand name which should be used in command line usage
            to represent the name of the managed object associated with
            a one-to-many relation. For example, DB_NAME could be used
            to represent the name of a back-end. When the operand name
            is not specified for a relation, NAME is used by default. It
            is recommended that all one-to-many relations not defined in
            the root configuration override this default.
          </xsd:documentation>
        </xsd:annotation>
        <xsd:simpleType>
          <xsd:restriction base="xsd:token">
            <xsd:pattern value="[A-Z][A-Z0-9_]*" />
          </xsd:restriction>
        </xsd:simpleType>
      </xsd:attribute>
    </xsd:complexType>
  </xsd:element>
</xsd:schema>

 opends/resource/admin/cliMOProfile.xsl

@@ -52,31 +52,6 @@
        </xsl:if>
      </xsl:for-each>
      <xsl:value-of select="'&#xa;'" />
      <xsl:if test="adm:one-to-many">
        <!--
          Generate operand names for one-to-many relations.
        -->
        <xsl:variable name="operand">
          <xsl:choose>
            <xsl:when
              test="adm:profile[@name='cli']/cli:relation/@operand-name">
              <xsl:value-of
                select="adm:profile[@name='cli']/cli:relation/@operand-name" />
            </xsl:when>
            <xsl:otherwise>
              <xsl:if test="not($this-is-root)">
                <xsl:message>
                  <xsl:value-of
                    select="concat('relation ', @name, ' in managed object definition ', $this-name,' does not specify a CLI operand name, defaulting to NAME.')" />
                </xsl:message>
              </xsl:if>
              <xsl:value-of select="'NAME'" />
            </xsl:otherwise>
          </xsl:choose>
        </xsl:variable>
        <xsl:value-of
          select="concat('relation.', @name, '.operand-name=', $operand, '&#xa;')" />
      </xsl:if>
    </xsl:for-each>
  </xsl:template>
</xsl:stylesheet>

 opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml

@@ -24,9 +24,6 @@
      <ldap:naming-attribute>ds-cfg-debug-scope</ldap:naming-attribute>
    </adm:profile>
    <adm:profile name="cli">
      <cli:relation operand-name="TARGET" />
    </adm:profile>
    <adm:profile name="cli">
      <cli:relation>
        <cli:default-property name="debug-level" />
        <cli:default-property name="debug-category" />

 opends/src/admin/defn/org/opends/server/admin/std/MultimasterSynchronizationProviderConfiguration.xml

@@ -51,9 +51,6 @@
      <ldap:rdn-sequence>cn=domains</ldap:rdn-sequence>
    </adm:profile>
    <adm:profile name="cli">
      <cli:relation operand-name="DOMAIN" />
    </adm:profile>
    <adm:profile name="cli">
      <cli:relation>
        <cli:default-property name="server-id" />
        <cli:default-property name="replication-server" />