Return-Path: X-Original-To: apmail-fineract-commits-archive@minotaur.apache.org Delivered-To: apmail-fineract-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 210581984D for ; Wed, 9 Mar 2016 10:06:35 +0000 (UTC) Received: (qmail 52130 invoked by uid 500); 9 Mar 2016 10:06:35 -0000 Delivered-To: apmail-fineract-commits-archive@fineract.apache.org Received: (qmail 52097 invoked by uid 500); 9 Mar 2016 10:06:35 -0000 Mailing-List: contact commits-help@fineract.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.incubator.apache.org Delivered-To: mailing list commits@fineract.incubator.apache.org Received: (qmail 52088 invoked by uid 99); 9 Mar 2016 10:06:35 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2016 10:06:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 9BB3AC313E for ; Wed, 9 Mar 2016 10:06:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id f04zrrqX3ild for ; Wed, 9 Mar 2016 10:06:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id C185B5FDFB for ; Wed, 9 Mar 2016 10:06:31 +0000 (UTC) Received: (qmail 51628 invoked by uid 99); 9 Mar 2016 10:06:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2016 10:06:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8866EDF99E; Wed, 9 Mar 2016 10:06:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nazeer1100126@apache.org To: commits@fineract.incubator.apache.org Date: Wed, 09 Mar 2016 10:06:33 -0000 Message-Id: <835dc761b23d48829438dd91e3949405@git.apache.org> In-Reply-To: <08484c9024e9417d8f03abbfb8107420@git.apache.org> References: <08484c9024e9417d8f03abbfb8107420@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Feb 17 11:16:30 2016 +0530 Committer: unknown 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(-) ----------------------------------------------------------------------