You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2016/03/09 11:06:33 UTC
[04/10] incubator-fineract git commit: Merge branch 'jdbcdriver' into
openmf_develop
Merge branch 'jdbcdriver' into openmf_develop
Conflicts:
fineract-provider/src/main/resources/application.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/e97719d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/e97719d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/e97719d8
Branch: refs/heads/develop
Commit: e97719d8f92f9aeef644e57f4cf6a64c9ed25e3b
Parents: 85a80b5 1c0e550
Author: unknown <na...@confluxtechnologies.com>
Authored: Wed Feb 17 11:16:30 2016 +0530
Committer: unknown <na...@confluxtechnologies.com>
Committed: Wed Feb 17 11:16:30 2016 +0530
----------------------------------------------------------------------
.../properties/basicauth/application.properties | 18 ++++
.../properties/oauth/application.properties | 18 ++++
.../boot/AbstractApplicationConfiguration.java | 2 +
.../core/boot/JDBCDriverConfig.java | 74 ++++++++++++++++
.../core/boot/db/DataSourceConfiguration.java | 9 +-
.../core/boot/db/DataSourceProperties.java | 13 ++-
.../FineractPlatformTenantConnection.java | 6 +-
.../service/TenantDatabaseUpgradeService.java | 11 ++-
.../TomcatJdbcDataSourcePerTenantService.java | 10 ++-
.../data/ResultsetColumnHeaderData.java | 53 ++++++++----
.../portfolio/loanaccount/domain/Loan.java | 91 ++++++++++----------
.../resources/META-INF/spring/jdbc.properties | 23 +++++
.../src/main/resources/application.properties | 18 ++++
13 files changed, 262 insertions(+), 84 deletions(-)
----------------------------------------------------------------------