INT-3379 - Allow Placeholders for Enums

JIRA: https://jira.spring.io/browse/INT-3379

Change enumerated attributes to a union with xsd:string
to allow placeholders.

JMS and XML deferred to 4.1 due to the amount of
changes needed to the parsers. See INT-3384.

spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd

@@ -684,15 +684,13 @@ standard headers to also be mapped.
 		<xsd:attribute name="acknowledge-mode">
 			<xsd:annotation>
 				<xsd:documentation>
-	Acknowledge Mode for the MessageListenerContainer.
+	Acknowledge Mode for the MessageListenerContainer; default 'AUTO'
+	meaning the adapter automatically acknowledges the message(s)
+	according to the tx-size.
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="AUTO"/>
-					<xsd:enumeration value="MANUAL"/>
-					<xsd:enumeration value="NONE"/>
-				</xsd:restriction>
+				<xsd:union memberTypes="ackModeEnumeration xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="advice-chain" type="xsd:string">
@@ -826,4 +824,12 @@ standard headers to also be mapped.
 		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:attributeGroup>
 
+	<xsd:simpleType name="ackModeEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="AUTO"/>
+			<xsd:enumeration value="MANUAL"/>
+			<xsd:enumeration value="NONE"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
 </xsd:schema>

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml

@@ -4,15 +4,25 @@
 	xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<prop key="ackMode">NONE</prop>
+	</util:properties>
 
 	<amqp:inbound-channel-adapter id="rabbitInbound" queue-names="inboundchanneladapter.test.1"/>
 
 	<amqp:inbound-channel-adapter id="autoStartFalse" queue-names="inboundchanneladapter.test.2"
-		auto-startup="false" phase="123"/>
+		auto-startup="false" phase="123" acknowledge-mode="${ackMode}"/>
 		
 	<amqp:inbound-channel-adapter id="withHeaderMapperStandardAndCustomHeaders" channel="requestChannel" queue-names="inboundchanneladapter.test.2"
 		auto-startup="false" phase="123"

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java

@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.amqp.core.MessageProperties;
@@ -67,6 +68,7 @@ public class AmqpInboundChannelAdapterParserTests {
 		Object adapter = context.getBean("autoStartFalse.adapter");
 		assertEquals(Boolean.FALSE, TestUtils.getPropertyValue(adapter, "autoStartup"));
 		assertEquals(123, TestUtils.getPropertyValue(adapter, "phase"));
+		assertEquals(AcknowledgeMode.NONE, TestUtils.getPropertyValue(adapter, "messageListenerContainer.acknowledgeMode"));
 	}
 
 	@Test

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

@@ -334,28 +334,7 @@
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="round-robin">
-						<xsd:annotation>
-							<xsd:documentation>
-								[DEFAULT] Defines a Round Robin dispatching strategy which allows
-								load balancing of messages
-								between multiple Message Handlers. Which
-								message
-								handler receives the message first is determined by the 'order'
-								attribute
-								of such Message Handler.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="none">
-						<xsd:annotation>
-							<xsd:documentation>
-								No LoadBalancingStrategy will be used.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-				</xsd:restriction>
+				<xsd:union memberTypes="loadBalancerEnumeration xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="failover" type="xsd:string">
@@ -404,6 +383,31 @@
 		<xsd:attributeGroup ref="subscribersAttributeGroup" />
 	</xsd:complexType>
 
+	<xsd:simpleType name="loadBalancerEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="round-robin">
+				<xsd:annotation>
+					<xsd:documentation>
+						[DEFAULT] Defines a Round Robin dispatching strategy which allows
+						load balancing of messages
+						between multiple Message Handlers. Which
+						message
+						handler receives the message first is determined by the 'order'
+						attribute
+						of such Message Handler.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="none">
+				<xsd:annotation>
+					<xsd:documentation>
+						No LoadBalancingStrategy will be used.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
+
 	<xsd:element name="publish-subscribe-channel">
 		<xsd:annotation>
 			<xsd:documentation>
@@ -1751,10 +1755,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="MILLISECONDS" />
-					<xsd:enumeration value="SECONDS" />
-				</xsd:restriction>
+				<xsd:union memberTypes="timeUnitEnumeration xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="cron" type="xsd:string">
@@ -1793,6 +1794,13 @@
 		</xsd:attribute>
 	</xsd:complexType>
 
+	<xsd:simpleType name="timeUnitEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="MILLISECONDS" />
+			<xsd:enumeration value="SECONDS" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
 	<xsd:element name="selector-chain">
 		<xsd:complexType>
 			<xsd:annotation>
@@ -1812,17 +1820,21 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 				<xsd:simpleType>
-					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="ALL" />
-						<xsd:enumeration value="ANY" />
-						<xsd:enumeration value="MAJORITY" />
-						<xsd:enumeration value="MAJORITY_OR_TIE" />
-					</xsd:restriction>
+					<xsd:union memberTypes="votingStrategyEnumeration xsd:string"/>
 				</xsd:simpleType>
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
+	<xsd:simpleType name="votingStrategyEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="ALL" />
+			<xsd:enumeration value="ANY" />
+			<xsd:enumeration value="MAJORITY" />
+			<xsd:enumeration value="MAJORITY_OR_TIE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
 	<xsd:element name="selector">
 		<xsd:complexType>
 			<xsd:complexContent>
