Merge branch 'nifi-solr-bundle' of https://github.com/bbende/incubator-nifi into solr
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3ddfeaf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3ddfeaf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3ddfeaf0 Branch: refs/heads/develop Commit: 3ddfeaf07257e45c58622082beec5fa6308b6918 Parents: 6394c8e fabb2c9 Author: Mark Payne <[email protected]> Authored: Fri May 1 11:59:29 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri May 1 11:59:29 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/pom.xml | 29 +- .../nifi-solr-bundle/nifi-solr-nar/pom.xml | 36 ++ .../nifi-solr-processors/pom.xml | 117 ++++++ .../apache/nifi/processors/solr/GetSolr.java | 314 ++++++++++++++ .../processors/solr/PutSolrContentStream.java | 295 +++++++++++++ .../nifi/processors/solr/SolrProcessor.java | 145 +++++++ .../org.apache.nifi.processor.Processor | 16 + .../additionalDetails.html | 48 +++ .../solr/EmbeddedSolrServerFactory.java | 85 ++++ .../nifi/processors/solr/TestGetSolr.java | 200 +++++++++ .../solr/TestPutSolrContentStream.java | 416 +++++++++++++++++++ .../src/test/resources/log4j.properties | 14 + .../src/test/resources/solr/solr.xml | 18 + .../testCollection/conf/_rest_managed.json | 3 + .../testCollection/conf/lang/stopwords_en.txt | 54 +++ .../resources/testCollection/conf/protwords.txt | 21 + .../resources/testCollection/conf/schema.xml | 21 + .../testCollection/conf/solrconfig.xml | 20 + .../resources/testCollection/conf/synonyms.txt | 29 ++ .../resources/testCollection/core.properties | 1 + .../testdata/test-csv-multiple-docs.csv | 2 + .../testdata/test-custom-json-single-doc.json | 15 + .../testdata/test-solr-json-multiple-docs.json | 18 + .../testdata/test-xml-multiple-docs.xml | 18 + nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 39 ++ nifi/nifi-nar-bundles/pom.xml | 1 + nifi/pom.xml | 30 +- 27 files changed, 1981 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3ddfeaf0/nifi/pom.xml ----------------------------------------------------------------------
