Merge branch 'NIFI-633' 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/c3095092 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c3095092 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c3095092 Branch: refs/heads/develop Commit: c30950928e60c78512963cf50740651d8013e075 Parents: c9ddf21 fa7aa80 Author: danbress <[email protected]> Authored: Sat Jun 6 13:31:02 2015 -0400 Committer: danbress <[email protected]> Committed: Sat Jun 6 13:31:02 2015 -0400 ---------------------------------------------------------------------- ...kControllerServiceInitializationContext.java | 4 +- .../MockProcessorInitializationContext.java | 4 +- .../documentation/mock/MockProcessorLogger.java | 169 +++++++++++++++++++ .../MockReportingInitializationContext.java | 4 +- .../example/ControllerServiceWithLogger.java | 31 ++++ .../example/ProcessorWithLogger.java | 37 ++++ .../example/ReportingTaskWithLogger.java | 36 ++++ .../html/HtmlDocumentationWriterTest.java | 40 ++++- .../html/ProcessorDocumentationWriterTest.java | 18 +- .../nifi-framework-cluster/pom.xml | 4 + .../nifi-framework-core-api/pom.xml | 4 - .../nifi-framework/nifi-framework-core/pom.xml | 4 + 12 files changed, 341 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c3095092/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c3095092/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c3095092/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml ----------------------------------------------------------------------
