Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/26f80095 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/26f80095 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/26f80095 Branch: refs/heads/master Commit: 26f80095b7f7db4b41f66e15b81268a2fbb19682 Parents: f884086 8615941 Author: Mark Payne <[email protected]> Authored: Wed Sep 23 15:31:19 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Sep 23 15:31:19 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/processor/ProcessContext.java | 13 +++ .../apache/nifi/util/MockProcessContext.java | 33 ++++++++ .../nifi/util/StandardProcessorTestRunner.java | 25 ++++++ .../java/org/apache/nifi/util/TestRunner.java | 37 +++++++++ .../documentation/mock/MockProcessContext.java | 12 +++ .../apache/nifi/controller/ProcessorNode.java | 1 + .../scheduling/ConnectableProcessContext.java | 13 +++ .../nifi/processor/StandardProcessContext.java | 11 +++ .../processor/StandardSchedulingContext.java | 10 +++ .../nifi-image-bundle/nifi-image-nar/pom.xml | 6 ++ .../nifi-image-bundle/nifi-image-viewer/pom.xml | 48 +++++++++++ .../apache/nifi/web/ImageViewerController.java | 52 ++++++++++++ .../main/webapp/META-INF/nifi-content-viewer | 17 ++++ .../src/main/webapp/WEB-INF/jsp/image.jsp | 39 +++++++++ .../src/main/webapp/WEB-INF/web.xml | 29 +++++++ nifi-nar-bundles/nifi-image-bundle/pom.xml | 1 + .../processors/solr/PutSolrContentStream.java | 2 +- .../solr/TestPutSolrContentStream.java | 54 +++++++++++++ .../nifi/processors/standard/ExecuteSQL.java | 17 ++-- .../nifi/processors/standard/MergeContent.java | 5 +- .../standard/TestDetectDuplicate.java | 2 +- .../processors/standard/TestExecuteSQL.java | 84 ++++++++++++++------ .../processors/standard/TestMergeContent.java | 21 +++++ 23 files changed, 498 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
