Merge branch 'NIFI-360' of https://github.com/apiri/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/245ec0ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/245ec0ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/245ec0ca

Branch: refs/heads/develop
Commit: 245ec0ca80c6bfec71b61282d47006e41e75c445
Parents: 96a42cd e6ebaa4
Author: joewitt <joew...@apache.org>
Authored: Sun Mar 1 22:19:27 2015 -0500
Committer: joewitt <joew...@apache.org>
Committed: Sun Mar 1 22:19:27 2015 -0500

----------------------------------------------------------------------
 nifi/LICENSE                                    |  21 +
 nifi/nifi-assembly/LICENSE                      |  28 ++
 nifi/nifi-assembly/NOTICE                       |   8 +
 .../src/main/resources/META-INF/LICENSE         |  29 ++
 .../src/main/resources/META-INF/NOTICE          |  10 +-
 .../nifi-standard-processors/pom.xml            |   4 +
 .../standard/AbstractJsonPathProcessor.java     | 117 +++++
 .../processors/standard/EvaluateJsonPath.java   | 278 +++++++++++
 .../nifi/processors/standard/SplitJson.java     | 184 +++++++
 .../util/JsonPathExpressionValidator.java       | 487 +++++++++++++++++++
 .../org.apache.nifi.processor.Processor         |   2 +
 .../index.html                                  | 155 ++++++
 .../index.html                                  |  85 ++++
 .../standard/TestEvaluateJsonPath.java          | 264 ++++++++++
 .../nifi/processors/standard/TestSplitJson.java | 126 +++++
 .../test/resources/TestJson/json-sample.json    | 415 ++++++++++++++++
 nifi/pom.xml                                    |   5 +
 17 files changed, 2217 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/245ec0ca/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/245ec0ca/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/245ec0ca/nifi/pom.xml
----------------------------------------------------------------------

Reply via email to