Merge branch 'develop' into NIFI-680 Conflicts: nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java nifi/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java nifi/nifi-mock/src/test/java/org/apache/nifi/util/CurrentTestStandardProcessorTestRunner.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cc3be416 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cc3be416 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cc3be416 Branch: refs/heads/master Commit: cc3be416b26c9733f84b2acff590389ed1dd1abc Parents: 6b4e90d 40b55ef Author: danbress <dbr...@onyxconsults.com> Authored: Fri Jun 26 20:18:56 2015 -0400 Committer: danbress <dbr...@onyxconsults.com> Committed: Fri Jun 26 20:18:56 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-nifi-example-nar/pom.xml | 36 +++ .../nifi-nifi-example-processors/pom.xml | 70 +++++ .../nifi/processors/WriteResourceToStream.java | 102 +++++++ .../org.apache.nifi.processor.Processor | 15 + .../src/main/resources/file.txt | 1 + .../processors/WriteResourceToStreamTest.java | 47 +++ nifi/nifi-external/nifi-example-bundle/pom.xml | 33 ++ nifi/nifi-external/pom.xml | 2 + .../nifi/util/MockConfigurationContext.java | 18 +- .../nifi/util/StandardProcessorTestRunner.java | 6 +- .../java/org/apache/nifi/util/TestRunner.java | 2 +- .../CurrentTestStandardProcessorTestRunner.java | 142 ++++----- .../nifi-framework/nifi-documentation/pom.xml | 5 + .../apache/nifi/documentation/DocGenerator.java | 5 +- .../init/ControllerServiceInitializer.java | 20 +- .../init/ProcessorInitializer.java | 17 +- .../init/ReportingTaskingInitializer.java | 14 +- .../mock/MockConfigurationContext.java | 38 +++ .../documentation/mock/MockProcessContext.java | 85 ++++++ .../documentation/util/ReflectionUtils.java | 139 +++++++++ .../nifi/documentation/DocGeneratorTest.java | 96 ++++++ .../FullyDocumentedControllerService.java | 63 +++- .../example/FullyDocumentedProcessor.java | 49 ++- .../example/FullyDocumentedReportingTask.java | 46 ++- .../html/HtmlDocumentationWriterTest.java | 33 +- .../html/ProcessorDocumentationWriterTest.java | 19 +- .../src/test/resources/conf/nifi.properties | 129 ++++++++ .../src/test/resources/lib/example.nar | Bin 0 -> 721040 bytes .../src/test/resources/lib/jetty.nar | Bin 0 -> 4638519 bytes .../test/resources/lib/nifi-framework-nar.nar | Bin 0 -> 406 bytes .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 15 +- .../java/org/apache/nifi/nar/NarCloseable.java | 44 --- .../nifi/nar/NarThreadContextClassLoader.java | 187 ------------ .../repository/FileSystemRepository.java | 20 +- .../repository/StandardProcessSession.java | 2 +- .../repository/StandardProvenanceReporter.java | 8 +- .../repository/VolatileContentRepository.java | 8 +- ...nifi.controller.repository.ContentRepository | 16 + ...ifi.controller.repository.FlowFileRepository | 16 + ...fi.controller.repository.FlowFileSwapManager | 15 + ...ler.status.history.ComponentStatusRepository | 15 + .../java/org/apache/nifi/nar/NarCloseable.java | 44 +++ .../nifi/nar/NarThreadContextClassLoader.java | 187 ++++++++++++ .../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 ++-- 134 files changed, 2628 insertions(+), 820 deletions(-) ----------------------------------------------------------------------