@@ -3687,15 +3699,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="REQUIRED" />
-					<xsd:enumeration value="SUPPORTS" />
-					<xsd:enumeration value="MANDATORY" />
-					<xsd:enumeration value="REQUIRES_NEW" />
-					<xsd:enumeration value="NOT_SUPPORTED" />
-					<xsd:enumeration value="NEVER" />
-					<xsd:enumeration value="NESTED" />
-				</xsd:restriction>
+				<xsd:union memberTypes="propagationEnumeration xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="isolation" default="DEFAULT">
@@ -3705,13 +3709,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="DEFAULT" />
-					<xsd:enumeration value="READ_UNCOMMITTED" />
-					<xsd:enumeration value="READ_COMMITTED" />
-					<xsd:enumeration value="REPEATABLE_READ" />
-					<xsd:enumeration value="SERIALIZABLE" />
-				</xsd:restriction>
+				<xsd:union memberTypes="isolationEnumeration xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="timeout" type="xsd:string" default="-1">
@@ -3743,6 +3741,28 @@
 		</xsd:attribute>
 	</xsd:complexType>
 
+	<xsd:simpleType name="propagationEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="REQUIRED" />
+			<xsd:enumeration value="SUPPORTS" />
+			<xsd:enumeration value="MANDATORY" />
+			<xsd:enumeration value="REQUIRES_NEW" />
+			<xsd:enumeration value="NOT_SUPPORTED" />
+			<xsd:enumeration value="NEVER" />
+			<xsd:enumeration value="NESTED" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="isolationEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="DEFAULT" />
+			<xsd:enumeration value="READ_UNCOMMITTED" />
+			<xsd:enumeration value="READ_COMMITTED" />
+			<xsd:enumeration value="REPEATABLE_READ" />
+			<xsd:enumeration value="SERIALIZABLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
 	<xsd:complexType name="pseudoTransactionalType">
 		<xsd:attributeGroup ref="transactionSyncAttributeGroup" />
 	</xsd:complexType>

spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml

@@ -2,13 +2,21 @@
 <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 http://www.springframework.org/schema/beans/spring-beans.xsd
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"
-	xmlns:util="http://www.springframework.org/schema/util">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<beans:prop key="failover">false</beans:prop>
+	</util:properties>
 
 	<channel id="noLoadBalancerNoFailover" >
-		<dispatcher load-balancer="none" failover="false"/>
+		<dispatcher load-balancer="none" failover="${failover}"/>
 	</channel>
 	<channel id="noLoadBalancerNoFailoverExecutor" >
 		<dispatcher load-balancer="none" failover="false" task-executor="taskExecutor"/>

spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml

@@ -2,17 +2,25 @@
 <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
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<beans:prop key="majority">MAJORITY</beans:prop>
+	</util:properties>
 
 	<selector-chain id="selectorChain">
 		<selector ref="selector1"/>
 		<selector ref="selector2"/>
 	</selector-chain>
 
-	<selector-chain id="nestedSelectorChain" voting-strategy="MAJORITY">
+	<selector-chain id="nestedSelectorChain" voting-strategy="${majority}">
 		<selector ref="selector1"/>
 		<selector-chain voting-strategy="ALL">
 			<selector ref="selector2"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml

@@ -2,11 +2,19 @@
 <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
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<poller id="poller" receive-timeout="1234" fixed-rate="5" time-unit="SECONDS"/>
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<beans:prop key="seconds">SECONDS</beans:prop>
+	</util:properties>
+
+	<poller id="poller" receive-timeout="1234" fixed-rate="5" time-unit="${seconds}"/>
 		
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml

@@ -2,10 +2,19 @@
 <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
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<beans:prop key="required">REQUIRED</beans:prop>
+		<beans:prop key="readCommitted">READ_COMMITTED</beans:prop>
+	</util:properties>
 
 	<channel id="input">
 		<queue capacity="1"/>
@@ -21,7 +30,7 @@
 	                   method="good"
                        output-channel="output">
         <poller max-messages-per-poll="1" fixed-delay="10000">
-        	<transactional transaction-manager="txManager" propagation="REQUIRED"/>
+        	<transactional transaction-manager="txManager" propagation="${required}" isolation="${readCommitted}"/>
         </poller>
     </service-activator>
 

spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.0.xsd

@@ -278,43 +278,7 @@
 							</xsd:documentation>
 						</xsd:annotation>
 						<xsd:simpleType>
