Merge branch 'NIFI-626' 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/0af9c75d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0af9c75d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0af9c75d Branch: refs/heads/develop Commit: 0af9c75d78c37f1551c53c0a4043d9f3fa5a82e3 Parents: a4d21e3 118b660 Author: Mark Payne <marka...@hotmail.com> Authored: Wed Jun 17 13:33:08 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed Jun 17 13:33:08 2015 -0400 ---------------------------------------------------------------------- .../nifi-standard-processors/pom.xml | 553 ++++++++++--------- .../nifi/processors/standard/ExecuteSQL.java | 157 ++++++ .../processors/standard/util/JdbcCommon.java | 165 ++++++ .../org.apache.nifi.processor.Processor | 1 + .../processors/standard/TestExecuteSQL.java | 169 ++++++ .../standard/util/TestJdbcCommon.java | 155 ++++++ .../standard/util/TestJdbcHugeStream.java | 267 +++++++++ .../apache/nifi/dbcp/DBCPConnectionPool.java | 181 +++--- .../nifi/dbcp/DatabaseSystemDescriptor.java | 1 + .../org/apache/nifi/dbcp/DatabaseSystems.java | 1 + .../org/apache/nifi/dbcp/DBCPServiceTest.java | 160 ++---- nifi/pom.xml | 10 + 12 files changed, 1344 insertions(+), 476 deletions(-) ----------------------------------------------------------------------
