Merge pull request #6 from apache/develop Merging in latest Apache NiFi develop branch
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a1af29ec Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a1af29ec Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a1af29ec Branch: refs/heads/develop Commit: a1af29eca06fa56903ca2fa28945a0f922d6e8e9 Parents: 97f33d5 cafddb6 Author: Brian Ghigiarelli <[email protected]> Authored: Thu Jul 23 21:43:06 2015 -0400 Committer: Brian Ghigiarelli <[email protected]> Committed: Thu Jul 23 21:43:06 2015 -0400 ---------------------------------------------------------------------- README.md | 28 +- nifi-nar-maven-plugin/pom.xml | 6 +- nifi-parent/pom.xml | 39 ++- nifi-site/Gruntfile.js | 4 +- nifi-site/README.md | 6 +- nifi-site/bower.json | 4 +- nifi-site/package.json | 4 +- nifi-site/src/images/egg-logo.png | Bin 8626 -> 0 bytes nifi-site/src/includes/disclaimer.hbs | 20 +- nifi-site/src/includes/topbar.hbs | 5 +- nifi-site/src/pages/html/download.hbs | 44 +-- nifi-site/src/pages/html/mailing_lists.hbs | 26 +- nifi-site/src/pages/html/people.hbs | 53 +-- nifi-site/src/pages/markdown/licensing-guide.md | 5 +- nifi-site/src/pages/markdown/quickstart.md | 61 +++- nifi-site/src/pages/markdown/release-guide.md | 147 +++----- nifi/DISCLAIMER | 15 - nifi/README.md | 32 +- nifi/nifi-api/pom.xml | 2 +- .../nifi/annotation/lifecycle/OnDisabled.java | 10 +- .../nifi/controller/ConfigurationContext.java | 23 +- .../org/apache/nifi/events/EventReporter.java | 4 +- .../org/apache/nifi/reporting/Bulletin.java | 11 +- .../apache/nifi/reporting/BulletinQuery.java | 12 + .../apache/nifi/reporting/ComponentType.java | 58 ++++ nifi/nifi-assembly/NOTICE | 86 +++++ nifi/nifi-assembly/README.md | 20 +- nifi/nifi-assembly/pom.xml | 33 +- .../src/main/assembly/dependencies.xml | 23 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../java/org/apache/nifi/bootstrap/RunNiFi.java | 14 +- .../nifi-data-provenance-utils/pom.xml | 2 +- .../nifi-expression-language/pom.xml | 2 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +- .../nifi-hl7-query-language/pom.xml | 2 +- nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +- .../nifi-processor-utilities/pom.xml | 2 +- nifi/nifi-commons/nifi-properties/pom.xml | 2 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +- .../nifi-site-to-site-client/pom.xml | 4 +- .../apache/nifi/remote/client/KeystoreType.java | 24 ++ .../nifi/remote/client/SiteToSiteClient.java | 257 +++++++++++++- .../remote/client/SiteToSiteClientConfig.java | 32 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +- nifi/nifi-commons/nifi-utils/pom.xml | 4 +- .../nifi/stream/io/ByteCountingInputStream.java | 1 + .../org/apache/nifi/util/file/FileUtils.java | 27 +- .../stream/io/ByteCountingInputStreamTest.java | 55 +++ nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- .../src/main/asciidoc/administration-guide.adoc | 4 +- .../src/main/asciidoc/developer-guide.adoc | 10 +- .../asciidoc/expression-language-guide.adoc | 12 +- nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 +- .../nifi-docs/src/main/asciidoc/user-guide.adoc | 6 +- .../nifi-nifi-example-nar/pom.xml | 35 ++ .../nifi-nifi-example-processors/pom.xml | 70 ++++ .../nifi/processors/WriteResourceToStream.java | 102 ++++++ .../org.apache.nifi.processor.Processor | 15 + .../src/main/resources/file.txt | 1 + .../processors/WriteResourceToStreamTest.java | 47 +++ nifi/nifi-external/nifi-example-bundle/pom.xml | 42 +++ nifi/nifi-external/nifi-spark-receiver/pom.xml | 2 +- nifi/nifi-external/nifi-storm-spout/pom.xml | 4 +- .../java/org/apache/nifi/storm/NiFiSpout.java | 38 ++- nifi/nifi-external/pom.xml | 4 +- .../nifi-processor-bundle-archetype/pom.xml | 2 +- .../META-INF/maven/archetype-metadata.xml | 4 +- nifi/nifi-maven-archetypes/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 2 +- .../nifi/util/MockConfigurationContext.java | 11 + .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 +- .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +- .../nifi-flume-bundle/nifi-flume-nar/pom.xml | 131 +++++++ .../src/main/resources/META-INF/LICENSE | 319 +++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 192 +++++++++++ .../nifi-flume-processors/pom.xml | 176 ++++++++++ .../flume/AbstractFlumeProcessor.java | 160 +++++++++ .../nifi/processors/flume/ExecuteFlumeSink.java | 144 ++++++++ .../processors/flume/ExecuteFlumeSource.java | 195 +++++++++++ .../processors/flume/NifiChannelSelector.java | 69 ++++ .../processors/flume/NifiSessionChannel.java | 47 +++ .../flume/NifiSessionFactoryChannel.java | 50 +++ .../flume/NifiSinkSessionChannel.java | 49 +++ .../processors/flume/NifiSinkTransaction.java | 71 ++++ .../nifi/processors/flume/NifiTransaction.java | 54 +++ .../processors/flume/util/FlowFileEvent.java | 134 ++++++++ .../flume/util/FlowFileEventConstants.java | 40 +++ .../org.apache.nifi.processor.Processor | 16 + .../additionalDetails.html | 159 +++++++++ .../additionalDetails.html | 114 +++++++ .../processors/flume/ExecuteFlumeSinkTest.java | 169 +++++++++ .../flume/ExecuteFlumeSourceTest.java | 151 +++++++++ .../src/test/resources/core-site-broken.xml | 25 ++ .../src/test/resources/core-site.xml | 30 ++ .../src/test/resources/log4j.properties | 22 ++ .../src/test/resources/simplelogger.properties | 21 ++ .../src/test/resources/testdata/records.txt | 4 + nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml | 39 +++ .../nifi-framework-nar/pom.xml | 2 +- .../nifi-framework/nifi-administration/pom.xml | 2 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../web/api/dto/status/ControllerStatusDTO.java | 33 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-framework/nifi-documentation/pom.xml | 7 +- .../ConfigurableComponentInitializer.java | 9 +- .../apache/nifi/documentation/DocGenerator.java | 7 +- .../html/HtmlDocumentationWriter.java | 75 +++- .../init/ControllerServiceInitializer.java | 25 +- .../init/ProcessorInitializer.java | 20 +- .../init/ReportingTaskingInitializer.java | 19 +- .../mock/MockConfigurationContext.java | 48 +++ .../documentation/mock/MockProcessContext.java | 85 +++++ .../documentation/util/ReflectionUtils.java | 139 ++++++++ .../nifi/documentation/DocGeneratorTest.java | 96 ++++++ .../FullyDocumentedControllerService.java | 63 +++- .../example/FullyDocumentedProcessor.java | 49 ++- .../example/FullyDocumentedReportingTask.java | 46 ++- .../html/HtmlDocumentationWriterTest.java | 35 +- .../html/ProcessorDocumentationWriterTest.java | 22 +- .../src/test/resources/conf/nifi.properties | 129 +++++++ .../src/test/resources/lib/example.nar | Bin 0 -> 721040 bytes .../src/test/resources/lib/jetty.nar | Bin 0 -> 4638519 bytes .../test/resources/lib/nifi-framework-nar.nar | Bin 0 -> 406 bytes .../nifi-file-authorization-provider/pom.xml | 2 +- .../nifi-framework-cluster-protocol/pom.xml | 2 +- .../nifi-framework-cluster-web/pom.xml | 2 +- .../nifi-framework-cluster/pom.xml | 2 +- .../manager/impl/ClusteredReportingContext.java | 46 ++- .../cluster/manager/impl/WebClusterManager.java | 80 +++-- .../nifi-framework-core-api/pom.xml | 2 +- .../org/apache/nifi/events/BulletinFactory.java | 30 +- .../org/apache/nifi/events/SystemBulletin.java | 2 + .../nifi/logging/LogRepositoryFactory.java | 6 +- .../java/org/apache/nifi/nar/NarCloseable.java | 44 --- .../nifi/nar/NarThreadContextClassLoader.java | 187 ---------- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../apache/nifi/controller/FlowController.java | 39 ++- .../reporting/AbstractReportingTaskNode.java | 4 +- .../repository/FileSystemRepository.java | 20 +- .../repository/VolatileContentRepository.java | 8 +- .../scheduling/StandardProcessScheduler.java | 131 +++---- .../service/ControllerServiceLoader.java | 11 +- .../service/StandardConfigurationContext.java | 26 +- .../service/StandardControllerServiceNode.java | 2 +- .../StandardControllerServiceProvider.java | 10 +- .../nifi/events/VolatileBulletinRepository.java | 122 +++++-- .../org/apache/nifi/jaxb/AdaptedBulletin.java | 10 + .../org/apache/nifi/jaxb/BulletinAdapter.java | 3 +- .../logging/ControllerServiceLogObserver.java | 46 +++ .../nifi/logging/ReportingTaskLogObserver.java | 45 +++ .../nifi/remote/StandardRemoteProcessGroup.java | 18 +- ...nifi.controller.repository.ContentRepository | 16 + ...ifi.controller.repository.FlowFileRepository | 16 + ...fi.controller.repository.FlowFileSwapManager | 15 + ...ler.status.history.ComponentStatusRepository | 15 + .../TestStandardProcessScheduler.java | 107 ++++++ .../src/test/resources/nifi.properties | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../java/org/apache/nifi/nar/NarCloseable.java | 44 +++ .../nifi/nar/NarThreadContextClassLoader.java | 187 ++++++++++ .../nifi-framework/nifi-resources/pom.xml | 2 +- .../src/main/resources/bin/nifi.sh | 21 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml | 2 +- .../nifi-framework/nifi-site-to-site/pom.xml | 2 +- .../nifi/remote/StandardRootGroupPort.java | 6 +- .../src/test/resources/nifi.properties | 2 +- .../nifi-framework/nifi-user-actions/pom.xml | 2 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-ui-extension/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 6 +- .../nifi/web/StandardNiFiServiceFacade.java | 19 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 22 +- .../nifi/web/controller/ControllerFacade.java | 43 ++- .../resources/access-control/nifi.properties | 2 +- .../nifi-web/nifi-web-content-access/pom.xml | 2 +- .../nifi-web/nifi-web-content-viewer/pom.xml | 2 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../WEB-INF/partials/canvas/about-dialog.jsp | 4 +- .../disable-controller-service-dialog.jsp | 7 +- .../canvas/enable-controller-service-dialog.jsp | 7 +- .../src/main/webapp/css/controller-service.css | 50 ++- .../nifi-web-ui/src/main/webapp/css/main.css | 1 + .../src/main/webapp/js/nf/canvas/nf-canvas.js | 3 + .../js/nf/canvas/nf-controller-service.js | 261 +++++++++++--- .../webapp/js/nf/canvas/nf-reporting-task.js | 5 +- .../src/main/webapp/js/nf/canvas/nf-settings.js | 194 ++++++++++- .../src/main/webapp/js/nf/nf-common.js | 16 +- .../nifi-framework/nifi-web/pom.xml | 12 +- .../nifi-framework/pom.xml | 2 +- .../nifi-framework-bundle/pom.xml | 38 +-- .../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +- .../nifi-geo-bundle/nifi-geo-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 4 +- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +- .../nifi-hdfs-processors/pom.xml | 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +- .../nifi-hadoop-libraries-nar/pom.xml | 2 +- .../nifi-hadoop-libraries-bundle/pom.xml | 2 +- .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +- .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 4 +- nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +- .../nifi-kafka-processors/pom.xml | 2 +- .../apache/nifi/processors/kafka/GetKafka.java | 28 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +- .../nifi-kite-processors/pom.xml | 2 +- .../processors/kite/AvroRecordConverter.java | 320 +++++++++++++++++ .../nifi/processors/kite/ConvertAvroSchema.java | 339 +++++++++++++++++++ .../nifi/processors/kite/ConvertCSVToAvro.java | 76 +++-- .../nifi/processors/kite/ConvertJSONToAvro.java | 95 ++++-- .../nifi/processors/kite/FailureTracker.java | 83 +++++ .../org.apache.nifi.processor.Processor | 1 + .../additionalDetails.html | 142 ++++++++ .../kite/TestAvroRecordConverter.java | 201 +++++++++++ .../processors/kite/TestCSVToAvroProcessor.java | 96 +++++- .../processors/kite/TestConvertAvroSchema.java | 216 ++++++++++++ .../kite/TestJSONToAvroProcessor.java | 101 +++++- nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +- .../nifi-language-translation-nar/pom.xml | 4 +- .../nifi-yandex-processors/pom.xml | 2 +- .../nifi-language-translation-bundle/pom.xml | 2 +- .../nifi-mongodb-nar/pom.xml | 6 +- .../nifi-mongodb-processors/pom.xml | 2 +- .../nifi-mongodb-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi/provenance/StandardRecordReader.java | 10 +- .../TestPersistentProvenanceRepository.java | 2 + .../nifi-provenance-repository-nar/pom.xml | 2 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 6 +- .../nifi-social-media-nar/pom.xml | 4 +- .../nifi-twitter-processors/pom.xml | 2 +- .../nifi-social-media-bundle/pom.xml | 2 +- .../nifi-solr-bundle/nifi-solr-nar/pom.xml | 4 +- .../nifi-solr-processors/pom.xml | 2 +- .../apache/nifi/processors/solr/GetSolr.java | 15 +- .../nifi/processors/solr/TestGetSolr.java | 29 +- nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 13 +- .../nifi-standard-content-viewer/pom.xml | 2 +- .../nifi-standard-nar/pom.xml | 2 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml | 5 +- .../nifi/processors/standard/GetHTTP.java | 53 ++- .../nifi/processors/standard/InvokeHTTP.java | 46 ++- .../nifi/processors/standard/PostHTTP.java | 64 +++- .../nifi/processors/standard/TestGetHTTP.java | 10 +- .../standard/TestHandleHttpRequest.java | 2 +- .../processors/standard/TestInvokeHTTP.java | 129 ++++++- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../apache/nifi/controller/MonitorMemory.java | 14 +- .../nifi-standard-bundle/pom.xml | 10 +- .../nifi-dbcp-service-api/pom.xml | 2 +- .../nifi-dbcp-service-nar/pom.xml | 4 +- .../nifi-dbcp-service/pom.xml | 4 +- .../nifi-dbcp-service-bundle/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-http-context-map-api/pom.xml | 2 +- .../nifi-http-context-map-nar/pom.xml | 2 +- .../nifi-http-context-map/pom.xml | 2 +- .../nifi-http-context-map-bundle/pom.xml | 2 +- .../nifi-load-distribution-service-api/pom.xml | 2 +- .../nifi-ssl-context-nar/pom.xml | 2 +- .../nifi-ssl-context-service/pom.xml | 2 +- .../nifi-ssl-context-bundle/pom.xml | 2 +- .../nifi-ssl-context-service-api/pom.xml | 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 2 +- .../nifi-update-attribute-model/pom.xml | 2 +- .../nifi-update-attribute-nar/pom.xml | 2 +- .../nifi-update-attribute-processor/pom.xml | 2 +- .../nifi-update-attribute-ui/pom.xml | 2 +- .../nifi-update-attribute-bundle/pom.xml | 8 +- nifi/nifi-nar-bundles/pom.xml | 31 +- nifi/pom.xml | 118 ++++--- 291 files changed, 8287 insertions(+), 1333 deletions(-) ----------------------------------------------------------------------