-							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="LIST">
-									<xsd:annotation>
-										<xsd:documentation>
-											[DEFAULT] Redis List
-										</xsd:documentation>
-									</xsd:annotation>
-								</xsd:enumeration>
-								<xsd:enumeration value="SET">
-									<xsd:annotation>
-										<xsd:documentation>
-											Redis Set
-										</xsd:documentation>
-									</xsd:annotation>
-								</xsd:enumeration>
-								<xsd:enumeration value="ZSET">
-									<xsd:annotation>
-										<xsd:documentation>
-											Redis Sorted Set
-										</xsd:documentation>
-									</xsd:annotation>
-								</xsd:enumeration>
-								<xsd:enumeration value="MAP">
-									<xsd:annotation>
-										<xsd:documentation>
-											Redis Map
-										</xsd:documentation>
-									</xsd:annotation>
-								</xsd:enumeration>
-								<xsd:enumeration value="PROPERTIES">
-									<xsd:annotation>
-										<xsd:documentation>
-											Redis Properties
-										</xsd:documentation>
-									</xsd:annotation>
-								</xsd:enumeration>
-							</xsd:restriction>
+							<xsd:union memberTypes="redisTypeEnumeration xsd:string"/>
 						</xsd:simpleType>
 					</xsd:attribute>
 				</xsd:extension>
@@ -828,44 +792,49 @@
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="LIST">
-						<xsd:annotation>
-							<xsd:documentation>
-								[DEFAULT] Redis List
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="SET">
-						<xsd:annotation>
-							<xsd:documentation>
-								Redis Set
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="ZSET">
-						<xsd:annotation>
-							<xsd:documentation>
-								Redis Sorted Set
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="MAP">
-						<xsd:annotation>
-							<xsd:documentation>
-								Redis Map
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="PROPERTIES">
-						<xsd:annotation>
-							<xsd:documentation>
-								Redis Properties
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-				</xsd:restriction>
+				<xsd:union memberTypes="redisTypeEnumeration xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 	</xsd:attributeGroup>
+
+	<xsd:simpleType name="redisTypeEnumeration">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="LIST">
+				<xsd:annotation>
+					<xsd:documentation>
+						[DEFAULT] Redis List
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="SET">
+				<xsd:annotation>
+					<xsd:documentation>
+						Redis Set
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="ZSET">
+				<xsd:annotation>
+					<xsd:documentation>
+						Redis Sorted Set
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="MAP">
+				<xsd:annotation>
+					<xsd:documentation>
+						Redis Map
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="PROPERTIES">
+				<xsd:annotation>
+					<xsd:documentation>
+						Redis Properties
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
+
 </xsd:schema>

spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreInboundChannelAdapterParserTests-context.xml

@@ -3,9 +3,19 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-redis="http://www.springframework.org/schema/integration/redis"
-	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/redis http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/integration/redis http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder properties-ref="props" />
+
+	<util:properties id="props">
+		<prop key="collection.type">LIST</prop>
+	</util:properties>
 
 	<int-redis:store-inbound-channel-adapter id="withStringTemplate"
 											connection-factory="redisConnectionFactory"
@@ -29,7 +39,7 @@
 											channel="redisChannel"
 											auto-startup="false"
 											redis-template="redisTemplate"
-											collection-type="LIST">
+											collection-type="${collection.type}">
 		<int:poller fixed-rate="2000" max-messages-per-poll="10"/>
 	</int-redis:store-inbound-channel-adapter>
 

spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreOutboundChannelAdapterParserTests-context.xml

@@ -5,14 +5,22 @@
 	xmlns:int-redis="http://www.springframework.org/schema/integration/redis"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 		http://www.springframework.org/schema/integration/redis http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
+	<context:property-placeholder properties-ref="props" />
+
+	<util:properties id="props">
+		<prop key="collection.type">PROPERTIES</prop>
+	</util:properties>
+
 	<int-redis:store-outbound-channel-adapter id="withStringTemplate"
-											  collection-type="PROPERTIES"
+											  collection-type="${collection.type}"
 											  key="pepboys"
 											  auto-startup="false"/>
 

spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.0.xsd

@@ -72,11 +72,7 @@
 				]]></xsd:documentation>
 				</xsd:annotation>
 				<xsd:simpleType>
-					<xsd:restriction base="xsd:NMTOKEN">
-						<xsd:enumeration value="accept_all"/>
-						<xsd:enumeration value="manual"/>
-						<xsd:enumeration value="reject_all"/>
-					</xsd:restriction>
+					<xsd:union memberTypes="subscriptionModeEnumeration xsd:string"/>
 				</xsd:simpleType>
 			</xsd:attribute>
 			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup">
@@ -89,6 +85,14 @@
 		</xsd:complexType>
 	</xsd:element>
 
+	<xsd:simpleType name="subscriptionModeEnumeration">
+		<xsd:restriction base="xsd:NMTOKEN">
+			<xsd:enumeration value="accept_all"/>
+			<xsd:enumeration value="manual"/>
+			<xsd:enumeration value="reject_all"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
 	<xsd:element name="inbound-channel-adapter">
 		<xsd:annotation>
 			<xsd:documentation>

spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionParserTests-complete.xml

@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp">
+	xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<prop key="sub.mode">reject_all</prop>
+	</util:properties>
 
 	<int-xmpp:xmpp-connection id="connection" 
 							  user="happy.user" 
@@ -15,6 +25,6 @@
 							  resource="SpringSource"
 							  port="6222"
 							  service-name="foogle.com"
-							  subscription-mode="reject_all"/>
+							  subscription-mode="${sub.mode}"/>
 
 </beans>