Merge branch 'develop' into nifi-27
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f10bb3cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f10bb3cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f10bb3cc Branch: refs/heads/NIFI-169 Commit: f10bb3ccade86247b44fe3a1905af94754ab54eb Parents: 888d1ba 1cc3ce5 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Tue Dec 16 09:44:24 2014 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Tue Dec 16 09:44:24 2014 -0500 ---------------------------------------------------------------------- .gitignore | 1 + .../nifi/src/main/assembly/dependencies.xml | 12 + misc/build-order.sh | 4 +- misc/nar-maven-plugin/pom.xml | 21 +- .../src/main/java/nifi/NarMojo.java | 4 +- .../nifi/controller/FileSystemSwapManager.java | 33 ++- .../apache/nifi/controller/FlowController.java | 24 +- .../repository/FileSystemRepository.java | 6 + .../repository/StandardProcessSession.java | 134 ++++++++- .../repository/StandardProvenanceReporter.java | 4 +- .../repository/VolatileContentRepository.java | 5 + .../nifi/remote/StandardRemoteProcessGroup.java | 100 +++---- .../org/apache/nifi/util/ReflectionUtils.java | 72 ++--- .../repository/TestStandardProcessSession.java | 283 +++++++++++++++---- .../src/main/resources/bin/nifi-status.bat | 8 +- .../resources/src/main/resources/bin/nifi.sh | 4 +- .../src/main/resources/bin/run-nifi.bat | 6 +- .../src/main/resources/bin/start-nifi.bat | 7 +- .../src/main/resources/bin/stop-nifi.bat | 8 +- .../web/nifi-web-api/nb-configuration.xml | 18 -- .../nifi/processors/standard/EvaluateXPath.java | 31 +- .../processors/standard/TestScanContent.java | 2 +- .../VolatileProvenanceRepository.java | 2 + .../nifi/components/PropertyDescriptor.java | 2 +- .../repository/ContentRepository.java | 6 + .../repository/FlowFileSwapManager.java | 5 +- .../nifi/components/TestPropertyDescriptor.java | 59 ++++ 27 files changed, 651 insertions(+), 210 deletions(-) ----------------------------------------------------------------------