Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/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/3667a28e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3667a28e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3667a28e Branch: refs/heads/NIFI-271 Commit: 3667a28e87224a02ae2a7a5a29e36543c242f5be Parents: 509933f ce5a654 Author: Mark Payne <marka...@hotmail.com> Authored: Fri Apr 17 12:06:52 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Fri Apr 17 12:06:52 2015 -0400 ---------------------------------------------------------------------- .../nifi/annotation/lifecycle/OnAdded.java | 13 +- .../nifi/annotation/lifecycle/OnDisabled.java | 29 +- .../nifi/annotation/lifecycle/OnEnabled.java | 34 +- .../nifi/annotation/lifecycle/OnRemoved.java | 14 +- .../nifi/annotation/lifecycle/OnShutdown.java | 13 +- .../nifi/annotation/lifecycle/OnStopped.java | 9 + .../annotation/lifecycle/OnUnscheduled.java | 2 - .../nifi/components/PropertyDescriptor.java | 14 +- .../nifi/components/ValidationContext.java | 9 + .../controller/AbstractControllerService.java | 13 +- .../ControllerServiceInitializationContext.java | 10 + .../controller/ControllerServiceLookup.java | 19 + .../org/apache/nifi/logging/ComponentLog.java | 100 + .../org/apache/nifi/logging/ProcessorLog.java | 61 +- .../nifi/reporting/AbstractReportingTask.java | 10 + .../ReportingInitializationContext.java | 10 + .../nifi/web/ClusterRequestException.java | 1 + .../org/apache/nifi/web/ComponentDetails.java | 157 ++ .../apache/nifi/web/ConfigurationAction.java | 137 ++ .../nifi/web/NiFiWebConfigurationContext.java | 102 + .../web/NiFiWebConfigurationRequestContext.java | 31 + .../org/apache/nifi/web/NiFiWebContext.java | 1 + .../apache/nifi/web/NiFiWebContextConfig.java | 1 + .../apache/nifi/web/NiFiWebRequestContext.java | 58 + .../nifi/web/ProcessorConfigurationAction.java | 1 + .../java/org/apache/nifi/web/ProcessorInfo.java | 1 + .../main/java/org/apache/nifi/web/Revision.java | 32 +- .../org/apache/nifi/web/UiExtensionType.java | 31 + nifi/nifi-assembly/NOTICE | 65 + nifi/nifi-assembly/pom.xml | 927 +++++----- .../nifi-hl7-query-language/.gitignore | 3 + .../nifi-hl7-query-language/pom.xml | 122 ++ .../apache/nifi/hl7/query/antlr/HL7QueryLexer.g | 173 ++ .../nifi/hl7/query/antlr/HL7QueryParser.g | 108 ++ .../org/apache/nifi/hl7/hapi/EmptyField.java | 37 + .../org/apache/nifi/hl7/hapi/HapiField.java | 83 + .../org/apache/nifi/hl7/hapi/HapiMessage.java | 94 + .../org/apache/nifi/hl7/hapi/HapiSegment.java | 69 + .../apache/nifi/hl7/hapi/SingleValueField.java | 42 + .../java/org/apache/nifi/hl7/io/HL7Reader.java | 27 + .../hl7/io/exception/InvalidHL7Exception.java | 40 + .../org/apache/nifi/hl7/model/HL7Component.java | 24 + .../org/apache/nifi/hl7/model/HL7Field.java | 21 + .../org/apache/nifi/hl7/model/HL7Message.java | 27 + .../org/apache/nifi/hl7/model/HL7Segment.java | 27 + .../org/apache/nifi/hl7/query/Declaration.java | 29 + .../org/apache/nifi/hl7/query/HL7Query.java | 412 +++++ .../org/apache/nifi/hl7/query/QueryResult.java | 29 + .../org/apache/nifi/hl7/query/ResultHit.java | 25 + .../org/apache/nifi/hl7/query/Selection.java | 37 + .../hl7/query/evaluator/BooleanEvaluator.java | 24 + .../nifi/hl7/query/evaluator/Evaluator.java | 27 + .../hl7/query/evaluator/IntegerEvaluator.java | 26 + .../hl7/query/evaluator/StringEvaluator.java | 25 + .../comparison/AbstractComparisonEvaluator.java | 106 ++ .../comparison/AbstractNumericComparison.java | 67 + .../evaluator/comparison/EqualsEvaluator.java | 32 + .../comparison/GreaterThanEvaluator.java | 34 + .../comparison/GreaterThanOrEqualEvaluator.java | 34 + .../evaluator/comparison/IsNullEvaluator.java | 69 + .../evaluator/comparison/LessThanEvaluator.java | 31 + .../comparison/LessThanOrEqualEvaluator.java | 31 + .../comparison/NotEqualsEvaluator.java | 32 + .../evaluator/comparison/NotEvaluator.java | 36 + .../evaluator/comparison/NotNullEvaluator.java | 65 + .../literal/IntegerLiteralEvaluator.java | 36 + .../literal/StringLiteralEvaluator.java | 35 + .../hl7/query/evaluator/logic/AndEvaluator.java | 43 + .../hl7/query/evaluator/logic/OrEvaluator.java | 43 + .../message/DeclaredReferenceEvaluator.java | 42 + .../query/evaluator/message/DotEvaluator.java | 88 + .../query/evaluator/message/FieldEvaluator.java | 67 + .../evaluator/message/MessageEvaluator.java | 34 + .../evaluator/message/SegmentEvaluator.java | 51 + .../exception/HL7QueryParsingException.java | 37 + .../nifi/hl7/query/result/MissedResult.java | 56 + .../hl7/query/result/StandardQueryResult.java | 69 + .../hl7/query/result/StandardResultHit.java | 41 + .../org/apache/nifi/hl7/query/TestHL7Query.java | 310 ++++ .../src/test/resources/hyperglycemia | 5 + .../src/test/resources/hypoglycemia | 5 + .../nifi/processor/util/StandardValidators.java | 20 +- .../org/apache/nifi/util/NiFiProperties.java | 2 - .../client/socket/EndpointConnectionPool.java | 59 +- .../nifi/remote/client/socket/SocketClient.java | 9 +- .../protocol/socket/SocketClientProtocol.java | 8 +- .../socket/SocketClientTransaction.java | 25 +- .../socket/TestEndpointConnectionStatePool.java | 4 +- .../java/org/apache/nifi/util/EscapeUtils.java | 42 + nifi/nifi-commons/pom.xml | 1 + .../src/main/asciidoc/administration-guide.adoc | 21 +- ...kControllerServiceInitializationContext.java | 17 + .../nifi/util/MockControllerServiceLookup.java | 11 + .../MockProcessorInitializationContext.java | 10 + .../org/apache/nifi/util/MockProcessorLog.java | 34 +- .../MockReportingInitializationContext.java | 10 +- .../apache/nifi/util/MockValidationContext.java | 15 + .../nifi/util/StandardProcessorTestRunner.java | 5 +- .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 36 + .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 58 + .../processors/aws/AbstractAWSProcessor.java | 195 ++ .../processors/aws/s3/AbstractS3Processor.java | 171 ++ .../nifi/processors/aws/s3/FetchS3Object.java | 157 ++ .../nifi/processors/aws/s3/PutS3Object.java | 181 ++ .../aws/sns/AbstractSNSProcessor.java | 60 + .../apache/nifi/processors/aws/sns/PutSNS.java | 155 ++ .../aws/sqs/AbstractSQSProcessor.java | 51 + .../nifi/processors/aws/sqs/DeleteSQS.java | 95 + .../apache/nifi/processors/aws/sqs/GetSQS.java | 204 ++ .../apache/nifi/processors/aws/sqs/PutSQS.java | 147 ++ .../org.apache.nifi.processor.Processor | 20 + .../processors/aws/s3/TestFetchS3Object.java | 44 + .../nifi/processors/aws/s3/TestPutS3Object.java | 87 + .../nifi/processors/aws/sns/TestPutSNS.java | 34 + .../nifi/processors/aws/sqs/TestGetSQS.java | 32 + .../nifi/processors/aws/sqs/TestPutSQS.java | 35 + .../src/test/resources/hello.txt | 1 + nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 43 + .../org/apache/nifi/admin/dao/ActionDAO.java | 6 +- .../nifi/admin/dao/impl/StandardActionDAO.java | 60 +- .../apache/nifi/admin/service/AuditService.java | 6 +- .../admin/service/action/GetPreviousValues.java | 8 +- .../service/impl/StandardAuditService.java | 4 +- .../nifi/web/api/dto/ComponentHistoryDTO.java | 56 + .../web/api/dto/ControllerConfigurationDTO.java | 18 + .../nifi/web/api/dto/ControllerServiceDTO.java | 190 ++ ...ontrollerServiceReferencingComponentDTO.java | 207 +++ .../nifi/web/api/dto/DocumentedTypeDTO.java | 6 +- .../apache/nifi/web/api/dto/FlowSnippetDTO.java | 15 +- .../nifi/web/api/dto/NiFiComponentDTO.java | 4 +- .../nifi/web/api/dto/ProcessorConfigDTO.java | 218 +-- .../nifi/web/api/dto/ProcessorHistoryDTO.java | 56 - .../nifi/web/api/dto/PropertyDescriptorDTO.java | 244 +++ .../nifi/web/api/dto/ReportingTaskDTO.java | 228 +++ .../apache/nifi/web/api/dto/RevisionDTO.java | 15 + .../component/details/ComponentDetailsDTO.java | 2 +- .../component/details/ExtensionDetailsDTO.java | 41 + .../component/details/ProcessorDetailsDTO.java | 41 - .../web/api/entity/ComponentHistoryEntity.java | 45 + .../web/api/entity/ControllerServiceEntity.java | 45 + ...ollerServiceReferencingComponentsEntity.java | 46 + .../entity/ControllerServiceTypesEntity.java | 46 + .../api/entity/ControllerServicesEntity.java | 46 + .../web/api/entity/ProcessorHistoryEntity.java | 45 - .../api/entity/PropertyDescriptorEntity.java | 46 + .../web/api/entity/ReportingTaskEntity.java | 45 + .../api/entity/ReportingTaskTypesEntity.java | 46 + .../web/api/entity/ReportingTasksEntity.java | 46 + .../nifi-framework/nifi-documentation/pom.xml | 8 - .../html/HtmlDocumentationWriter.java | 15 +- .../html/HtmlProcessorDocumentationWriter.java | 16 +- ...kControllerServiceInitializationContext.java | 6 + .../mock/MockControllerServiceLookup.java | 10 + .../MockReportingInitializationContext.java | 8 +- .../html/HtmlDocumentationWriterTest.java | 8 + .../nifi-framework-cluster-web/pom.xml | 4 - .../context/ClusterContextThreadLocal.java | 7 +- .../ClusterAwareOptimisticLockingManager.java | 96 - .../nifi-framework-cluster/pom.xml | 4 + .../nifi/cluster/flow/ClusterDataFlow.java | 15 +- .../cluster/flow/DataFlowManagementService.java | 17 + .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 43 +- .../impl/DataFlowManagementServiceImpl.java | 65 +- .../nifi/cluster/manager/NodeResponse.java | 14 + .../cluster/manager/impl/WebClusterManager.java | 929 ++++++++-- .../spring/WebClusterManagerFactoryBean.java | 23 +- .../resources/nifi-cluster-manager-context.xml | 4 + .../nifi-framework-core-api/.gitignore | 1 + .../controller/AbstractConfiguredComponent.java | 18 +- .../apache/nifi/controller/Availability.java | 24 - .../nifi/controller/ProcessScheduler.java | 27 +- .../apache/nifi/controller/ProcessorNode.java | 16 + .../nifi/controller/ReportingTaskNode.java | 26 +- .../controller/ValidationContextFactory.java | 4 + .../exception/ComponentLifeCycleException.java | 30 + ...ControllerServiceInstantiationException.java | 51 + .../ControllerServiceNotFoundException.java | 51 - .../exception/ProcessorLifeCycleException.java | 30 - .../reporting/ReportingTaskProvider.java | 103 ++ .../service/ControllerServiceNode.java | 39 +- .../service/ControllerServiceProvider.java | 83 +- .../service/ControllerServiceReference.java | 7 +- .../service/ControllerServiceState.java | 45 + .../apache/nifi/controller/FlowController.java | 211 ++- .../nifi/controller/FlowFromDOMFactory.java | 60 +- .../nifi/controller/StandardFlowSerializer.java | 68 +- .../nifi/controller/StandardFlowService.java | 9 +- .../controller/StandardFlowSynchronizer.java | 236 ++- .../nifi/controller/StandardProcessorNode.java | 47 +- .../apache/nifi/controller/TemplateManager.java | 33 +- .../reporting/AbstractReportingTaskNode.java | 76 +- .../reporting/StandardReportingContext.java | 11 + .../StandardReportingInitializationContext.java | 23 +- .../repository/StandardRepositoryRecord.java | 15 +- .../scheduling/StandardProcessScheduler.java | 210 ++- .../service/ControllerServiceLoader.java | 149 +- ...dControllerServiceInitializationContext.java | 20 +- .../service/StandardControllerServiceNode.java | 128 +- .../StandardControllerServiceProvider.java | 460 ++++- .../StandardControllerServiceReference.java | 19 +- .../tasks/ContinuallyRunConnectableTask.java | 2 +- .../controller/tasks/ReportingTaskWrapper.java | 29 +- .../nifi/fingerprint/FingerprintFactory.java | 79 + .../nifi/groups/StandardProcessGroup.java | 32 +- .../nifi/persistence/FlowConfigurationDAO.java | 25 - .../StandardXMLFlowConfigurationDAO.java | 191 +- .../nifi/processor/SimpleProcessLogger.java | 38 +- .../nifi/processor/StandardProcessContext.java | 10 + .../processor/StandardSchedulingContext.java | 5 +- .../processor/StandardValidationContext.java | 12 + .../StandardValidationContextFactory.java | 5 + .../java/org/apache/nifi/util/DomUtils.java | 10 + .../ControllerServiceConfiguration.xsd | 61 - .../src/main/resources/FlowConfiguration.xsd | 49 +- .../resources/ReportingTaskConfiguration.xsd | 87 - .../StandardControllerServiceProviderTest.java | 71 + .../TestStandardControllerServiceProvider.java | 385 ++++ .../controller/service/mock/DummyProcessor.java | 49 + .../nifi/controller/service/mock/ServiceA.java | 49 + .../nifi/controller/service/mock/ServiceB.java | 23 + .../service/util/TestControllerService.java | 61 + .../processor/TestStandardPropertyValue.java | 11 +- ...org.apache.nifi.controller.ControllerService | 15 + .../nifi-framework/nifi-nar-utils/.gitignore | 1 + .../main/resources/conf/controller-services.xml | 18 - .../src/main/resources/conf/nifi.properties | 2 - .../src/main/resources/conf/reporting-tasks.xml | 49 - .../nifi/remote/StandardRemoteGroupPort.java | 6 +- .../java/org/apache/nifi/action/Component.java | 4 +- .../component/details/ExtensionDetails.java | 34 + .../component/details/ProcessorDetails.java | 34 - .../HttpServletConfigurationRequestContext.java | 56 + .../nifi/web/HttpServletRequestContext.java | 100 + .../web/HttpServletRequestContextConfig.java | 1 + .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 5 + .../org/apache/nifi/web/server/JettyServer.java | 208 ++- .../nifi-web/nifi-ui-extension/pom.xml | 21 + .../apache/nifi/ui/extension/UiExtension.java | 52 + .../nifi/ui/extension/UiExtensionMapping.java | 52 + .../nifi-web/nifi-web-api/pom.xml | 5 + .../nifi/audit/ControllerServiceAuditor.java | 475 +++++ .../org/apache/nifi/audit/FunnelAuditor.java | 8 +- .../java/org/apache/nifi/audit/NiFiAuditor.java | 11 +- .../java/org/apache/nifi/audit/PortAuditor.java | 17 +- .../apache/nifi/audit/ProcessGroupAuditor.java | 18 +- .../org/apache/nifi/audit/ProcessorAuditor.java | 20 +- .../apache/nifi/audit/RelationshipAuditor.java | 18 +- .../nifi/audit/RemoteProcessGroupAuditor.java | 22 +- .../apache/nifi/audit/ReportingTaskAuditor.java | 353 ++++ .../org/apache/nifi/audit/SnippetAuditor.java | 13 +- .../org/apache/nifi/web/NiFiServiceFacade.java | 207 ++- .../nifi/web/StandardNiFiContentAccess.java | 10 +- .../nifi/web/StandardNiFiServiceFacade.java | 1371 ++++++++------ .../StandardNiFiWebConfigurationContext.java | 736 ++++++++ .../apache/nifi/web/StandardNiFiWebContext.java | 28 +- .../nifi/web/api/ApplicationResource.java | 76 +- .../apache/nifi/web/api/ClusterResource.java | 2 +- .../apache/nifi/web/api/ConnectionResource.java | 6 +- .../apache/nifi/web/api/ControllerResource.java | 102 +- .../nifi/web/api/ControllerServiceResource.java | 803 ++++++++ .../org/apache/nifi/web/api/FunnelResource.java | 6 +- .../apache/nifi/web/api/HistoryResource.java | 70 +- .../apache/nifi/web/api/InputPortResource.java | 6 +- .../org/apache/nifi/web/api/LabelResource.java | 6 +- .../apache/nifi/web/api/OutputPortResource.java | 6 +- .../nifi/web/api/ProcessGroupResource.java | 16 +- .../apache/nifi/web/api/ProcessorResource.java | 72 +- .../web/api/RemoteProcessGroupResource.java | 10 +- .../nifi/web/api/ReportingTaskResource.java | 663 +++++++ .../apache/nifi/web/api/SnippetResource.java | 6 +- .../config/AdministrationExceptionMapper.java | 6 +- .../web/api/config/ClusterExceptionMapper.java | 6 +- .../web/api/config/NotFoundExceptionMapper.java | 48 + .../nifi/web/api/config/ThrowableMapper.java | 6 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 303 ++- .../nifi/web/controller/ControllerFacade.java | 112 +- .../nifi/web/dao/ControllerServiceDAO.java | 110 ++ .../apache/nifi/web/dao/ReportingTaskDAO.java | 88 + .../dao/impl/StandardControllerServiceDAO.java | 320 ++++ .../nifi/web/dao/impl/StandardProcessorDAO.java | 13 +- .../web/dao/impl/StandardReportingTaskDAO.java | 365 ++++ .../nifi/web/dao/impl/StandardSnippetDAO.java | 36 +- .../ControllerServiceProviderFactoryBean.java | 68 + .../OptimisticLockingManagerFactoryBean.java | 67 + .../ReportingTaskProviderFactoryBean.java | 69 + .../org/apache/nifi/web/util/Availability.java | 34 + .../org/apache/nifi/web/util/SnippetUtils.java | 181 +- .../src/main/resources/nifi-web-api-context.xml | 61 +- .../nifi/integration/util/NiFiTestServer.java | 5 + .../nifi/web/ContentViewerController.java | 18 +- .../src/main/webapp/WEB-INF/jsp/header.jsp | 20 +- .../src/main/webapp/WEB-INF/jsp/hexview.jsp | 2 +- .../src/main/webapp/css/main.css | 2 +- .../src/main/webapp/js/hexview/hexview.js | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 6 + .../nifi/web/docs/DocumentationController.java | 5 +- .../main/webapp/WEB-INF/jsp/documentation.jsp | 20 +- .../src/main/webapp/js/application.js | 7 +- .../nifi-web-optimistic-locking/pom.xml | 12 + .../apache/nifi/web/ConfigurationRequest.java | 34 + .../apache/nifi/web/ConfigurationSnapshot.java | 22 +- .../org/apache/nifi/web/FlowModification.java | 57 + .../nifi/web/OptimisticLockingManager.java | 76 +- .../web/StandardOptimisticLockingManager.java | 150 +- .../org/apache/nifi/web/UpdateRevision.java | 31 + .../nifi/web/security/user/NiFiUserUtils.java | 10 + .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 18 +- .../main/resources/filters/canvas.properties | 8 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp | 11 +- .../main/webapp/WEB-INF/pages/message-page.jsp | 6 +- .../src/main/webapp/WEB-INF/pages/summary.jsp | 2 + .../WEB-INF/partials/canvas/canvas-header.jsp | 2 +- .../canvas/controller-service-configuration.jsp | 90 + .../disable-controller-service-dialog.jsp | 71 + .../canvas/enable-controller-service-dialog.jsp | 70 + .../canvas/new-controller-service-dialog.jsp | 53 + .../partials/canvas/new-processor-dialog.jsp | 6 +- .../canvas/new-processor-property-dialog.jsp | 34 - .../canvas/new-reporting-task-dialog.jsp | 53 + .../partials/canvas/processor-configuration.jsp | 21 +- .../WEB-INF/partials/canvas/registration.jsp | 2 +- .../canvas/reporting-task-configuration.jsp | 107 ++ .../partials/canvas/settings-content.jsp | 98 +- .../WEB-INF/partials/processor-details.jsp | 4 - .../nifi-web-ui/src/main/webapp/css/about.css | 1 - .../nifi-web-ui/src/main/webapp/css/canvas.css | 4 + .../webapp/css/connection-configuration.css | 1 - .../src/main/webapp/css/connection-details.css | 1 - .../src/main/webapp/css/controller-service.css | 269 +++ .../nifi-web-ui/src/main/webapp/css/dialog.css | 25 +- .../src/main/webapp/css/label-configuration.css | 1 - .../nifi-web-ui/src/main/webapp/css/main.css | 42 +- .../css/new-controller-service-dialog.css | 152 ++ .../main/webapp/css/new-processor-dialog.css | 53 +- .../webapp/css/new-reporting-task-dialog.css | 152 ++ .../src/main/webapp/css/port-configuration.css | 2 - .../src/main/webapp/css/port-details.css | 2 - .../webapp/css/process-group-configuration.css | 1 - .../main/webapp/css/process-group-details.css | 1 - .../main/webapp/css/processor-configuration.css | 153 -- .../src/main/webapp/css/processor-details.css | 27 - .../src/main/webapp/css/registration.css | 8 - .../css/remote-process-group-configuration.css | 3 - .../src/main/webapp/css/reporting-task.css | 116 ++ .../src/main/webapp/css/settings.css | 123 +- .../nifi-web-ui/src/main/webapp/css/shell.css | 2 +- .../src/main/webapp/css/status-history.css | 1 - .../main/webapp/images/buttonNewProperty.png | Bin 590 -> 0 bytes .../src/main/webapp/images/iconEnable.png | Bin 0 -> 472 bytes .../src/main/webapp/images/iconUndo.png | Bin 642 -> 0 bytes .../src/main/webapp/js/jquery/jquery.each.js | 2 +- .../webapp/js/jquery/modal/jquery.modal.css | 12 +- .../main/webapp/js/jquery/modal/jquery.modal.js | 117 +- .../js/jquery/nfeditor/jquery.nfeditor.js | 5 +- .../jquery/propertytable/buttonNewProperty.png | Bin 0 -> 590 bytes .../propertytable/jquery.propertytable.css | 216 +++ .../propertytable/jquery.propertytable.js | 1630 ++++++++++++++++ .../main/webapp/js/jquery/tabbs/jquery.tabbs.js | 2 + .../js/jquery/tagcloud/jquery.tagcloud.css | 62 + .../js/jquery/tagcloud/jquery.tagcloud.js | 226 +++ .../js/nf/bulletin-board/nf-bulletin-board.js | 3 + .../src/main/webapp/js/nf/canvas/nf-actions.js | 17 +- .../src/main/webapp/js/nf/canvas/nf-birdseye.js | 3 + .../webapp/js/nf/canvas/nf-canvas-header.js | 64 +- .../webapp/js/nf/canvas/nf-canvas-toolbar.js | 3 + .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 164 +- .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 10 +- .../src/main/webapp/js/nf/canvas/nf-canvas.js | 113 +- .../main/webapp/js/nf/canvas/nf-clipboard.js | 3 + .../main/webapp/js/nf/canvas/nf-connectable.js | 3 + .../js/nf/canvas/nf-connection-configuration.js | 3 + .../main/webapp/js/nf/canvas/nf-connection.js | 3 + .../main/webapp/js/nf/canvas/nf-context-menu.js | 3 + .../js/nf/canvas/nf-controller-service.js | 1743 ++++++++++++++++++ .../js/nf/canvas/nf-custom-processor-ui.js | 43 - .../main/webapp/js/nf/canvas/nf-custom-ui.js | 47 + .../main/webapp/js/nf/canvas/nf-draggable.js | 3 + .../src/main/webapp/js/nf/canvas/nf-funnel.js | 3 + .../src/main/webapp/js/nf/canvas/nf-go-to.js | 3 + .../webapp/js/nf/canvas/nf-graph-control.js | 3 + .../src/main/webapp/js/nf/canvas/nf-graph.js | 3 + .../js/nf/canvas/nf-label-configuration.js | 3 + .../src/main/webapp/js/nf/canvas/nf-label.js | 3 + .../js/nf/canvas/nf-port-configuration.js | 3 + .../main/webapp/js/nf/canvas/nf-port-details.js | 3 + .../src/main/webapp/js/nf/canvas/nf-port.js | 3 + .../nf/canvas/nf-process-group-configuration.js | 3 + .../js/nf/canvas/nf-process-group-details.js | 3 + .../webapp/js/nf/canvas/nf-process-group.js | 3 + .../js/nf/canvas/nf-processor-configuration.js | 500 ++--- .../nf-processor-property-combo-editor.js | 177 -- .../canvas/nf-processor-property-nfel-editor.js | 207 --- .../js/nf/canvas/nf-processor-property-table.js | 567 ------ .../canvas/nf-processor-property-text-editor.js | 212 --- .../main/webapp/js/nf/canvas/nf-processor.js | 3 + .../main/webapp/js/nf/canvas/nf-registration.js | 7 +- .../nf-remote-process-group-configuration.js | 3 + .../canvas/nf-remote-process-group-details.js | 3 + .../nf/canvas/nf-remote-process-group-ports.js | 3 + .../js/nf/canvas/nf-remote-process-group.js | 3 + .../webapp/js/nf/canvas/nf-reporting-task.js | 732 ++++++++ .../js/nf/canvas/nf-secure-port-details.js | 3 + .../main/webapp/js/nf/canvas/nf-selectable.js | 3 + .../src/main/webapp/js/nf/canvas/nf-settings.js | 1526 ++++++++++++++- .../src/main/webapp/js/nf/canvas/nf-snippet.js | 3 + .../src/main/webapp/js/nf/canvas/nf-storage.js | 3 + .../webapp/js/nf/canvas/nf-toolbar-action.js | 3 + .../webapp/js/nf/cluster/nf-cluster-table.js | 3 + .../src/main/webapp/js/nf/cluster/nf-cluster.js | 3 + .../webapp/js/nf/counters/nf-counters-table.js | 3 + .../main/webapp/js/nf/counters/nf-counters.js | 3 + .../webapp/js/nf/history/nf-history-model.js | 3 + .../webapp/js/nf/history/nf-history-table.js | 7 +- .../src/main/webapp/js/nf/history/nf-history.js | 3 + .../src/main/webapp/js/nf/nf-client.js | 3 + .../src/main/webapp/js/nf/nf-common.js | 83 +- .../main/webapp/js/nf/nf-connection-details.js | 3 + .../src/main/webapp/js/nf/nf-dialog.js | 18 +- .../main/webapp/js/nf/nf-processor-details.js | 358 +--- .../src/main/webapp/js/nf/nf-shell.js | 3 + .../src/main/webapp/js/nf/nf-status-history.js | 3 + .../js/nf/provenance/nf-provenance-lineage.js | 3 + .../js/nf/provenance/nf-provenance-table.js | 3 + .../webapp/js/nf/provenance/nf-provenance.js | 3 + .../webapp/js/nf/summary/nf-summary-table.js | 2 + .../src/main/webapp/js/nf/summary/nf-summary.js | 3 + .../js/nf/templates/nf-templates-table.js | 3 + .../main/webapp/js/nf/templates/nf-templates.js | 3 + .../main/webapp/js/nf/users/nf-users-table.js | 3 + .../nifi-framework/nifi-web/pom.xml | 4 +- .../nifi-geo-bundle/nifi-geo-nar/pom.xml | 33 + .../nifi-geo-processors/.gitignore | 1 + .../nifi-geo-bundle/nifi-geo-processors/pom.xml | 43 + .../org/apache/nifi/processors/GeoEnrichIP.java | 208 +++ .../nifi/processors/maxmind/DatabaseReader.java | 286 +++ .../org.apache.nifi.processor.Processor | 16 + nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 42 + .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 36 + .../nifi-hl7-processors/.gitignore | 1 + .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 120 ++ .../processors/hl7/ExtractHL7Attributes.java | 247 +++ .../apache/nifi/processors/hl7/RouteHL7.java | 217 +++ .../org.apache.nifi.processor.Processor | 16 + .../hl7/TestExtractHL7Attributes.java | 48 + .../src/test/resources/hypoglycemia.hl7 | 5 + nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 33 + .../nifi-language-translation-nar/pom.xml | 36 + .../nifi-yandex-processors/.gitignore | 1 + .../nifi-yandex-processors/pom.xml | 63 + .../nifi/processors/yandex/YandexTranslate.java | 333 ++++ .../processors/yandex/model/Translation.java | 52 + .../nifi/processors/yandex/util/Languages.java | 86 + .../yandex/util/ObjectMapperResolver.java | 48 + .../org.apache.nifi.processor.Processor | 16 + .../processors/yandex/TestYandexTranslate.java | 226 +++ .../nifi-language-translation-bundle/pom.xml | 48 + .../nifi-social-media-nar/pom.xml | 36 + .../nifi-twitter-processors/.gitignore | 1 + .../nifi-twitter-processors/pom.xml | 60 + .../nifi/processors/twitter/GetTwitter.java | 360 ++++ .../org.apache.nifi.processor.Processor | 16 + .../nifi-social-media-bundle/pom.xml | 33 + .../nifi-standard-content-viewer/pom.xml | 5 + .../src/main/webapp/WEB-INF/jsp/codemirror.jsp | 7 +- .../processors/standard/EvaluateJsonPath.java | 1 + .../standard/TestDetectDuplicate.java | 5 +- .../DistributedMapCacheClientService.java | 21 +- .../DistributedSetCacheClientService.java | 16 +- .../cache/server/AbstractCacheServer.java | 2 +- .../cache/server/DistributedCacheServer.java | 13 +- .../nifi/http/StandardHttpContextMap.java | 9 + .../nifi/ssl/StandardSSLContextService.java | 39 +- .../nifi-update-attribute-ui/pom.xml | 5 + .../update/attributes/api/RuleResource.java | 131 +- .../src/main/webapp/META-INF/nifi-processor | 15 - .../META-INF/nifi-processor-configuration | 15 + .../src/main/webapp/WEB-INF/jsp/worksheet.jsp | 10 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../src/main/webapp/js/application.js | 25 +- nifi/nifi-nar-bundles/pom.xml | 8 +- nifi/pom.xml | 31 +- 481 files changed, 29995 insertions(+), 5962 deletions(-) ----------------------------------------------------------------------