From da6ff46f4cfb3e58159db56a338df1c70dfc2d75 Mon Sep 17 00:00:00 2001 From: Khushal Oza Date: Fri, 29 Mar 2013 17:55:49 +0530 Subject: [PATCH] Removed the DBHelper class. We dont need it now. Will be upgrading the DB from gradle using the flyway plugin --- .../database/DBMigrationHelper.java | 29 ------------------- .../TomcatJdbcDataSourcePerTenantService.java | 1 - 2 files changed, 30 deletions(-) delete mode 100644 mifosng-provider/src/main/java/org/mifosplatform/database/DBMigrationHelper.java diff --git a/mifosng-provider/src/main/java/org/mifosplatform/database/DBMigrationHelper.java b/mifosng-provider/src/main/java/org/mifosplatform/database/DBMigrationHelper.java deleted file mode 100644 index d9b843c9a..000000000 --- a/mifosng-provider/src/main/java/org/mifosplatform/database/DBMigrationHelper.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.mifosplatform.database; -import com.googlecode.flyway.core.Flyway; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.sql.DataSource; - -/** - * Use Flyway library to migrate DB schema. Searches for .sql files in the migrate folder. - * For more details on this refer to: - * http://flywaydb.org/documentation/migration/sql.html - */ -public class DBMigrationHelper { - -// private static final String DB_CONNECTION_URL = "jdbc:mysql://localhost:3306/mifostenant-default"; -// private static final String DB_USER = "root"; -// private static final String DB_PASSWORD = "mysql"; - - protected final Log logger = LogFactory.getLog(getClass()); - - public void migrateDB(DataSource tenantDataSource){ - - logger.info("Checking for DB Schema Migration. Tenant: "+ tenantDataSource); - - Flyway flyway = new Flyway(); - flyway.setDataSource(tenantDataSource); - flyway.migrate(); - } -} diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java index b388191a0..9a79839a9 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java @@ -12,7 +12,6 @@ import javax.sql.DataSource; import org.apache.tomcat.jdbc.pool.PoolConfiguration; import org.apache.tomcat.jdbc.pool.PoolProperties; -import org.mifosplatform.database.DBMigrationHelper; import org.mifosplatform.infrastructure.core.domain.MifosPlatformTenant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier;