derby embedded db support initial commit; shutdown use case needs work

org.springframework.jdbc/.classpath

@@ -17,5 +17,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-sources-1.8.0.9.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.h2database/com.springsource.org.h2/1.0.71/com.springsource.org.h2-1.0.71.jar" sourcepath="/IVY_CACHE/com.h2database/com.springsource.org.h2/1.0.71/com.springsource.org.h2-sources-1.0.71.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-10.5.1000001.764942.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.springframework.jdbc/ivy.xml

@@ -32,6 +32,7 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="optional->compile"/>
 		<dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
+		<dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" />
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>

org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.jdbc.datasource.embedded;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLNonTransientConnectionException;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+import org.springframework.util.ClassUtils;
+
+/**
+ * {@link EmbeddedDatabaseConfigurer} for Apache Derby database.
+ * 
+ * @author Oliver Gierke
+ */
+public class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigurer {
+
+	private static final Log logger = LogFactory.getLog(DerbyEmbeddedDatabaseConfigurer.class);
+	
+	private static final String URL_TEMPLATE = "jdbc:derby:memory:%s;%s";
+
+	// Error codes that indicate successful shutdown
+	private static final String SHUTDOWN_CODE = "08006";
+
+	private static DerbyEmbeddedDatabaseConfigurer INSTANCE;
+
+	private DerbyEmbeddedDatabaseConfigurer() {
+	}
+
+	/**
+	 * Get the singleton {@link HsqlEmbeddedDatabaseConfigurer} instance.
+	 * @return the configurer
+	 * @throws ClassNotFoundException if HSQL is not on the classpath
+	 */
+	public static synchronized DerbyEmbeddedDatabaseConfigurer getInstance() throws ClassNotFoundException {
+		if (INSTANCE == null) {
+			ClassUtils.forName("org.apache.derby.jdbc.EmbeddedDriver", DerbyEmbeddedDatabaseConfigurer.class
+					.getClassLoader());
+			INSTANCE = new DerbyEmbeddedDatabaseConfigurer();
+		}
+		return INSTANCE;
+	}
+
+	public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
+		properties.setDriverClass(org.apache.derby.jdbc.EmbeddedDriver.class);
+		properties.setUrl(String.format(URL_TEMPLATE, databaseName, "create=true"));
+		properties.setUsername("sa");
+		properties.setPassword("");
+	}
+
+	@Override
+	public void shutdown(DataSource dataSource, String databaseName) {
+		Connection connection = null;
+		try {
+			SimpleDriverDataSource shutdownDataSource = new SimpleDriverDataSource();
+			shutdownDataSource.setDriverClass(EmbeddedDriver.class);
+			shutdownDataSource.setUrl(String.format(URL_TEMPLATE, databaseName, "shutdown=true"));
+			connection = shutdownDataSource.getConnection();
+		} catch (SQLException e) {
+			if (e instanceof SQLNonTransientConnectionException) {
+				SQLNonTransientConnectionException ex = (SQLNonTransientConnectionException) e;
+				if (!SHUTDOWN_CODE.equals(ex.getSQLState())) {
+					logException(e);
+				}
+			} else {
+				logException(e);
+			}
+		} finally {
+			JdbcUtils.closeConnection(connection);
+		}
+	}
+
+	private void logException(SQLException e) {
+		if (logger.isWarnEnabled()) {
+			logger.warn("Could not shutdown in-memory Derby database", e);
+		}
+	}
+}

org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java

@@ -33,6 +33,8 @@ final class EmbeddedDatabaseConfigurerFactory {
 				return HsqlEmbeddedDatabaseConfigurer.getInstance();
 			case H2:
 				return H2EmbeddedDatabaseConfigurer.getInstance();
+			case DERBY:
+				return DerbyEmbeddedDatabaseConfigurer.getInstance();
 			default:
 				throw new UnsupportedOperationException("Other embedded database types not yet supported");
 			}
@@ -41,7 +43,7 @@ final class EmbeddedDatabaseConfigurerFactory {
 					+ "] are not available in the classpath", e);
 		}
 	}
-	
+
 	private EmbeddedDatabaseConfigurerFactory() {
 	}
 

org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java

@@ -21,5 +21,5 @@ package org.springframework.jdbc.datasource.embedded;
  * @author Oliver Gierke
  */
 public enum EmbeddedDatabaseType {
-	HSQL, H2;
+	HSQL, H2, DERBY;
 }

org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd

@@ -33,10 +33,10 @@
 							</xsd:annotation>	
 						</xsd:element>
 					</xsd:sequence>
-					<xsd:attribute name="type" type="databaseType">
+					<xsd:attribute name="type" type="databaseType" default="HSQL">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
-			The type of embedded database to create, such as HSQL or H2.
+			The type of embedded database to create, such as HSQL, H2 or Derby. Defaults to HSQL.
 							]]></xsd:documentation>
 						</xsd:annotation>			
 					</xsd:attribute>
@@ -71,6 +71,13 @@
 					]]></xsd:documentation>
 				</xsd:annotation>	
 			</xsd:enumeration>
+			<xsd:enumeration value="DERBY">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+			Derby Java Database Engine
+					]]></xsd:documentation>
+				</xsd:annotation>	
+			</xsd:enumeration>
 		</xsd:restriction>
 	</xsd:simpleType>
 

org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTest.java

@@ -15,7 +15,9 @@ public class JdbcNamespaceIntegrationTest {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/jdbc/config/jdbc-config.xml");
 		assertCorrectSetup(context.getBean("dataSource", DataSource.class));
-		assertCorrectSetup(context.getBean("h2dataSource", DataSource.class));
+		assertCorrectSetup(context.getBean("h2DataSource", DataSource.class));
+		assertCorrectSetup(context.getBean("derbyDataSource", DataSource.class));
+		context.close();
 	}
 
 	private void assertCorrectSetup(DataSource dataSource) {

org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java

@@ -1,8 +1,11 @@
 package org.springframework.jdbc.datasource.embedded;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-import static org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType.*;
+import static org.junit.Assert.fail;
+import static org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType.DERBY;
+import static org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType.H2;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.jdbc.core.JdbcTemplate;
 
@@ -28,6 +31,15 @@ public class EmbeddedDatabaseBuilderTests {
 		assertDatabaseCreatedAndShutdown(db);
 	}
 
+	@Test
+	@Ignore
+	public void testBuildDerby() {
+		// TODO this fails when the whole suite runs b/c tables are not cleaned up
+		EmbeddedDatabaseBuilder builder = EmbeddedDatabaseBuilder.relativeTo(getClass());
+		EmbeddedDatabase db = builder.type(DERBY).script("db-schema-derby.sql").script("db-test-data.sql").build();
+		assertDatabaseCreatedAndShutdown(db);
+	}
+
 	@Test
 	public void testBuildNoSuchScript() {
 		try {

org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml

@@ -10,9 +10,14 @@
 		<jdbc:script location="classpath:org/springframework/jdbc/datasource/embedded/db-test-data.sql"/>
 	</jdbc:embedded-database>
 	
-	<jdbc:embedded-database id="h2dataSource" type="H2">
+	<jdbc:embedded-database id="h2DataSource" type="H2">
 		<jdbc:script location="classpath:org/springframework/jdbc/datasource/embedded/db-schema.sql"/>
 		<jdbc:script location="classpath:org/springframework/jdbc/datasource/embedded/db-test-data.sql"/>
 	</jdbc:embedded-database>
 	
+	<jdbc:embedded-database id="derbyDataSource" type="DERBY">
+		<jdbc:script location="classpath:org/springframework/jdbc/datasource/embedded/db-schema-derby.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/datasource/embedded/db-test-data.sql"/>
+	</jdbc:embedded-database>
+	
 </beans>

org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql

@@ -0,0 +1 @@
+create table T_TEST (NAME varchar(50) not null);