Merge branch 'PULLREQUEST68' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/93e615ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/93e615ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/93e615ba Branch: refs/heads/develop Commit: 93e615badd5546431217fc1ea21a46f251ad951b Parents: e083d79 d6668d2 Author: Nazeer Hussain Shaik <nazeer.sh...@confluxtechnologies.com> Authored: Tue Apr 26 11:34:44 2016 +0530 Committer: Nazeer Hussain Shaik <nazeer.sh...@confluxtechnologies.com> Committed: Tue Apr 26 11:34:44 2016 +0530 ---------------------------------------------------------------------- .../org/apache/fineract/ServerApplication.java | 18 +++++ .../ServerWithMariaDB4jApplication.java | 18 +++++ .../EmbeddedTomcatWithSSLConfiguration.java | 18 +++++ .../db/MariaDB4jDataSourceConfiguration.java | 18 +++++ .../core/boot/db/MariaDB4jSetupService.java | 18 +++++ .../client/command/ClientIdentifierCommand.java | 5 +- .../client/data/ClientIdentifierData.java | 14 ++-- .../client/domain/ClientIdentifier.java | 26 ++++++- .../client/domain/ClientIdentifierStatus.java | 72 ++++++++++++++++++++ .../DuplicateClientIdentifierException.java | 2 +- ...dentifierCommandFromApiJsonDeserializer.java | 7 +- ...ClientIdentifierReadPlatformServiceImpl.java | 9 +-- ...erWritePlatformServiceJpaRepositoryImpl.java | 3 +- .../V298__add_status_to_client_identifier.sql | 6 ++ ...tSpringBootWithMariaDB4jIntegrationTest.java | 18 +++++ .../EmbeddedTomcatWithSSLConfigurationTest.java | 18 +++++ .../boot/tests/SpringBootServerLoginTest.java | 18 +++++ 17 files changed, 270 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
