You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mt...@apache.org on 2018/04/23 19:40:23 UTC
[2/2] nifi git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/nifi
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5ca6261d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5ca6261d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5ca6261d
Branch: refs/heads/master
Commit: 5ca6261de009f57ed238bc30191e2f7404762f5c
Parents: 45bc1f1 0e736f5
Author: Mike Thomsen <mi...@gmail.com>
Authored: Mon Apr 23 15:39:20 2018 -0400
Committer: Mike Thomsen <mi...@gmail.com>
Committed: Mon Apr 23 15:39:20 2018 -0400
----------------------------------------------------------------------
.../nifi/controller/tasks/ConnectableTask.java | 46 +-
.../controller/tasks/TestConnectableTask.java | 93 +-
.../nifi-record-serialization-services/pom.xml | 20 +
.../java/org/apache/nifi/xml/XMLReader.java | 140 ++
.../org/apache/nifi/xml/XMLRecordReader.java | 568 +++++++
...org.apache.nifi.controller.ControllerService | 4 +-
.../additionalDetails.html | 433 ++++++
.../java/org/apache/nifi/xml/TestXMLReader.java | 160 ++
.../apache/nifi/xml/TestXMLReaderProcessor.java | 79 +
.../apache/nifi/xml/TestXMLRecordReader.java | 1436 ++++++++++++++++++
.../src/test/resources/xml/people.xml | 22 +
.../src/test/resources/xml/people2.xml | 12 +
.../src/test/resources/xml/people3.xml | 12 +
.../src/test/resources/xml/people_array.xml | 37 +
.../test/resources/xml/people_array_simple.xml | 28 +
.../src/test/resources/xml/people_cdata.xml | 22 +
.../src/test/resources/xml/people_complex1.xml | 33 +
.../src/test/resources/xml/people_complex2.xml | 73 +
.../src/test/resources/xml/people_empty.xml | 12 +
.../src/test/resources/xml/people_invalid.xml | 21 +
.../src/test/resources/xml/people_map.xml | 18 +
.../src/test/resources/xml/people_map2.xml | 32 +
.../src/test/resources/xml/people_namespace.xml | 22 +
.../src/test/resources/xml/people_nested.xml | 38 +
.../test/resources/xml/people_no_attributes.xml | 22 +
.../resources/xml/people_tag_in_characters.xml | 23 +
.../xml/people_with_header_and_comments.xml | 29 +
.../src/test/resources/xml/person.xml | 5 +
.../src/test/resources/xml/testschema | 11 +
.../src/test/resources/xml/testschema2 | 19 +
30 files changed, 3450 insertions(+), 20 deletions(-)
----------------------------------------------------------------------