Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Context namespace exposes null-value attribute for property-placeholder element

Browse Source 
Issue: SPR-13461
This commit is contained in:
Juergen Hoeller
2015-09-21 20:47:03 +02:00
parent b23c23279b
commit fbce18418a
6 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd
View File

@@ -19,7 +19,7 @@
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType name="propertyPlaceholder">
<xsd:complexType name="propertyLoading">
<xsd:attribute name="location" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[
@@ -112,7 +112,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="propertyPlaceholder">
<xsd:extension base="propertyLoading">
<xsd:attribute name="system-properties-mode" default="ENVIRONMENT">
<xsd:annotation>
<xsd:documentation><![CDATA[
@@ -144,6 +144,14 @@
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="null-value">
<xsd:annotation>
<xsd:documentation><![CDATA[
A value that should be treated as {@code null} when resolved as a placeholder value:
e.g. "" (empty String) or "null". By default, no such null value is defined.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -163,7 +171,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="propertyPlaceholder"/>
<xsd:extension base="propertyLoading"/>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>