root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[SPR-6523] Commented all paragraphs (i.e., for list, map, and set) related to collection merging with the util namespace until this issue has been addressed.

This commit is contained in:
Sam Brannen 2010-03-27 19:10:54 +00:00
parent 351e72b6e2
commit a827ab88b1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-framework-reference/src/xsd-configuration.xml
View File

@ -362,10 +362,12 @@ public class Client {
</util:list>]]></programlisting> </util:list>]]></programlisting>
<para>If no <literal>'list-class'</literal> attribute is supplied, a <para>If no <literal>'list-class'</literal> attribute is supplied, a
<interfacename>List</interfacename> implementation will be chosen by the container.</para> <interfacename>List</interfacename> implementation will be chosen by the container.</para>
<!-- Commented out until SPR-6523 is resolved.
<para>Finally, you can also control the merging behavior using the <para>Finally, you can also control the merging behavior using the
<literal>'merge'</literal> attribute of the <literal>&lt;util:list/&gt;</literal> <literal>'merge'</literal> attribute of the <literal>&lt;util:list/&gt;</literal>
element; collection merging is described in more detail in element; collection merging is described in more detail in
<xref linkend="beans-collection-elements-merging"/>.</para> <xref linkend="beans-collection-elements-merging"/>.</para>
-->
</section> </section>
<section id="xsd-config-body-schemas-util-map"> <section id="xsd-config-body-schemas-util-map">
<title><literal>&lt;util:map/&gt;</literal></title> <title><literal>&lt;util:map/&gt;</literal></title>
@ -407,10 +409,12 @@ public class Client {
</util:map>]]></programlisting> </util:map>]]></programlisting>
<para>If no <literal>'map-class'</literal> attribute is supplied, a <para>If no <literal>'map-class'</literal> attribute is supplied, a
<interfacename>Map</interfacename> implementation will be chosen by the container.</para> <interfacename>Map</interfacename> implementation will be chosen by the container.</para>
<!-- Commented out until SPR-6523 is resolved.
<para>Finally, you can also control the merging behavior using the <para>Finally, you can also control the merging behavior using the
<literal>'merge'</literal> attribute of the <literal>&lt;util:map/&gt;</literal> <literal>'merge'</literal> attribute of the <literal>&lt;util:map/&gt;</literal>
element; collection merging is described in more detail in element; collection merging is described in more detail in
<xref linkend="beans-collection-elements-merging"/>.</para> <xref linkend="beans-collection-elements-merging"/>.</para>
-->
</section> </section>
<section id="xsd-config-body-schemas-util-set"> <section id="xsd-config-body-schemas-util-set">
<title><literal>&lt;util:set/&gt;</literal></title> <title><literal>&lt;util:set/&gt;</literal></title>
@ -452,10 +456,12 @@ public class Client {
</util:set>]]></programlisting> </util:set>]]></programlisting>
<para>If no <literal>'set-class'</literal> attribute is supplied, a <para>If no <literal>'set-class'</literal> attribute is supplied, a
<interfacename>Set</interfacename> implementation will be chosen by the container.</para> <interfacename>Set</interfacename> implementation will be chosen by the container.</para>
<!-- Commented out until SPR-6523 is resolved.
<para>Finally, you can also control the merging behavior using the <para>Finally, you can also control the merging behavior using the
<literal>'merge'</literal> attribute of the <literal>&lt;util:set/&gt;</literal> <literal>'merge'</literal> attribute of the <literal>&lt;util:set/&gt;</literal>
element; collection merging is described in more detail in element; collection merging is described in more detail in
<xref linkend="beans-collection-elements-merging"/>.</para> <xref linkend="beans-collection-elements-merging"/>.</para>
-->
</section> </section>
</section> </section>
<section id="xsd-config-body-schemas-jee"> <section id="xsd-config-body-schemas-jee">