From f5d6e0480b0aa63636101c098268bfec1830e3c3 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Tue, 27 Jul 2010 00:29:20 +0000
Subject: [PATCH] INT-1269 Missing using-direct-buffers Attribute

---
 .../ip/config/spring-integration-ip-2.0.xsd            | 10 +++++++++-
 .../integration/ip/config/ParserUnitTests-context.xml  |  2 ++
 .../integration/ip/config/ParserUnitTests.java         |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
index 7e89fe622d..b4285f4a04 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
@@ -285,7 +285,7 @@ connections.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="using-nio" type="xsd:string">
+			<xsd:attribute name="using-nio" type="xsd:string" default="false">
 				<xsd:annotation>
 					<xsd:documentation>
 If true, the factory will use java.nio.channel.SocketChannel for communication; 
@@ -301,6 +301,14 @@ performance and may use fewer threads.
 			<xsd:attribute name="so-tcp-no-delay" type="xsd:string" />
 			<xsd:attribute name="so-timeout" type="xsd:string" />
 			<xsd:attribute name="so-traffic-class" type="xsd:string" />
+			<xsd:attribute name="using-direct-buffers" type="xsd:string" default="false">
+				<xsd:annotation>
+					<xsd:documentation>
+If true, instructs the factory to use direct buffers if possible; only applies if
+using-nio is true. Refer to ByteBuffer javadocs for more information.		
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>			
 			<xsd:attribute name="single-use" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
index 4572195901..024d34a439 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
@@ -296,6 +296,7 @@
 		single-use="true"
 		task-executor="externalTE"
 		pool-size="321"		
+		using-direct-buffers="true"
 	/>
 	
 	<ip:tcp-connection-factory
@@ -316,6 +317,7 @@
 		single-use="true"
 		task-executor="externalTE"
 		pool-size="123"
+		using-direct-buffers="true"
 	/>
 	
 	<bean id="serial" class="org.springframework.commons.serializer.JavaSerializationConverter" />
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
index b7dcf846e6..d66c203002 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
@@ -435,6 +435,7 @@ public class ParserUnitTests {
 		assertEquals(true, dfa.getPropertyValue("singleUse"));
 		assertSame(taskExecutor, dfa.getPropertyValue("taskExecutor"));
 		assertEquals(321, dfa.getPropertyValue("poolSize"));
+		assertEquals(true, dfa.getPropertyValue("usingDirectBuffers"));
 	}
 
 	@Test
@@ -453,6 +454,7 @@ public class ParserUnitTests {
 		assertEquals(true, dfa.getPropertyValue("singleUse"));
 		assertSame(taskExecutor, dfa.getPropertyValue("taskExecutor"));
 		assertEquals(123, dfa.getPropertyValue("poolSize"));
+		assertEquals(true, dfa.getPropertyValue("usingDirectBuffers"));		
 	}
 
 	@Test