diff --git a/org.springframework.integration.jdbc/.classpath b/org.springframework.integration.jdbc/.classpath
index 1788a36a3e..bb4ac60998 100644
--- a/org.springframework.integration.jdbc/.classpath
+++ b/org.springframework.integration.jdbc/.classpath
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.springframework.integration.jdbc/pom.xml b/org.springframework.integration.jdbc/pom.xml
index a672d5f455..b37145ea65 100644
--- a/org.springframework.integration.jdbc/pom.xml
+++ b/org.springframework.integration.jdbc/pom.xml
@@ -49,6 +49,12 @@
       		<artifactId>derby</artifactId>
       		<version>10.5.3.0_1</version>
       		<scope>test</scope>
+    	</dependency>
+		<dependency>
+      		<groupId>hsqldb</groupId>
+      		<artifactId>hsqldb</artifactId>
+      		<version>1.8.0.7</version>
+      		<scope>test</scope>
     	</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
diff --git a/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java b/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java
index 676d68eac0..ea1b44f14e 100644
--- a/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java
+++ b/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java
@@ -23,6 +23,7 @@ import javax.sql.DataSource;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageSource;
+import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.simple.SimpleJdbcOperations;
@@ -66,14 +67,14 @@ public class JdbcPollingChannelAdapter implements MessageSource<Object> {
 	}
 
 	/**
-	 * Constructor taking {@link SimpleJdbcOperations} instance to use for query
+	 * Constructor taking {@link JdbcOperations} instance to use for query
 	 * execution and the select query to execute to retrieve new rows.
 	 * 
 	 * @param jdbcOperations instance to use for query execution
 	 * @param selectQuery query to execute
 	 */
-	public JdbcPollingChannelAdapter(SimpleJdbcOperations jdbcOperations, String selectQuery) {
-		this.jdbcOperations = jdbcOperations;
+	public JdbcPollingChannelAdapter(JdbcOperations jdbcOperations, String selectQuery) {
+		this.jdbcOperations = new SimpleJdbcTemplate(jdbcOperations);
 		this.selectQuery = selectQuery;
 	}
 
diff --git a/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java b/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java
index 9e591632b1..5980984e71 100644
--- a/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java
+++ b/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java
@@ -22,12 +22,14 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa
  * Namespace handler for the integration JDBC schema.
  * 
  * @author Jonas Partner
+ * @author Dave Syer
  * @since 2.0
  */
 public class JdbcNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		registerBeanDefinitionParser("inbound-channel-adapter", new JdbcPollingChannelAdapterParser());
+		registerBeanDefinitionParser("message-store", new JdbcMessageStoreParser());
 	}
 
 }
diff --git a/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParser.java b/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParser.java
index 53c3002aa9..a7af5a5d71 100644
--- a/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParser.java
+++ b/org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParser.java
@@ -16,8 +16,6 @@
 
 package org.springframework.integration.jdbc.config;
 
-import org.w3c.dom.Element;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
@@ -25,6 +23,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
 
 /**
  * Parser for {@link org.springframework.integration.jdbc.JdbcPollingChannelAdapter}.
@@ -48,7 +47,7 @@ public class JdbcPollingChannelAdapterParser extends AbstractPollingInboundChann
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder
 				.genericBeanDefinition("org.springframework.integration.jdbc.JdbcPollingChannelAdapter");
 		String dataSourceRef = element.getAttribute("data-source");
-		String simpleJdbcOperationsRef = element.getAttribute("simple-jdbc-operations");
+		String simpleJdbcOperationsRef = element.getAttribute("jdbc-operations");
 		boolean refToDataSourceSet = StringUtils.hasText(dataSourceRef);
 		boolean refToSimpleJdbcOperaitonsSet = StringUtils.hasText(simpleJdbcOperationsRef);
 		if ((refToDataSourceSet && refToSimpleJdbcOperaitonsSet)
diff --git a/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
index 9a204a9ed2..2347807bbe 100644
--- a/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
+++ b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/integration/jdbc"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:tool="http://www.springframework.org/schema/tool"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	targetNamespace="http://www.springframework.org/schema/integration/jdbc"
@@ -14,21 +13,102 @@
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
-	Defines the configuration elements for Spring Integration's JDBC adapters.
+	Defines the configuration elements for Spring Integration's JDBC components.
 		]]></xsd:documentation>
 	</xsd:annotation>
 
+	<xsd:element name="message-store">
+		<xsd:annotation>
+			<xsd:documentation>
+				Defines a MessageStore (and MessageGroupStore)
+				backed by a database.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="beans:identifiedType">
+					<xsd:attribute name="data-source" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation>
+								Reference to a data source to use to access
+								the database. Either this or the simple-jdbc-operations must be
+								specified (but not both).
+							</xsd:documentation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="javax.sql.DataSource" />
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="jdbc-operations" type="xsd:string">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<xsd:documentation>
+									Reference to a JdbcOperations. Either
+									this or the data-source must be
+									specified (but not both).
+								</xsd:documentation>
+								<tool:annotation kind="ref">
+									<tool:expected-type
+										type="org.springframework.jdbc.core.simple.SimpleJdbcOperations" />
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="region" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation>
+								Unique string to use as a partition for the
+								data in this store, so that
+								multiple instances can share the same
+								database tables. The default
+								is "DEFAULT".
+					</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="table-prefix" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation>
+								Prefix for the table names in the database
+								(e.g. so that a schema can be specified, or to avoid a clash
+								with
+								other tables). The default is "INT_".
+					</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="lob-handler" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+							Reference to a lob handler (optional).  Only override if using Oracle and
+							the database type is not being detected for some reason.
+							]]></xsd:documentation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type
+										type="org.springframework.jdbc.support.lob.LobHandler" />
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
 	<xsd:element name="inbound-channel-adapter">
 		<xsd:annotation>
 			<xsd:documentation>
-	Defines an inbound Channel Adapter for polling a database.
+				Defines an inbound Channel Adapter for polling a
+				database.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
+				<xsd:element ref="integration:poller" minOccurs="0"
+					maxOccurs="1" />
 			</xsd:sequence>
-			<xsd:attribute name="simple-jdbc-operations" type="xsd:string">
+			<xsd:attribute name="jdbc-operations" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -52,14 +132,14 @@
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type
-								type="org.springframework.jdbc.core.RowMapper" />
+							<tool:expected-type type="org.springframework.jdbc.core.RowMapper" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="update" type="xsd:string" />
-			<xsd:attribute name="update-per-row" type="xsd:boolean" default="false" />
+			<xsd:attribute name="update-per-row" type="xsd:boolean"
+				default="false" />
 			<xsd:attribute name="channel" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:appinfo>
diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml
index d4d0c1c033..6afe749d12 100644
--- a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml
+++ b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml
@@ -12,7 +12,7 @@
 		<si:queue />
 	</si:channel>
 
-	<jdbc:embedded-database type="DERBY" id="dataSource">
+	<jdbc:embedded-database type="HSQL" id="dataSource">
 		<jdbc:script location="org/springframework/integration/jdbc/config/inboundSchema.sql" />
 	</jdbc:embedded-database>
 	
diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml
index 490971acca..764e696ac7 100644
--- a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml
+++ b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml
@@ -11,7 +11,7 @@
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
 	<inbound-channel-adapter query="select * from item where status=2" channel="target" 
-		data-source="dataSource" update="update item set status =10 where id in (:idList)" />
+		data-source="dataSource" update="update item set status=10 where id in (:idList)" />
 
 	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />