revised embedded database support

Author: jhoeller

org.springframework.core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java

@@ -0,0 +1,75 @@
+/*
+ * 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.core.io;
+
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link ResourceLoader} implementation that interprets plain resource paths
+ * as relative to a given <code>java.lang.Class</code>.
+ *
+ * @author Juergen Hoeller
+ * @since 3.0
+ * @see java.lang.Class#getResource(String)
+ * @see ClassPathResource#ClassPathResource(String, Class)
+ */
+public class ClassRelativeResourceLoader extends DefaultResourceLoader {
+
+	private final Class clazz;
+
+
+	/**
+	 * Create a new ClassRelativeResourceLoader for the given class.
+	 * @param clazz the class to load resources through
+	 */
+	public ClassRelativeResourceLoader(Class clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		this.clazz = clazz;
+		setClassLoader(clazz.getClassLoader());
+	}
+
+	protected Resource getResourceByPath(String path) {
+		return new ClassRelativeContextResource(path, this.clazz);
+	}
+
+
+	/**
+	 * ClassPathResource that explicitly expresses a context-relative path
+	 * through implementing the ContextResource interface.
+	 */
+	private static class ClassRelativeContextResource extends ClassPathResource implements ContextResource {
+
+		private final Class clazz;
+
+		public ClassRelativeContextResource(String path, Class clazz) {
+			super(path, clazz);
+			this.clazz = clazz;
+		}
+
+		public String getPathWithinContext() {
+			return getPath();
+		}
+
+		@Override
+		public Resource createRelative(String relativePath) {
+			String pathToUse = StringUtils.applyRelativePath(getPath(), relativePath);
+			return new ClassRelativeContextResource(pathToUse, this.clazz);
+		}
+	}
+
+}

org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
@@ -107,8 +107,8 @@ public SimpleDriverDataSource(Driver driver, String url, Properties conProps) {
 	 * within the SimpleDriverDataSource.
 	 * @see #setDriver
 	 */
-	public void setDriverClass(Class driverClass) {
-		this.driver = (Driver) BeanUtils.instantiateClass(driverClass);
+	public void setDriverClass(Class<? extends Driver> driverClass) {
+		this.driver = BeanUtils.instantiateClass(driverClass);
 	}
 
 	/**

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

@@ -13,38 +13,39 @@
  * 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.Statement;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Base class for {@link EmbeddedDatabaseConfigurer} implementations providing common shutdown behaviour.
+ * Base class for {@link EmbeddedDatabaseConfigurer} implementations providing common shutdown behavior.
+ *
  * @author Oliver Gierke
+ * @author Juergen Hoeller
  * @since 3.0
  */
 abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigurer {
 
-	private static final Log logger = LogFactory.getLog(AbstractEmbeddedDatabaseConfigurer.class);
+	protected final Log logger = LogFactory.getLog(getClass());
 
 	public void shutdown(DataSource dataSource, String databaseName) {
-		Connection connection = JdbcUtils.getConnection(dataSource);
-		Statement stmt = null;
 		try {
-			stmt = connection.createStatement();
+			Connection connection = dataSource.getConnection();
+			Statement stmt = connection.createStatement();
 			stmt.execute("SHUTDOWN");
-		} catch (SQLException e) {
+		}
+		catch (SQLException ex) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Could not shutdown embedded database", e);
+				logger.warn("Could not shutdown embedded database", ex);
 			}
-		} finally {
-			JdbcUtils.closeStatement(stmt);
 		}
 	}
+
 }

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

@@ -13,26 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.jdbc.datasource.embedded;
 
 import org.springframework.core.io.support.EncodedResource;
 
 /**
  * Thrown by {@link ResourceDatabasePopulator} if one of its SQL scripts could
  * not be read during population.
+ *
  * @author Keith Donald
  * @since 3.0
  */
-@SuppressWarnings("serial")
 public class CannotReadScriptException extends RuntimeException {
 
 	/**
-	 * Creates a new cannot read script exception.
-	 * 
+	 * Constructor a new CannotReadScriptException.
 	 * @param resource the resource that could not be read from
 	 * @param cause the underlying cause of the resource access failure
 	 */
 	public CannotReadScriptException(EncodedResource resource, Throwable cause) {
 		super("Cannot read SQL script from " + resource, cause);
 	}
+
 }

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

@@ -13,38 +13,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.jdbc.datasource.embedded;
 
+import java.sql.Driver;
+
 /**
  * DataSourceFactory helper that allows essential JDBC connection properties to be configured consistently,
  * independent of the actual DataSource implementation.
+ *
  * @author Keith Donald
  * @since 3.0
  * @see DataSourceFactory
  */
 public interface ConnectionProperties {
-	
+
 	/**
 	 * Set the JDBC driver to use to connect to the database.
 	 * @param driverClass the jdbc driver class
 	 */
-	void setDriverClass(Class<?> driverClass);
-	
+	void setDriverClass(Class driverClass);
+
 	/**
 	 * Sets the JDBC connection URL of the database.
 	 * @param url the connection url
 	 */
 	void setUrl(String url);
-	
+
 	/**
 	 * Sets the username to use to connect to the database.
 	 * @param username the username
 	 */
 	void setUsername(String username);
-	
+
 	/**
 	 * Sets the password to use to connect to the database.
 	 * @param password the password
 	 */
 	void setPassword(String password);
+
 }

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

@@ -13,28 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.jdbc.datasource.embedded;
 
 import javax.sql.DataSource;
 
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 
 /**
- * Encapsulates the creation of a particular DataSource implementation, such as a {@link SimpleDriverDataSource} or connection pool such as Apache DBCP or c3p0.
- * Call {@link #getConnectionProperties()} to configure normalized DataSource properties before calling {@link #getDataSource()} to actually get the configured DataSource instance.
+ * Encapsulates the creation of a particular DataSource implementation, such as a
+ * {@link SimpleDriverDataSource} or connection pool such as Apache DBCP or C3P0.
+ *
+ * <p>Call {@link #getConnectionProperties()} to configure normalized DataSource properties
+ * before calling {@link #getDataSource()} to actually get the configured DataSource instance.
+ *
  * @author Keith Donald
  * @since 3.0
  */
 public interface DataSourceFactory {
-	
+
 	/**
 	 * Allows properties of the DataSource to be configured.
 	 */
 	ConnectionProperties getConnectionProperties();
-	
+
 	/**
 	 * Returns the DataSource with the connection properties applied.
 	 */
 	DataSource getDataSource();
-	
+
 }

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

@@ -13,13 +13,15 @@
  * 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;
 
 /**
  * Strategy used to populate an embedded database during initialization.
+ *
  * @author Keith Donald
  * @since 3.0
  * @see ResourceDatabasePopulator
@@ -32,4 +34,5 @@ public interface DatabasePopulator {
 	 * @throws SQLException if an unrecoverable data access exception occurs during database population
 	 */
 	void populate(Connection connection) throws SQLException;
-}
+
+}