Merge branch 'NIFI-322-Db-Connection-Pooling' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/281ebafc Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/281ebafc Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/281ebafc Branch: refs/heads/develop Commit: 281ebafc2c84c37c0bf0b27f5d17c732ab3662b4 Parents: a66848b 91aaabf Author: Mark Payne <marka...@hotmail.com> Authored: Wed May 20 09:54:16 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed May 20 09:54:16 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/LICENSE | 29 ++ nifi/nifi-assembly/pom.xml | 6 + .../nifi-dbcp-service-api/pom.xml | 31 ++ .../java/org/apache/nifi/dbcp/DBCPService.java | 34 ++ .../nifi-dbcp-service-nar/pom.xml | 37 +++ .../src/main/resources/META-INF/NOTICE | 22 ++ .../nifi-dbcp-service/pom.xml | 65 ++++ .../apache/nifi/dbcp/DBCPConnectionPool.java | 269 +++++++++++++++ .../nifi/dbcp/DatabaseSystemDescriptor.java | 50 +++ .../org/apache/nifi/dbcp/DatabaseSystems.java | 82 +++++ .../java/org/apache/nifi/dbcp/DriverShim.java | 74 +++++ ...org.apache.nifi.controller.ControllerService | 15 + .../org/apache/nifi/dbcp/DBCPServiceTest.java | 331 +++++++++++++++++++ .../apache/nifi/dbcp/TestDatabaseSystems.java | 31 ++ .../org/apache/nifi/dbcp/TestProcessor.java | 45 +++ .../nifi-dbcp-service-bundle/pom.xml | 29 ++ .../nifi-standard-services-api-nar/pom.xml | 6 + .../nifi-standard-services/pom.xml | 2 + nifi/pom.xml | 5 + 19 files changed, 1163 insertions(+) ----------------------------------------------------------------------