Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/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/1a1cfe23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1a1cfe23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1a1cfe23 Branch: refs/heads/develop Commit: 1a1cfe23447d980b6625fb6efae6fb777c6237c5 Parents: 7db27c0 393efc8 Author: Mark Payne <[email protected]> Authored: Fri May 1 10:30:55 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri May 1 10:30:55 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/util/NiFiProperties.java | 111 +++++++---- .../apache/nifi/util/NiFiPropertiesTest.java | 95 ++++++++++ .../NiFiProperties/conf/nifi.blank.properties | 128 +++++++++++++ .../NiFiProperties/conf/nifi.missing.properties | 126 +++++++++++++ .../NiFiProperties/conf/nifi.properties | 128 +++++++++++++ .../html/HtmlDocumentationWriter.java | 61 +++++- .../FullyDocumentedControllerService.java | 10 +- .../html/ProcessorDocumentationWriterTest.java | 6 +- .../java/org/apache/nifi/nar/NarUnpacker.java | 131 ++++++++----- .../org/apache/nifi/nar/NarUnpackerTest.java | 185 +++++++++++++++++++ .../resources/NarUnpacker/conf/nifi.properties | 129 +++++++++++++ .../resources/NarUnpacker/lib/dummy-one.nar | Bin 0 -> 1749 bytes .../NarUnpacker/lib/nifi-framework-nar.nar | Bin 0 -> 406 bytes .../resources/NarUnpacker/lib2/dummy-two.nar | Bin 0 -> 1751 bytes 14 files changed, 1024 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
