From b817e98a44b4cb6fad25d61d734f032e35725f95 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Tue, 21 Jan 2014 15:14:09 +0200
Subject: [PATCH] INT-3249: property-placeholder for log-c-a Level

JIRA: https://jira.springsource.org/browse/INT-3249
---
 .../config/xml/spring-integration-4.0.xsd     | 20 ++++++++++-------
 ...ggingChannelAdapterParserTests-context.xml | 22 ++++++++++++++-----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.0.xsd
index fc0b35b653..354dba7c77 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.0.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.0.xsd
@@ -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>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
index f5c6804e81..fc8b4d1f4d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
@@ -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"/>