diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java index d4e9b19ef3..6cb07401e3 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -99,6 +101,8 @@ public class InitializeDatabaseBeanDefinitionParser extends AbstractBeanDefiniti public static class SortedResourcesFactoryBean implements FactoryBean { + private static final Log logger = LogFactory.getLog(SortedResourcesFactoryBean.class); + private ResourceLoader resourceLoader; private List locations; @@ -111,6 +115,11 @@ public class InitializeDatabaseBeanDefinitionParser extends AbstractBeanDefiniti public Resource[] getObject() throws Exception { List scripts = new ArrayList(); for (String location : locations) { + + if (logger.isDebugEnabled()) { + logger.debug("Adding resources from pattern: "+location); + } + if (resourceLoader instanceof ResourcePatternResolver) { List resources = new ArrayList(Arrays .asList(((ResourcePatternResolver) resourceLoader).getResources(location))); @@ -126,9 +135,11 @@ public class InitializeDatabaseBeanDefinitionParser extends AbstractBeanDefiniti for (Resource resource : resources) { scripts.add(resource); } + } else { scripts.add(resourceLoader.getResource(location)); } + } return scripts.toArray(new Resource[scripts.size()]); } diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml b/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml index b03490899d..4a6f48300b 100644 --- a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml +++ b/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml @@ -9,7 +9,7 @@ - + diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml b/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml index 474e1479d5..78fa0b8017 100644 --- a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml +++ b/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml @@ -16,7 +16,7 @@ schema.scripts=classpath:org/springframework/jdbc/config/db-schema.sql - insert.scripts=classpath:org/springframework/jdbc/config/*-data.sql + insert.scripts=classpath*:org/springframework/jdbc/config/*-data.sql data.source.init=true