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/02 22:48:06 UTC
[10/10] incubator-nifi git commit: Merge branch 'develop' into
NIFI-724
Merge branch 'develop' into NIFI-724
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/eddc071b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/eddc071b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/eddc071b
Branch: refs/heads/develop
Commit: eddc071b8efc3c6ca86e373b56f214514b2abd0a
Parents: 566c4fe a091807
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Jul 2 16:27:05 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jul 2 16:27:05 2015 -0400
----------------------------------------------------------------------
.../nifi/controller/ConfigurationContext.java | 23 ++-
.../src/main/asciidoc/developer-guide.adoc | 2 +-
.../nifi-nifi-example-nar/pom.xml | 35 ++++
.../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 | 42 +++++
nifi/nifi-external/pom.xml | 2 +
.../nifi/util/MockConfigurationContext.java | 29 ++-
.../nifi/util/StandardProcessorTestRunner.java | 4 +-
.../nifi-framework/nifi-documentation/pom.xml | 5 +
.../apache/nifi/documentation/DocGenerator.java | 5 +-
.../html/HtmlDocumentationWriter.java | 75 ++++++--
.../init/ControllerServiceInitializer.java | 20 +-
.../init/ProcessorInitializer.java | 17 +-
.../init/ReportingTaskingInitializer.java | 14 +-
.../mock/MockConfigurationContext.java | 48 +++++
.../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
.../java/org/apache/nifi/nar/NarCloseable.java | 44 -----
.../nifi/nar/NarThreadContextClassLoader.java | 187 -------------------
.../apache/nifi/controller/FlowController.java | 2 +-
.../reporting/AbstractReportingTaskNode.java | 4 +-
.../repository/FileSystemRepository.java | 20 +-
.../repository/VolatileContentRepository.java | 8 +-
.../scheduling/StandardProcessScheduler.java | 24 +--
.../service/StandardConfigurationContext.java | 26 ++-
.../service/StandardControllerServiceNode.java | 2 +-
.../StandardControllerServiceProvider.java | 10 +-
...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 +++++++++++++++++++
.../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 ++
.../nifi/processors/kite/ConvertCSVToAvro.java | 76 ++++++--
.../nifi/processors/kite/ConvertJSONToAvro.java | 95 ++++++----
.../nifi/processors/kite/FailureTracker.java | 83 ++++++++
.../processors/kite/TestCSVToAvroProcessor.java | 96 +++++++++-
.../kite/TestJSONToAvroProcessor.java | 101 +++++++++-
.../nifi/processors/standard/ExtractText.java | 4 +-
.../apache/nifi/controller/MonitorMemory.java | 14 +-
58 files changed, 1923 insertions(+), 405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/eddc071b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/eddc071b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/eddc071b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
----------------------------------------------------------------------