DATAJDBC-45 adding resolution of system properties for property file locations

Author: Thomas Risberg

spring-data-oracle-test/.gitignore

@@ -2,3 +2,6 @@
 /*.iml
 /build/
 /.gradle/
+/out/
+/*.ipr
+/*.iws

spring-data-oracle-test/build.gradle

@@ -1,4 +1,6 @@
 apply plugin: "java"
+apply plugin: "idea"
+apply plugin: "eclipse"
 
 test {
   systemProperty 'javax.xml.parsers.DocumentBuilderFactory', 'com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl'

spring-data-oracle-test/gradle.properties

@@ -12,4 +12,4 @@ springRetryVersion = 1.0.0.RELEASE
 junitVersion = 4.10
 aspectjVersion = 1.6.11.RELEASE
 
-sdJdbcVersion  = 1.0.0.BUILD-SNAPSHOT
+sdJdbcVersion  = 1.1.0.BUILD-SNAPSHOT

spring-data-oracle/src/main/java/org/springframework/data/jdbc/config/oracle/PoolingDataSourceBeanDefinitionParser.java

@@ -29,6 +29,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.StringUtils;
+import org.springframework.util.SystemPropertyUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
@@ -159,7 +160,8 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
         // look for property files
         if (StringUtils.hasText(propertyFileLocation)) {
             logger.debug("Using properties location: " + propertyFileLocation);
-            Resource r = rl.getResource(propertyFileLocation);
+			String resolvedLocation = SystemPropertyUtils.resolvePlaceholders(propertyFileLocation);
+            Resource r = rl.getResource(resolvedLocation);
             logger.debug("Loading properties from resource: " + r);
             PropertiesFactoryBean factoryBean = new PropertiesFactoryBean();
             factoryBean.setLocation(r);

spring-data-oracle/src/test/java/org/springframework/data/jdbc/config/oracle/DataOrclNamespaceTests.java

@@ -22,13 +22,26 @@
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import javax.xml.bind.SchemaOutputResolver;
+
 /**
+ * Tests for Oracle namespace
+ *
+ * Note: Tests should be run with working directory set as spring-data-jdbc-ext/spring-data-oracle
+ *
  * @author Thomas Risberg
  */
 public class DataOrclNamespaceTests extends TestCase {
 
     private XmlBeanFactory beanFactory;
 
+	{
+		// set ${test.home} for property file location resolution
+		String pwd = System.getProperty("user.dir");
+		String path = "/src/test/";
+		System.setProperty("test.home", pwd + path);
+	}
+
     protected void setUp() throws Exception {
         this.beanFactory = new XmlBeanFactory(new ClassPathResource("test-data-orcl-namespace.xml", getClass()));
     }
@@ -38,13 +51,18 @@ public void testSimpleDataSourceDefinition() throws Exception {
         assertEquals("not the correct class", "oracle.jdbc.pool.OracleDataSource", bean.getClass().getName());
     }
 
-    public void testPropertyFileDataSourceDefinition() throws Exception {
-        Object bean = this.beanFactory.getBean("propertyFileDataSource");
+    public void testClasspathPropertyFileDataSourceDefinition() throws Exception {
+        Object bean = this.beanFactory.getBean("classpathPropertyFileDataSource");
+        assertEquals("not the correct class", "oracle.jdbc.pool.OracleDataSource", bean.getClass().getName());
+    }
+
+    public void testLocalPropertyFileDataSourceDefinition() throws Exception {
+        Object bean = this.beanFactory.getBean("localPropertyFileDataSource");
         assertEquals("not the correct class", "oracle.jdbc.pool.OracleDataSource", bean.getClass().getName());
     }
 
     public void testConectionPropertiesDataSourceDefinition() throws Exception {
-        Object bean = this.beanFactory.getBean("connectionPpropertiesDataSource");
+        Object bean = this.beanFactory.getBean("connectionPropertiesDataSource");
         assertEquals("not the correct class", "oracle.jdbc.pool.OracleDataSource", bean.getClass().getName());
         assertTrue("connection properties not found", ((OracleDataSource)bean).getConnectionProperties().size() > 0);
         assertTrue("cache properties not found", ((OracleDataSource)bean).getConnectionCacheProperties().size() > 0);

spring-data-oracle/src/test/resources/org/springframework/data/jdbc/config/oracle/test-data-orcl-namespace.xml

@@ -13,7 +13,7 @@
     <orcl:pooling-datasource id="simpleDataSource"
         url="jdbc:" username="spring" password="test"/>
 
-    <orcl:pooling-datasource id="propertyFileDataSource"
+    <orcl:pooling-datasource id="classpathPropertyFileDataSource"
         url="jdbc:"
         properties-location="classpath:org/springframework/data/jdbc/config/oracle/test-orcl.properties">
         <orcl:connection-properties>
@@ -23,7 +23,17 @@
         </orcl:connection-properties>
     </orcl:pooling-datasource>
 
-    <orcl:pooling-datasource id="connectionPpropertiesDataSource"
+    <orcl:pooling-datasource id="localPropertyFileDataSource"
+        url="jdbc:"
+        properties-location="file:${test.home}/resources/org/springframework/data/jdbc/config/oracle/test-orcl.properties">
+        <orcl:connection-properties>
+            xxx=/test
+            yyy=OK
+            zzz=1024
+        </orcl:connection-properties>
+    </orcl:pooling-datasource>
+
+    <orcl:pooling-datasource id="connectionPropertiesDataSource"
         url="jdbc:"
         connection-caching-enabled="true">
         <orcl:connection-properties>