Merge branch 'master' of https://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/4f6c1cff Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4f6c1cff Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4f6c1cff Branch: refs/heads/master Commit: 4f6c1cfff3eda2f4878e978c2d0e64101b691db7 Parents: 15a8699 d421e3c Author: Mark Payne <[email protected]> Authored: Fri Aug 21 11:29:20 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri Aug 21 11:29:20 2015 -0400 ---------------------------------------------------------------------- nifi-assembly/LICENSE | 30 +++ nifi-assembly/NOTICE | 5 + nifi-assembly/pom.xml | 6 + .../nifi-image-bundle/nifi-image-nar/pom.xml | 37 +++ .../src/main/resources/META-INF/LICENSE | 239 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 16 ++ .../nifi-image-processors/pom.xml | 62 +++++ .../processors/image/ExtractImageMetadata.java | 165 +++++++++++++ .../nifi/processors/image/ResizeImage.java | 194 +++++++++++++++ .../org.apache.nifi.processor.Processor | 16 ++ .../image/ExtractImageMetadataTest.java | 161 +++++++++++++ .../nifi/processors/image/TestResizeImage.java | 57 +++++ .../src/test/resources/16color-10x10.bmp | Bin 0 -> 198 bytes .../src/test/resources/mspaint-8x10.png | Bin 0 -> 124 bytes .../src/test/resources/notImage.txt | 1 + .../resources/photoshop-8x12-32colors-alpha.gif | Bin 0 -> 1243 bytes .../src/test/resources/simple.jpg | Bin 0 -> 25248 bytes nifi-nar-bundles/nifi-image-bundle/pom.xml | 34 +++ .../processors/standard/MonitorActivity.java | 42 ++-- .../standard/TestMonitorActivity.java | 39 ++- nifi-nar-bundles/pom.xml | 1 + 21 files changed, 1087 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
