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

INT-3249: property-placeholder for log-c-a Level

Browse Source 
JIRA: https://jira.springsource.org/browse/INT-3249
This commit is contained in:
Artem Bilan
2014-01-21 15:14:09 +02:00
committed by Gary Russell
parent e6d6bf04e2
commit b817e98a44
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.0.xsd
View File

@@ -969,14 +969,7 @@
]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="FATAL" />
<xsd:enumeration value="ERROR" />
<xsd:enumeration value="WARN" />
<xsd:enumeration value="INFO" />
<xsd:enumeration value="DEBUG" />
<xsd:enumeration value="TRACE" />
</xsd:restriction>
<xsd:union memberTypes="loggingLevel xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="logger-name" type="xsd:string">
@@ -4169,4 +4162,15 @@ default is 0. Values can be negative. See SmartLifeCycle.
</xsd:attribute>
</xsd:attributeGroup>
<xsd:simpleType name="loggingLevel">
<xsd:restriction base="xsd:token">
<xsd:enumeration value="FATAL" />
<xsd:enumeration value="ERROR" />
<xsd:enumeration value="WARN" />
<xsd:enumeration value="INFO" />
<xsd:enumeration value="DEBUG" />
<xsd:enumeration value="TRACE" />
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>

22
spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
View File

@@ -1,16 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd">
http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
<util:properties id="props">
<beans:prop key="logging.level">WARN</beans:prop>
</util:properties>
<context:property-placeholder properties-ref="props"/>
<logging-channel-adapter id="logger"
logger-name="org.springframework.integration.test.logger"
order="1"
level="WARN"
level="${logging.level}"
log-full-message="true"/>
<logging-channel-adapter id="loggerWithExpression" expression="payload.foo"/>