You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/07/16 16:47:01 UTC
[08/50] [abbrv] incubator-nifi git commit: Merge branch 'develop'
into NIFI-632
Merge branch 'develop' into NIFI-632
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/40b55efb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/40b55efb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/40b55efb
Branch: refs/heads/master
Commit: 40b55efbd7082935accb37c17bacbcb8d1f1cd38
Parents: 28bfb70 f58972e
Author: danbress <db...@onyxconsults.com>
Authored: Fri Jun 26 19:14:23 2015 -0400
Committer: danbress <db...@onyxconsults.com>
Committed: Fri Jun 26 19:14:23 2015 -0400
----------------------------------------------------------------------
.../nifi/provenance/lineage/LineageNode.java | 1 +
nifi/nifi-assembly/pom.xml | 1 +
.../nifi/provenance/lineage/EventNode.java | 2 +
.../nifi/provenance/lineage/FlowFileNode.java | 1 +
.../language/antlr/AttributeExpressionLexer.g | 1 +
.../language/antlr/AttributeExpressionParser.g | 3 +-
.../attribute/expression/language/Query.java | 255 ++++++++++------
.../language/evaluation/BooleanEvaluator.java | 11 +
.../language/evaluation/DateEvaluator.java | 11 +
.../language/evaluation/Evaluator.java | 12 +
.../language/evaluation/NumberEvaluator.java | 10 +
.../language/evaluation/StringEvaluator.java | 11 +
.../evaluation/functions/AndEvaluator.java | 6 +-
.../evaluation/functions/AppendEvaluator.java | 6 +-
.../functions/AttributeEvaluator.java | 4 +-
.../evaluation/functions/ContainsEvaluator.java | 7 +-
.../evaluation/functions/DivideEvaluator.java | 6 +-
.../evaluation/functions/EndsWithEvaluator.java | 7 +-
.../evaluation/functions/FindEvaluator.java | 7 +-
.../evaluation/functions/FormatEvaluator.java | 4 +-
.../functions/GreaterThanEvaluator.java | 7 +-
.../functions/GreaterThanOrEqualEvaluator.java | 7 +-
.../evaluation/functions/IndexOfEvaluator.java | 7 +-
.../functions/LastIndexOfEvaluator.java | 7 +-
.../evaluation/functions/LengthEvaluator.java | 7 +-
.../evaluation/functions/LessThanEvaluator.java | 7 +-
.../functions/LessThanOrEqualEvaluator.java | 7 +-
.../evaluation/functions/MatchesEvaluator.java | 7 +-
.../evaluation/functions/MinusEvaluator.java | 6 +-
.../evaluation/functions/ModEvaluator.java | 6 +-
.../evaluation/functions/MultiplyEvaluator.java | 6 +-
.../evaluation/functions/NotEvaluator.java | 4 +-
.../functions/NumberToDateEvaluator.java | 5 +-
.../evaluation/functions/OrEvaluator.java | 6 +-
.../evaluation/functions/PlusEvaluator.java | 6 +-
.../evaluation/functions/PrependEvaluator.java | 6 +-
.../functions/ReplaceAllEvaluator.java | 8 +-
.../functions/ReplaceEmptyEvaluator.java | 6 +-
.../evaluation/functions/ReplaceEvaluator.java | 8 +-
.../functions/ReplaceNullEvaluator.java | 6 +-
.../functions/StartsWithEvaluator.java | 7 +-
.../functions/StringToDateEvaluator.java | 7 +-
.../functions/SubstringAfterEvaluator.java | 6 +-
.../functions/SubstringAfterLastEvaluator.java | 6 +-
.../functions/SubstringBeforeEvaluator.java | 6 +-
.../functions/SubstringBeforeLastEvaluator.java | 6 +-
.../functions/SubstringEvaluator.java | 11 +-
.../evaluation/functions/ToLowerEvaluator.java | 6 +-
.../evaluation/functions/ToNumberEvaluator.java | 7 +-
.../evaluation/functions/ToRadixEvaluator.java | 11 +-
.../evaluation/functions/ToUpperEvaluator.java | 6 +-
.../evaluation/functions/TrimEvaluator.java | 4 +-
.../functions/UrlDecodeEvaluator.java | 6 +-
.../functions/UrlEncodeEvaluator.java | 6 +-
.../evaluation/literals/ToLiteralEvaluator.java | 43 +++
.../evaluation/reduce/JoinEvaluator.java | 6 +-
.../selection/AllAttributesEvaluator.java | 7 +-
.../selection/AnyAttributeEvaluator.java | 7 +-
.../AnyMatchingAttributeEvaluator.java | 21 --
.../selection/DelineatedAttributeEvaluator.java | 12 +-
.../selection/IteratingEvaluator.java | 33 ++
.../evaluation/selection/MappingEvaluator.java | 11 +-
.../selection/MultiAttributeEvaluator.java | 3 +-
.../selection/MultiMatchAttributeEvaluator.java | 5 +
.../selection/MultiNamedAttributeEvaluator.java | 5 +
.../expression/language/TestQuery.java | 54 +++-
.../org/apache/nifi/util/NiFiProperties.java | 22 +-
.../src/main/asciidoc/administration-guide.adoc | 2 +-
.../asciidoc/expression-language-guide.adoc | 26 +-
.../nifi/util/MockConfigurationContext.java | 18 +-
.../nifi/util/StandardProcessorTestRunner.java | 12 +-
.../java/org/apache/nifi/util/TestRunner.java | 45 +++
.../CurrentTestStandardProcessorTestRunner.java | 71 +++++
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 15 +-
.../repository/StandardProcessSession.java | 2 +-
.../repository/StandardProvenanceReporter.java | 8 +-
.../src/main/resources/bin/nifi.sh | 4 +
.../src/main/resources/conf/nifi.properties | 3 +
.../nifi-web-ui/src/main/webapp/css/main.css | 1 +
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 2 +-
.../js/nf/canvas/nf-controller-service.js | 4 +-
.../src/main/webapp/js/nf/nf-common.js | 17 ++
.../apache/nifi/processors/kafka/PutKafka.java | 301 ++++++++++++++-----
.../nifi/processors/kafka/TestPutKafka.java | 163 ++++++++++
.../nifi/provenance/IndexConfiguration.java | 2 +-
.../PersistentProvenanceRepository.java | 90 +++++-
.../provenance/RepositoryConfiguration.java | 18 ++
.../nifi/provenance/StandardRecordReader.java | 15 +-
.../provenance/lucene/DeleteIndexAction.java | 6 +-
.../nifi/provenance/lucene/DocsReader.java | 9 +-
.../nifi/provenance/lucene/IndexSearch.java | 7 +-
.../nifi/provenance/lucene/LineageQuery.java | 6 +-
.../provenance/serialization/RecordReaders.java | 17 +-
.../TestPersistentProvenanceRepository.java | 39 ++-
.../TestStandardRecordReaderWriter.java | 10 +-
.../nifi/processors/standard/ExtractText.java | 4 +-
.../nifi/processors/standard/GetHTTP.java | 17 +-
.../nifi/processors/standard/MergeContent.java | 57 ++--
98 files changed, 1342 insertions(+), 468 deletions(-)
----------------------------------------------------------------------