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/63bdda4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/63bdda4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/63bdda4b Branch: refs/heads/develop Commit: 63bdda4b5baaa398368ab085a6148fb785d1b87c Parents: 8d1536e 73b08d8 Author: Mark Payne <[email protected]> Authored: Fri Jun 5 15:06:35 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri Jun 5 15:06:35 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/pom.xml | 16 +- nifi/nifi-external/nifi-storm-spout/pom.xml | 38 +++ .../org/apache/nifi/storm/NiFiDataPacket.java | 39 ++++ .../java/org/apache/nifi/storm/NiFiSpout.java | 232 +++++++++++++++++++ nifi/nifi-external/pom.xml | 1 + .../nifi/documentation/html/XmlValidator.java | 4 +- .../nifi/cluster/protocol/StandardDataFlow.java | 27 +-- .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 4 +- .../cluster/manager/impl/WebClusterManager.java | 7 +- .../impl/DataFlowManagementServiceImplTest.java | 5 +- .../nifi/controller/FlowUnmarshaller.java | 3 +- .../nifi/controller/StandardFlowSerializer.java | 2 + .../controller/StandardFlowSynchronizer.java | 2 + .../apache/nifi/web/api/ProvenanceResource.java | 4 +- .../nifi/web/ContentViewerController.java | 210 +++++++++-------- .../hl7/TestExtractHL7Attributes.java | 47 +++- .../processors/kite/AbstractKiteProcessor.java | 3 +- .../nifi/processors/kite/ConvertJSONToAvro.java | 36 ++- .../kite/TestJSONToAvroProcessor.java | 17 +- .../nifi-standard-processors/pom.xml | 1 + .../standard/Base64EncodeContent.java | 2 +- .../nifi/processors/standard/BinFiles.java | 23 +- .../processors/standard/DetectDuplicate.java | 2 +- .../nifi/processors/standard/EncodeContent.java | 2 +- .../processors/standard/EvaluateXQuery.java | 2 +- .../standard/ExecuteStreamCommand.java | 44 +++- .../nifi/processors/standard/ScanContent.java | 2 +- .../nifi/processors/standard/SplitJson.java | 2 - .../src/test/java/TestDynamicEnvironment.java | 29 +++ .../standard/TestExecuteStreamCommand.java | 53 ++++- .../processors/standard/TestMergeContent.java | 20 ++ .../processors/standard/TestScanContent.java | 18 ++ .../ExecuteCommand/TestDynamicEnvironment.jar | Bin 0 -> 1200 bytes 33 files changed, 717 insertions(+), 180 deletions(-) ----------------------------------------------------------------------
