Merge branch 'NIFI-433' 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/054f044f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/054f044f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/054f044f Branch: refs/heads/develop Commit: 054f044fc5f0af900f2ed8e5cb580ad11c713cac Parents: 262a873 e1e1aec Author: Brandon DeVries <[email protected]> Authored: Fri May 1 09:08:33 2015 -0400 Committer: Brandon DeVries <[email protected]> Committed: Fri May 1 09:08:33 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/util/NiFiProperties.java | 35 +++- .../apache/nifi/util/NiFiPropertiesTest.java | 90 ++++++++++ .../NiFiProperties/conf/nifi.blank.properties | 128 ++++++++++++++ .../NiFiProperties/conf/nifi.missing.properties | 126 +++++++++++++ .../NiFiProperties/conf/nifi.properties | 128 ++++++++++++++ .../java/org/apache/nifi/nar/NarUnpacker.java | 29 ++- .../org/apache/nifi/nar/NarUnpackerTest.java | 177 +++++++++++++++++++ .../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 11 files changed, 828 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/054f044f/nifi/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/054f044f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java ----------------------------------------------------------------------
