You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/03/16 15:32:36 UTC
[21/50] [abbrv] incubator-nifi git commit: Merge branch
'NIFI-296-extend-IdentifyMimeType' of
https://github.com/adamonduty/incubator-nifi into develop
Merge branch 'NIFI-296-extend-IdentifyMimeType' of https://github.com/adamonduty/incubator-nifi 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/ee795a7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ee795a7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ee795a7d
Branch: refs/heads/master
Commit: ee795a7d01c6ec35cfa8866c80f285040c559c81
Parents: fff3759 8f5afd0
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Mar 2 10:12:28 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Mar 2 10:12:28 2015 -0500
----------------------------------------------------------------------
.../nifi-standard-processors/pom.xml | 5 +
.../processors/standard/IdentifyMimeType.java | 405 ++-----------------
.../org/apache/tika/mime/custom-mimetypes.xml | 83 ++++
.../standard/TestIdentifyMimeType.java | 88 ++--
.../test/resources/TestIdentifyMimeType/1.tar | Bin 2048 -> 10240 bytes
.../resources/TestIdentifyMimeType/1.tar.gz | Bin 0 -> 154 bytes
.../test/resources/TestIdentifyMimeType/1.txt | 1 +
.../resources/TestIdentifyMimeType/392790.pptx | Bin 0 -> 49539 bytes
.../resources/TestIdentifyMimeType/528206.xlsx | Bin 0 -> 13153 bytes
.../resources/TestIdentifyMimeType/651924.docx | Bin 0 -> 12131 bytes
10 files changed, 168 insertions(+), 414 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ee795a7d/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------