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

Add proper default values for 'merge' attributes in collection elements (SPR-7656)

This commit is contained in:
Chris Beams 2010-10-15 07:56:02 +00:00
parent a25e4d794e
commit c7aaa85ef6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd
View File

@ -864,7 +864,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="listOrSetType">
<xsd:attribute name="merge" type="defaultable-boolean">
<xsd:attribute name="merge" default="default" type="defaultable-boolean">
<xsd:annotation>
<xsd:documentation><![CDATA[
Enables/disables merging for collections when using parent/child beans.
@ -887,7 +887,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="listOrSetType">
<xsd:attribute name="merge" type="defaultable-boolean">
<xsd:attribute name="merge" default="default" type="defaultable-boolean">
<xsd:annotation>
<xsd:documentation><![CDATA[
Enables/disables merging for collections when using parent/child beans.
@ -908,7 +908,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="listOrSetType">
<xsd:attribute name="merge" type="defaultable-boolean">
<xsd:attribute name="merge" default="default" type="defaultable-boolean">
<xsd:annotation>
<xsd:documentation><![CDATA[
Enables/disables merging for collections when using parent/child beans.
@ -929,7 +929,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="mapType">
<xsd:attribute name="merge" type="defaultable-boolean">
<xsd:attribute name="merge" default="default" type="defaultable-boolean">
<xsd:annotation>
<xsd:documentation><![CDATA[
Enables/disables merging for collections when using parent/child beans.
@ -960,7 +960,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="propsType">
<xsd:attribute name="merge" type="defaultable-boolean">
<xsd:attribute name="merge" default="default" type="defaultable-boolean">
<xsd:annotation>
<xsd:documentation><![CDATA[
Enables/disables merging for collections when using parent/child beans.