You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/09 14:39:45 UTC

[10/11] incubator-nifi git commit: Merge branch 'develop' into NIFI-250

Merge branch 'develop' into NIFI-250


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/73459ccb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/73459ccb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/73459ccb

Branch: refs/heads/NIFI-250
Commit: 73459ccb5cfbc4aa81201e6476bb47ae450b49f7
Parents: 6f86758 342ca17
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Mar 9 06:48:31 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Mar 9 06:48:31 2015 -0400

----------------------------------------------------------------------
 .../nifi/components/PropertyDescriptor.java     |   1 +
 nifi/nifi-assembly/pom.xml                      |   5 +
 .../java/org/apache/nifi/util/RingBuffer.java   |   2 +-
 .../nifi/util/timebuffer/TestRingBuffer.java    |  10 +
 .../org/wali/MinimalLockingWriteAheadLog.java   |   7 +-
 .../nifi-hadoop-libraries-nar/pom.xml           |  85 +++---
 .../nifi-kite-bundle/nifi-kite-nar/pom.xml      |  47 ++++
 .../nifi-kite-processors/pom.xml                | 148 +++++++++++
 .../processors/kite/AbstractKiteProcessor.java  | 217 ++++++++++++++++
 .../apache/nifi/processors/kite/AvroUtil.java   |  43 ++++
 .../nifi/processors/kite/ConvertCSVToAvro.java  | 258 +++++++++++++++++++
 .../nifi/processors/kite/ConvertJSONToAvro.java | 157 +++++++++++
 .../nifi/processors/kite/JSONFileReader.java    | 114 ++++++++
 .../processors/kite/StoreInKiteDataset.java     | 168 ++++++++++++
 .../data/spi/filesystem/CSVFileReaderFixed.java | 172 +++++++++++++
 .../org.apache.nifi.processor.Processor         |  17 ++
 .../processors/kite/TestCSVToAvroProcessor.java | 126 +++++++++
 .../kite/TestConfigurationProperty.java         |  77 ++++++
 .../nifi/processors/kite/TestGetSchema.java     |  98 +++++++
 .../kite/TestJSONToAvroProcessor.java           |  61 +++++
 .../kite/TestKiteProcessorsCluster.java         | 132 ++++++++++
 .../kite/TestKiteStorageProcessor.java          | 171 ++++++++++++
 .../apache/nifi/processors/kite/TestUtil.java   | 103 ++++++++
 nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml  |  59 +++++
 nifi/nifi-nar-bundles/pom.xml                   |   1 +
 nifi/pom.xml                                    |  38 ++-
 26 files changed, 2279 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/73459ccb/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
----------------------------------------------------------------------