You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by da...@apache.org on 2015/06/27 02:29:47 UTC
[20/50] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
github.com:apache/incubator-nifi into develop
Merge branch 'develop' of github.com:apache/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/3045a52e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3045a52e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3045a52e
Branch: refs/heads/NIFI-680
Commit: 3045a52e354dd1f4cec380747b3d9cd6b1feba56
Parents: ce16aab 531136d
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Fri Jun 19 17:46:08 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Fri Jun 19 17:46:08 2015 -0400
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 51 +-
nifi-site/src/includes/topbar.hbs | 7 +-
.../src/pages/html/administrator-guide.hbs | 7 -
nifi-site/src/pages/html/developer-guide.hbs | 2 +-
nifi-site/src/pages/html/docs.hbs | 7 +
nifi-site/src/pages/html/faq.hbs | 6 +-
nifi-site/src/pages/html/overview.hbs | 7 -
nifi-site/src/pages/html/people.hbs | 10 +
nifi-site/src/pages/html/rest-api.hbs | 7 -
nifi-site/src/pages/html/user-guide.hbs | 7 -
nifi/nifi-api/pom.xml | 2 +-
.../apache/nifi/controller/FlowFileQueue.java | 9 +
nifi/nifi-assembly/LICENSE | 37 +-
nifi/nifi-assembly/NOTICE | 120 +++-
nifi/nifi-assembly/pom.xml | 28 +-
.../src/main/assembly/dependencies.xml | 2 +
nifi/nifi-bootstrap/pom.xml | 9 +-
.../org/apache/nifi/bootstrap/NiFiListener.java | 13 +-
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 423 +++++++-------
.../org/apache/nifi/bootstrap/ShutdownHook.java | 6 +-
.../nifi-data-provenance-utils/pom.xml | 2 +-
.../nifi-expression-language/pom.xml | 2 +-
.../attribute/expression/language/Query.java | 135 ++---
.../expression/language/TestQuery.java | 54 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
.../nifi-hl7-query-language/pom.xml | 4 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
.../nifi/processor/util/SSLProperties.java | 10 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
.../apache/nifi/util/NiFiPropertiesTest.java | 13 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi/security/util/SslContextFactory.java | 15 +-
.../nifi-site-to-site-client/pom.xml | 4 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
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 | 4 +-
nifi/nifi-external/nifi-spark-receiver/pom.xml | 3 +-
nifi/nifi-external/nifi-storm-spout/pom.xml | 38 ++
.../org/apache/nifi/storm/NiFiDataPacket.java | 39 ++
.../java/org/apache/nifi/storm/NiFiSpout.java | 232 ++++++++
nifi/nifi-external/pom.xml | 3 +-
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
nifi/nifi-maven-archetypes/pom.xml | 2 +-
nifi/nifi-mock/pom.xml | 2 +-
.../apache/nifi/util/MockProcessSession.java | 40 +-
.../nifi/util/MockProvenanceReporter.java | 365 +++++++++++--
.../apache/nifi/util/MockSessionFactory.java | 8 +-
.../apache/nifi/util/SharedSessionState.java | 26 +-
.../nifi/util/StandardProcessorTestRunner.java | 34 +-
.../java/org/apache/nifi/util/TestRunner.java | 15 +
.../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 +-
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
.../nifi-framework-nar/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 27 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-framework/nifi-documentation/pom.xml | 2 +-
...kControllerServiceInitializationContext.java | 4 +-
.../MockProcessorInitializationContext.java | 4 +-
.../documentation/mock/MockProcessorLogger.java | 169 ++++++
.../MockReportingInitializationContext.java | 4 +-
.../example/ControllerServiceWithLogger.java | 31 ++
.../example/ProcessorWithLogger.java | 37 ++
.../example/ReportingTaskWithLogger.java | 36 ++
.../html/HtmlDocumentationWriterTest.java | 40 +-
.../html/ProcessorDocumentationWriterTest.java | 18 +-
.../nifi/documentation/html/XmlValidator.java | 4 +-
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/pom.xml | 2 +-
.../nifi/cluster/protocol/StandardDataFlow.java | 27 +-
.../nifi-framework-cluster-web/pom.xml | 2 +-
.../nifi-framework-cluster/pom.xml | 8 +-
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 4 +-
.../cluster/manager/impl/WebClusterManager.java | 7 +-
.../impl/DataFlowManagementServiceImplTest.java | 5 +-
.../nifi-framework-core-api/pom.xml | 6 +-
.../nifi/controller/StandardFlowFileQueue.java | 31 +-
.../org/apache/nifi/groups/ProcessGroup.java | 11 +
.../nifi-framework/nifi-framework-core/pom.xml | 8 +-
.../nifi/connectable/StandardConnection.java | 4 +
.../nifi/controller/FlowUnmarshaller.java | 3 +-
.../nifi/controller/StandardFlowSerializer.java | 2 +
.../controller/StandardFlowSynchronizer.java | 2 +
.../repository/StandardProcessSession.java | 204 +++----
.../repository/StandardProvenanceReporter.java | 32 +-
.../repository/VolatileContentRepository.java | 44 +-
.../StandardControllerServiceProvider.java | 14 +-
.../VolatileComponentStatusRepository.java | 2 -
.../nifi/groups/StandardProcessGroup.java | 94 +++-
.../TestStandardProvenanceReporter.java | 7 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../org/apache/nifi/nar/NarUnpackerTest.java | 14 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../src/main/resources/bin/dump-nifi.bat | 80 +--
.../src/main/resources/bin/nifi-status.bat | 33 --
.../src/main/resources/bin/nifi.sh | 21 +-
.../src/main/resources/bin/run-nifi.bat | 80 +--
.../src/main/resources/bin/start-nifi.bat | 33 --
.../src/main/resources/bin/status-nifi.bat | 47 ++
.../src/main/resources/bin/stop-nifi.bat | 33 --
.../src/main/resources/conf/logback.xml | 48 ++
.../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 | 8 +-
.../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 | 2 +-
.../nifi/web/StandardNiFiContentAccess.java | 2 +-
.../nifi/web/StandardNiFiServiceFacade.java | 8 +-
.../apache/nifi/web/api/ProvenanceResource.java | 8 +-
.../apache/nifi/web/api/TemplateResource.java | 2 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 5 +
.../nifi/web/dao/impl/StandardSnippetDAO.java | 2 +-
.../org/apache/nifi/web/util/SnippetUtils.java | 15 +-
.../src/main/resources/templates/index.html.hbs | 2 +-
.../nifi-web/nifi-web-content-access/pom.xml | 2 +-
.../nifi-web/nifi-web-content-viewer/pom.xml | 4 +-
.../nifi/web/ContentViewerController.java | 213 ++++----
.../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 | 4 +-
.../apache/nifi/web/servlet/DownloadSvg.java | 2 +-
.../canvas/controller-service-configuration.jsp | 4 -
.../canvas/process-group-configuration.jsp | 13 +-
.../partials/canvas/process-group-details.jsp | 12 +-
.../remote-process-group-configuration.jsp | 8 +-
.../canvas/remote-process-group-details.jsp | 6 +
.../WEB-INF/partials/status-history-dialog.jsp | 2 +-
.../src/main/webapp/css/controller-service.css | 13 -
.../nifi-web-ui/src/main/webapp/css/history.css | 4 +-
.../webapp/css/process-group-configuration.css | 11 +-
.../main/webapp/css/process-group-details.css | 6 +-
.../css/remote-process-group-configuration.css | 4 +-
.../src/main/webapp/css/status-history.css | 11 +-
.../src/main/webapp/images/iconMoveToParent.png | Bin 0 -> 215 bytes
.../propertytable/jquery.propertytable.js | 51 +-
.../js/nf/bulletin-board/nf-bulletin-board.js | 4 +-
.../src/main/webapp/js/nf/canvas/nf-actions.js | 15 +
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 126 +++--
.../main/webapp/js/nf/canvas/nf-context-menu.js | 12 +-
.../js/nf/canvas/nf-controller-service.js | 22 +-
.../js/nf/canvas/nf-process-group-details.js | 2 +
.../canvas/nf-remote-process-group-details.js | 18 +-
.../src/main/webapp/js/nf/canvas/nf-settings.js | 8 +-
.../webapp/js/nf/history/nf-history-table.js | 13 +-
.../src/main/webapp/js/nf/nf-status-history.js | 2 +-
.../js/nf/templates/nf-templates-table.js | 3 +
.../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 +-
.../src/main/resources/META-INF/NOTICE | 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 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 96 ++--
.../src/main/resources/META-INF/LICENSE | 28 +
.../src/main/resources/META-INF/NOTICE | 81 ++-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE | 238 ++++++++
.../src/main/resources/META-INF/NOTICE | 2 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 6 +-
.../hl7/TestExtractHL7Attributes.java | 47 +-
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 +-
.../nifi/processors/kafka/TestPutKafka.java | 52 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +-
.../src/main/resources/META-INF/LICENSE | 202 -------
.../src/main/resources/META-INF/NOTICE | 2 +-
.../nifi-kite-processors/pom.xml | 2 +-
.../processors/kite/AbstractKiteProcessor.java | 3 +-
.../nifi/processors/kite/ConvertJSONToAvro.java | 36 +-
.../kite/TestJSONToAvroProcessor.java | 17 +-
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +-
.../nifi-language-translation-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 42 ++
.../nifi-yandex-processors/pom.xml | 2 +-
.../nifi-language-translation-bundle/pom.xml | 2 +-
.../nifi-mongodb-nar/pom.xml | 6 +-
.../src/main/resources/META-INF/NOTICE | 24 +
.../nifi-mongodb-processors/pom.xml | 34 +-
.../nifi/processors/mongodb/GetMongoTest.java | 4 +-
.../nifi/processors/mongodb/PutMongoTest.java | 8 +-
.../nifi-mongodb-bundle/pom.xml | 4 +-
.../pom.xml | 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 +-
.../src/main/resources/META-INF/LICENSE | 113 +---
.../src/main/resources/META-INF/NOTICE | 13 +-
.../nifi-solr-processors/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +-
.../nifi-standard-content-viewer/pom.xml | 7 +-
.../web/StandardContentViewerController.java | 4 +-
.../nifi-standard-nar/pom.xml | 2 +-
.../src/main/resources/META-INF/LICENSE | 2 +-
.../src/main/resources/META-INF/NOTICE | 50 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../prioritizer/NewestFirstPrioritizerTest.java | 16 +-
.../prioritizer/OldestFirstPrioritizerTest.java | 16 +-
.../PriorityAttributePrioritizerTest.java | 27 +-
.../nifi-standard-processors/pom.xml | 545 ++++++++++---------
.../standard/AbstractJsonPathProcessor.java | 5 +-
.../standard/Base64EncodeContent.java | 2 +-
.../nifi/processors/standard/BinFiles.java | 23 +-
.../processors/standard/CompressContent.java | 79 +--
.../processors/standard/DetectDuplicate.java | 2 +-
.../nifi/processors/standard/EncodeContent.java | 2 +-
.../processors/standard/EvaluateXQuery.java | 2 +-
.../nifi/processors/standard/ExecuteSQL.java | 157 ++++++
.../standard/ExecuteStreamCommand.java | 78 ++-
.../nifi/processors/standard/ScanContent.java | 2 +-
.../nifi/processors/standard/SplitJson.java | 2 -
.../processors/standard/util/JdbcCommon.java | 165 ++++++
.../org.apache.nifi.processor.Processor | 1 +
.../additionalDetails.html | 2 +-
.../src/test/java/TestDynamicEnvironment.java | 29 +
.../standard/TestCompressContent.java | 50 ++
.../standard/TestEvaluateJsonPath.java | 19 +
.../processors/standard/TestExecuteSQL.java | 169 ++++++
.../standard/TestExecuteStreamCommand.java | 87 ++-
.../processors/standard/TestMergeContent.java | 20 +
.../processors/standard/TestReplaceText.java | 18 +
.../processors/standard/TestScanContent.java | 18 +
.../standard/util/TestJdbcCommon.java | 155 ++++++
.../standard/util/TestJdbcHugeStream.java | 267 +++++++++
.../ExecuteCommand/TestDynamicEnvironment.jar | Bin 0 -> 1200 bytes
.../resources/TestJson/control-characters.json | 7 +
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../nifi-standard-bundle/pom.xml | 17 +-
.../nifi-dbcp-service-api/pom.xml | 2 +-
.../nifi-dbcp-service-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE | 239 ++++++++
.../src/main/resources/META-INF/NOTICE | 13 +
.../nifi-dbcp-service/pom.xml | 4 +-
.../apache/nifi/dbcp/DBCPConnectionPool.java | 181 +++---
.../nifi/dbcp/DatabaseSystemDescriptor.java | 1 +
.../org/apache/nifi/dbcp/DatabaseSystems.java | 1 +
.../org/apache/nifi/dbcp/DBCPServiceTest.java | 160 ++----
.../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 +-
.../cache/server/AbstractCacheServer.java | 8 +-
.../distributed/cache/server/CacheServer.java | 2 +
.../cache/server/DistributedCacheServer.java | 65 ++-
.../cache/server/TestServerAndClient.java | 292 +++++-----
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 2 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 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 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
.../nifi-ssl-context-service/pom.xml | 2 +-
.../nifi/ssl/StandardSSLContextService.java | 91 +++-
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../org/apache/nifi/ssl/SSLContextService.java | 1 +
.../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 +-
.../src/main/resources/META-INF/NOTICE | 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 | 30 +-
nifi/pom.xml | 144 ++---
296 files changed, 5661 insertions(+), 2697 deletions(-)
----------------------------------------------------------------------