From 8748fff396f5ddec0d565ea9b78599e108263653 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Fri, 13 Apr 2018 16:30:22 +0200 Subject: [PATCH] BATCH-2699: move derby's generated files under "build" directory --- .../test/jdbc/datasource/DerbyDataSourceFactoryBean.java | 6 +++--- .../src/test/resources/batch-derby.properties | 2 +- .../src/test/resources/batch-derby.properties | 4 ++-- .../batch/support/DatabaseTypeIntegrationTests.java | 4 ++-- .../test/jdbc/datasource/DerbyDataSourceFactoryBean.java | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-batch-core-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-core-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java index 8bd47a4a5..426181e74 100644 --- a/spring-batch-core-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java +++ b/spring-batch-core-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2014 the original author or authors. + * Copyright 2009-2018 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. @@ -24,7 +24,7 @@ import org.springframework.beans.factory.config.AbstractFactoryBean; public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { - private String dataDirectory = "derby-home"; + private String dataDirectory = "build/derby-home"; public void setDataDirectory(String dataDirectory) { this.dataDirectory = dataDirectory; @@ -38,7 +38,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean System.setProperty("derby.storage.pageCacheSize", "100"); final EmbeddedDataSource ds = new EmbeddedDataSource(); - ds.setDatabaseName("derbydb"); + ds.setDatabaseName("build/derbydb"); ds.setCreateDatabase("create"); return ds; diff --git a/spring-batch-core-tests/src/test/resources/batch-derby.properties b/spring-batch-core-tests/src/test/resources/batch-derby.properties index 5ed99a6d3..026209f3e 100644 --- a/spring-batch-core-tests/src/test/resources/batch-derby.properties +++ b/spring-batch-core-tests/src/test/resources/batch-derby.properties @@ -1,7 +1,7 @@ # Placeholders batch.* # for Derby: batch.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver -batch.jdbc.url=jdbc:derby:derby-home/test;create=true +batch.jdbc.url=jdbc:derby:build/derby-home/test;create=true batch.jdbc.user=sa batch.jdbc.password= batch.jdbc.testWhileIdle=false diff --git a/spring-batch-infrastructure-tests/src/test/resources/batch-derby.properties b/spring-batch-infrastructure-tests/src/test/resources/batch-derby.properties index f35dc1a11..d7328b025 100644 --- a/spring-batch-infrastructure-tests/src/test/resources/batch-derby.properties +++ b/spring-batch-infrastructure-tests/src/test/resources/batch-derby.properties @@ -1,7 +1,7 @@ # Placeholders batch.* # for Derby: batch.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver -batch.jdbc.url=jdbc:derby:derby-home/test;create=true +batch.jdbc.url=jdbc:derby:build/derby-home/test;create=true batch.jdbc.user=app batch.jdbc.password= batch.jdbc.testWhileIdle=false @@ -12,4 +12,4 @@ batch.business.schema.script=classpath:/org/springframework/batch/jms/init.sql batch.data.source.init=true batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer batch.database.incrementer.parent=columnIncrementerParent -batch.verify.cursor.position=false \ No newline at end of file +batch.verify.cursor.position=false diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DatabaseTypeIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DatabaseTypeIntegrationTests.java index 4baa0c402..5b1fbeda8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DatabaseTypeIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DatabaseTypeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2006-2018 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. @@ -39,7 +39,7 @@ public class DatabaseTypeIntegrationTests { @Test public void testDerby() throws Exception { DataSource dataSource = DatabaseTypeTestUtils.getDataSource(org.apache.derby.jdbc.EmbeddedDriver.class, - "jdbc:derby:derby-home/test;create=true", "sa", ""); + "jdbc:derby:./build/derby-home/test;create=true", "sa", ""); assertEquals(DatabaseType.DERBY, DatabaseType.fromMetaData(dataSource)); dataSource.getConnection(); } diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java index 6199364b1..6b06f02f5 100644 --- a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java +++ b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 the original author or authors. + * Copyright 2010-2018 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. @@ -28,7 +28,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean private static Log logger = LogFactory.getLog(DerbyDataSourceFactoryBean.class); - private String dataDirectory = "derby-home"; + private String dataDirectory = "build/derby-home"; public void setDataDirectory(String dataDirectory) { this.dataDirectory = dataDirectory; @@ -42,7 +42,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean System.setProperty("derby.storage.pageCacheSize", "100"); final EmbeddedDataSource ds = new EmbeddedDataSource(); - ds.setDatabaseName("derbydb"); + ds.setDatabaseName("build/derbydb"); ds.setCreateDatabase("create"); logger.info("Created instance of " + ds.toString());