You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/04/10 15:44:37 UTC
[62/62] [abbrv] incubator-nifi git commit: Merge branch 'develop'
into NIFI-25
Merge branch 'develop' into NIFI-25
Conflicts:
nifi/nifi-assembly/NOTICE
nifi/nifi-nar-bundles/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/93a12104
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/93a12104
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/93a12104
Branch: refs/heads/NIFI-25
Commit: 93a121044b1a7efcfc3023178fb39f2f44ad836c
Parents: 373f470 c201aa1
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Apr 10 09:42:53 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Apr 10 09:42:53 2015 -0400
----------------------------------------------------------------------
nifi/NOTICE | 5 -
nifi/nifi-api/pom.xml | 2 +-
.../annotation/behavior/DynamicProperties.java | 42 +
.../annotation/behavior/DynamicProperty.java | 67 +
.../behavior/DynamicRelationship.java | 56 +
.../annotation/behavior/ReadsAttribute.java | 50 +
.../annotation/behavior/ReadsAttributes.java | 44 +
.../annotation/behavior/WritesAttribute.java | 51 +
.../annotation/behavior/WritesAttributes.java | 44 +
.../nifi/annotation/documentation/SeeAlso.java | 59 +
.../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 -
.../AbstractConfigurableComponent.java | 5 +-
.../nifi/components/PropertyDescriptor.java | 14 +-
.../nifi/components/ValidationContext.java | 28 +
.../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 +-
.../apache/nifi/processor/ProcessSession.java | 40 +-
.../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 +
.../org/apache/nifi/web/ViewableContent.java | 74 +
nifi/nifi-assembly/NOTICE | 55 +
nifi/nifi-assembly/pom.xml | 928 ++--
nifi/nifi-bootstrap/pom.xml | 2 +-
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 131 +-
.../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/.gitignore | 3 +
.../nifi-hl7-query-language/pom.xml | 115 +
.../apache/nifi/hl7/query/antlr/HL7QueryLexer.g | 156 +
.../nifi/hl7/query/antlr/HL7QueryParser.g | 91 +
.../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 | 352 ++
.../src/test/resources/hyperglycemia | 5 +
.../src/test/resources/hypoglycemia | 5 +
.../src/test/resources/metabolic-panel | 23 +
.../resources/unsolicited-vaccine-update-long | 16 +
.../resources/unsolicited-vaccine-update-short | 4 +
.../src/test/resources/vaccine-query | 3 +
.../src/test/resources/vaers-message-long | 60 +
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
.../nifi/processor/util/StandardValidators.java | 116 +-
.../processor/util/TestStandardValidators.java | 49 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
.../org/apache/nifi/util/NiFiProperties.java | 2 -
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi-site-to-site-client/pom.xml | 8 +-
.../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 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
.../java/org/apache/nifi/util/EscapeUtils.java | 42 +
nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +-
nifi/nifi-commons/pom.xml | 3 +-
nifi/nifi-docs/pom.xml | 2 +-
.../src/main/asciidoc/administration-guide.adoc | 26 +-
.../src/main/asciidoc/developer-guide.adoc | 35 +
nifi/nifi-external/nifi-spark-receiver/pom.xml | 72 +-
nifi/nifi-external/pom.xml | 2 +-
.../nifi-processor-bundle-archetype/pom.xml | 6 +-
.../META-INF/maven/archetype-metadata.xml | 2 +-
.../src/main/java/MyProcessor.java | 8 +
.../docs/__package__.MyProcessor/index.html | 96 -
nifi/nifi-maven-archetypes/pom.xml | 5 +-
nifi/nifi-mock/pom.xml | 2 +-
...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 | 42 +
.../nifi/util/StandardProcessorTestRunner.java | 9 +-
.../nifi-framework-nar/pom.xml | 2 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../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-framework/nifi-client-dto/pom.xml | 2 +-
.../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-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-cluster-protocol/.gitignore | 1 -
.../nifi-cluster-protocol/pom.xml | 67 -
.../protocol/ClusterManagerProtocolSender.java | 69 -
.../cluster/protocol/ConnectionRequest.java | 44 -
.../cluster/protocol/ConnectionResponse.java | 141 -
.../apache/nifi/cluster/protocol/Heartbeat.java | 68 -
.../nifi/cluster/protocol/NodeBulletins.java | 44 -
.../nifi/cluster/protocol/NodeIdentifier.java | 172 -
.../cluster/protocol/NodeProtocolSender.java | 73 -
.../nifi/cluster/protocol/ProtocolContext.java | 39 -
.../cluster/protocol/ProtocolException.java | 40 -
.../nifi/cluster/protocol/ProtocolHandler.java | 44 -
.../nifi/cluster/protocol/ProtocolListener.java | 72 -
.../protocol/ProtocolMessageMarshaller.java | 38 -
.../protocol/ProtocolMessageUnmarshaller.java | 38 -
.../nifi/cluster/protocol/StandardDataFlow.java | 105 -
.../UnknownServiceAddressException.java | 39 -
.../impl/ClusterManagerProtocolSenderImpl.java | 245 -
.../ClusterManagerProtocolSenderListener.java | 118 -
.../protocol/impl/ClusterServiceDiscovery.java | 181 -
.../protocol/impl/ClusterServiceLocator.java | 229 -
.../impl/ClusterServicesBroadcaster.java | 182 -
.../protocol/impl/CopyingInputStream.java | 77 -
.../impl/MulticastProtocolListener.java | 204 -
.../protocol/impl/NodeProtocolSenderImpl.java | 171 -
.../impl/NodeProtocolSenderListener.java | 115 -
.../protocol/impl/SocketProtocolListener.java | 205 -
.../protocol/jaxb/JaxbProtocolContext.java | 148 -
.../jaxb/message/AdaptedConnectionRequest.java | 40 -
.../jaxb/message/AdaptedConnectionResponse.java | 109 -
.../protocol/jaxb/message/AdaptedCounter.java | 56 -
.../protocol/jaxb/message/AdaptedDataFlow.java | 64 -
.../protocol/jaxb/message/AdaptedHeartbeat.java | 66 -
.../jaxb/message/AdaptedNodeBulletins.java | 50 -
.../jaxb/message/AdaptedNodeIdentifier.java | 76 -
.../jaxb/message/ConnectionRequestAdapter.java | 41 -
.../jaxb/message/ConnectionResponseAdapter.java | 55 -
.../protocol/jaxb/message/DataFlowAdapter.java | 50 -
.../protocol/jaxb/message/HeartbeatAdapter.java | 54 -
.../jaxb/message/JaxbProtocolUtils.java | 42 -
.../jaxb/message/NodeBulletinsAdapter.java | 48 -
.../jaxb/message/NodeIdentifierAdapter.java | 51 -
.../protocol/jaxb/message/ObjectFactory.java | 104 -
.../message/ConnectionRequestMessage.java | 46 -
.../message/ConnectionResponseMessage.java | 66 -
.../ControllerStartupFailureMessage.java | 49 -
.../protocol/message/DisconnectMessage.java | 55 -
.../protocol/message/ExceptionMessage.java | 44 -
.../protocol/message/FlowRequestMessage.java | 46 -
.../protocol/message/FlowResponseMessage.java | 44 -
.../protocol/message/HeartbeatMessage.java | 43 -
.../message/MulticastProtocolMessage.java | 66 -
.../protocol/message/NodeBulletinsMessage.java | 43 -
.../cluster/protocol/message/PingMessage.java | 55 -
.../message/PrimaryRoleAssignmentMessage.java | 56 -
.../protocol/message/ProtocolMessage.java | 61 -
.../message/ReconnectionFailureMessage.java | 45 -
.../message/ReconnectionRequestMessage.java | 94 -
.../message/ReconnectionResponseMessage.java | 32 -
.../message/ServiceBroadcastMessage.java | 64 -
.../MulticastConfigurationFactoryBean.java | 60 -
.../ServerSocketConfigurationFactoryBean.java | 65 -
.../spring/SocketConfigurationFactoryBean.java | 66 -
.../resources/nifi-cluster-protocol-context.xml | 110 -
.../ClusterManagerProtocolSenderImplTest.java | 134 -
.../impl/ClusterServiceDiscoveryTest.java | 135 -
.../impl/ClusterServiceLocatorTest.java | 121 -
.../impl/ClusterServicesBroadcasterTest.java | 133 -
.../impl/MulticastProtocolListenerTest.java | 171 -
.../impl/NodeProtocolSenderImplTest.java | 203 -
.../impl/testutils/DelayedProtocolHandler.java | 57 -
.../testutils/ReflexiveProtocolHandler.java | 47 -
.../nifi-framework/nifi-cluster-web/.gitignore | 1 -
.../nifi-framework/nifi-cluster-web/pom.xml | 48 -
.../nifi/cluster/context/ClusterContext.java | 59 -
.../cluster/context/ClusterContextImpl.java | 69 -
.../context/ClusterContextThreadLocal.java | 47 -
.../ClusterAwareOptimisticLockingManager.java | 96 -
.../nifi-framework/nifi-cluster/.gitignore | 1 -
.../nifi-framework/nifi-cluster/pom.xml | 130 -
.../cluster/client/MulticastTestClient.java | 151 -
.../org/apache/nifi/cluster/event/Event.java | 122 -
.../apache/nifi/cluster/event/EventManager.java | 65 -
.../cluster/event/impl/EventManagerImpl.java | 143 -
.../cluster/firewall/ClusterNodeFirewall.java | 35 -
.../impl/FileBasedClusterNodeFirewall.java | 207 -
.../nifi/cluster/flow/ClusterDataFlow.java | 45 -
.../apache/nifi/cluster/flow/DaoException.java | 40 -
.../apache/nifi/cluster/flow/DataFlowDao.java | 62 -
.../cluster/flow/DataFlowManagementService.java | 115 -
.../nifi/cluster/flow/PersistedFlowState.java | 37 -
.../nifi/cluster/flow/StaleFlowException.java | 42 -
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 600 ---
.../impl/DataFlowManagementServiceImpl.java | 356 --
.../nifi/cluster/manager/ClusterManager.java | 225 -
.../cluster/manager/HttpClusterManager.java | 169 -
.../cluster/manager/HttpRequestReplicator.java | 99 -
.../cluster/manager/HttpResponseMapper.java | 42 -
.../nifi/cluster/manager/NodeResponse.java | 329 --
.../exception/BlockedByFirewallException.java | 60 -
.../manager/exception/ClusterException.java | 40 -
.../ConnectingNodeMutableRequestException.java | 41 -
...DisconnectedNodeMutableRequestException.java | 41 -
.../exception/IllegalClusterStateException.java | 41 -
.../exception/IllegalNodeDeletionException.java | 41 -
.../IllegalNodeDisconnectionException.java | 42 -
.../IllegalNodeReconnectionException.java | 41 -
.../IneligiblePrimaryNodeException.java | 41 -
.../exception/MutableRequestException.java | 42 -
.../exception/NoConnectedNodesException.java | 41 -
.../exception/NoResponseFromNodesException.java | 42 -
.../exception/NodeDisconnectionException.java | 41 -
.../exception/NodeReconnectionException.java | 40 -
.../PrimaryRoleAssignmentException.java | 41 -
.../SafeModeMutableRequestException.java | 41 -
.../manager/exception/UnknownNodeException.java | 41 -
.../exception/UriConstructionException.java | 42 -
.../manager/impl/ClusteredEventAccess.java | 135 -
.../manager/impl/ClusteredReportingContext.java | 165 -
.../manager/impl/HttpRequestReplicatorImpl.java | 531 ---
.../manager/impl/HttpResponseMapperImpl.java | 85 -
.../cluster/manager/impl/WebClusterManager.java | 3628 ---------------
.../java/org/apache/nifi/cluster/node/Node.java | 252 --
...anagerProtocolServiceLocatorFactoryBean.java | 116 -
...FileBasedClusterNodeFirewallFactoryBean.java | 58 -
.../spring/WebClusterManagerFactoryBean.java | 139 -
.../reporting/ClusteredReportingTaskNode.java | 49 -
.../resources/nifi-cluster-manager-context.xml | 124 -
.../event/impl/EventManagerImplTest.java | 119 -
.../impl/FileBasedClusterNodeFirewallTest.java | 98 -
.../impl/DataFlowManagementServiceImplTest.java | 343 --
.../impl/HttpRequestReplicatorImplTest.java | 368 --
.../impl/HttpResponseMapperImplTest.java | 126 -
.../manager/impl/TestWebClusterManager.java | 54 -
.../cluster/manager/testutils/HttpRequest.java | 239 -
.../cluster/manager/testutils/HttpResponse.java | 93 -
.../manager/testutils/HttpResponseAction.java | 60 -
.../cluster/manager/testutils/HttpServer.java | 240 -
.../ClusterManagerProtocolSenderImplTest.java | 133 -
.../impl/ClusterServiceLocatorTest.java | 119 -
.../impl/ClusterServicesBroadcasterTest.java | 131 -
.../impl/MulticastProtocolListenerTest.java | 171 -
.../impl/NodeProtocolSenderImplTest.java | 201 -
.../impl/SocketProtocolListenerTest.java | 132 -
.../testutils/DelayedProtocolHandler.java | 57 -
.../testutils/ReflexiveProtocolHandler.java | 47 -
.../src/test/resources/logback-test.xml | 48 -
.../apache/nifi/cluster/firewall/impl/empty.txt | 0
.../apache/nifi/cluster/firewall/impl/ips.txt | 12 -
.../nifi-framework/nifi-documentation/pom.xml | 41 +
.../ConfigurableComponentInitializer.java | 38 +
.../apache/nifi/documentation/DocGenerator.java | 179 +
.../nifi/documentation/DocumentationWriter.java | 33 +
.../html/HtmlDocumentationWriter.java | 573 +++
.../html/HtmlProcessorDocumentationWriter.java | 275 ++
.../init/ControllerServiceInitializer.java | 38 +
.../init/ProcessorInitializer.java | 37 +
.../init/ReportingTaskingInitializer.java | 37 +
...kControllerServiceInitializationContext.java | 46 +
.../mock/MockControllerServiceLookup.java | 65 +
.../MockProcessorInitializationContext.java | 45 +
.../MockReportingInitializationContext.java | 67 +
.../FullyDocumentedControllerService.java | 57 +
.../example/FullyDocumentedProcessor.java | 121 +
.../example/FullyDocumentedReportingTask.java | 50 +
.../documentation/example/NakedProcessor.java | 31 +
.../documentation/example/SampleService.java | 25 +
.../html/HtmlDocumentationWriterTest.java | 101 +
.../html/ProcessorDocumentationWriterTest.java | 103 +
.../nifi/documentation/html/XmlValidator.java | 50 +
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/.gitignore | 1 +
.../nifi-framework-cluster-protocol/pom.xml | 67 +
.../protocol/ClusterManagerProtocolSender.java | 69 +
.../cluster/protocol/ConnectionRequest.java | 44 +
.../cluster/protocol/ConnectionResponse.java | 141 +
.../apache/nifi/cluster/protocol/Heartbeat.java | 68 +
.../nifi/cluster/protocol/NodeBulletins.java | 44 +
.../nifi/cluster/protocol/NodeIdentifier.java | 172 +
.../cluster/protocol/NodeProtocolSender.java | 73 +
.../nifi/cluster/protocol/ProtocolContext.java | 39 +
.../cluster/protocol/ProtocolException.java | 40 +
.../nifi/cluster/protocol/ProtocolHandler.java | 44 +
.../nifi/cluster/protocol/ProtocolListener.java | 72 +
.../protocol/ProtocolMessageMarshaller.java | 38 +
.../protocol/ProtocolMessageUnmarshaller.java | 38 +
.../nifi/cluster/protocol/StandardDataFlow.java | 105 +
.../UnknownServiceAddressException.java | 39 +
.../impl/ClusterManagerProtocolSenderImpl.java | 245 +
.../ClusterManagerProtocolSenderListener.java | 118 +
.../protocol/impl/ClusterServiceDiscovery.java | 181 +
.../protocol/impl/ClusterServiceLocator.java | 229 +
.../impl/ClusterServicesBroadcaster.java | 182 +
.../protocol/impl/CopyingInputStream.java | 77 +
.../impl/MulticastProtocolListener.java | 204 +
.../protocol/impl/NodeProtocolSenderImpl.java | 171 +
.../impl/NodeProtocolSenderListener.java | 115 +
.../protocol/impl/SocketProtocolListener.java | 205 +
.../protocol/jaxb/JaxbProtocolContext.java | 148 +
.../jaxb/message/AdaptedConnectionRequest.java | 40 +
.../jaxb/message/AdaptedConnectionResponse.java | 109 +
.../protocol/jaxb/message/AdaptedCounter.java | 56 +
.../protocol/jaxb/message/AdaptedDataFlow.java | 64 +
.../protocol/jaxb/message/AdaptedHeartbeat.java | 66 +
.../jaxb/message/AdaptedNodeBulletins.java | 50 +
.../jaxb/message/AdaptedNodeIdentifier.java | 76 +
.../jaxb/message/ConnectionRequestAdapter.java | 41 +
.../jaxb/message/ConnectionResponseAdapter.java | 55 +
.../protocol/jaxb/message/DataFlowAdapter.java | 50 +
.../protocol/jaxb/message/HeartbeatAdapter.java | 54 +
.../jaxb/message/JaxbProtocolUtils.java | 42 +
.../jaxb/message/NodeBulletinsAdapter.java | 48 +
.../jaxb/message/NodeIdentifierAdapter.java | 51 +
.../protocol/jaxb/message/ObjectFactory.java | 104 +
.../message/ConnectionRequestMessage.java | 46 +
.../message/ConnectionResponseMessage.java | 66 +
.../ControllerStartupFailureMessage.java | 49 +
.../protocol/message/DisconnectMessage.java | 55 +
.../protocol/message/ExceptionMessage.java | 44 +
.../protocol/message/FlowRequestMessage.java | 46 +
.../protocol/message/FlowResponseMessage.java | 44 +
.../protocol/message/HeartbeatMessage.java | 43 +
.../message/MulticastProtocolMessage.java | 66 +
.../protocol/message/NodeBulletinsMessage.java | 43 +
.../cluster/protocol/message/PingMessage.java | 55 +
.../message/PrimaryRoleAssignmentMessage.java | 56 +
.../protocol/message/ProtocolMessage.java | 61 +
.../message/ReconnectionFailureMessage.java | 45 +
.../message/ReconnectionRequestMessage.java | 94 +
.../message/ReconnectionResponseMessage.java | 32 +
.../message/ServiceBroadcastMessage.java | 64 +
.../MulticastConfigurationFactoryBean.java | 60 +
.../ServerSocketConfigurationFactoryBean.java | 65 +
.../spring/SocketConfigurationFactoryBean.java | 66 +
.../resources/nifi-cluster-protocol-context.xml | 110 +
.../ClusterManagerProtocolSenderImplTest.java | 134 +
.../impl/ClusterServiceDiscoveryTest.java | 135 +
.../impl/ClusterServiceLocatorTest.java | 121 +
.../impl/ClusterServicesBroadcasterTest.java | 133 +
.../impl/MulticastProtocolListenerTest.java | 171 +
.../impl/NodeProtocolSenderImplTest.java | 203 +
.../impl/testutils/DelayedProtocolHandler.java | 57 +
.../testutils/ReflexiveProtocolHandler.java | 47 +
.../nifi-framework-cluster-web/.gitignore | 1 +
.../nifi-framework-cluster-web/pom.xml | 44 +
.../nifi/cluster/context/ClusterContext.java | 59 +
.../cluster/context/ClusterContextImpl.java | 69 +
.../context/ClusterContextThreadLocal.java | 42 +
.../nifi-framework-cluster/.gitignore | 1 +
.../nifi-framework-cluster/pom.xml | 148 +
.../cluster/client/MulticastTestClient.java | 151 +
.../org/apache/nifi/cluster/event/Event.java | 122 +
.../apache/nifi/cluster/event/EventManager.java | 65 +
.../cluster/event/impl/EventManagerImpl.java | 143 +
.../cluster/firewall/ClusterNodeFirewall.java | 35 +
.../impl/FileBasedClusterNodeFirewall.java | 207 +
.../nifi/cluster/flow/ClusterDataFlow.java | 56 +
.../apache/nifi/cluster/flow/DaoException.java | 40 +
.../apache/nifi/cluster/flow/DataFlowDao.java | 62 +
.../cluster/flow/DataFlowManagementService.java | 132 +
.../nifi/cluster/flow/PersistedFlowState.java | 37 +
.../nifi/cluster/flow/StaleFlowException.java | 42 +
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 615 +++
.../impl/DataFlowManagementServiceImpl.java | 413 ++
.../nifi/cluster/manager/ClusterManager.java | 225 +
.../cluster/manager/HttpClusterManager.java | 169 +
.../cluster/manager/HttpRequestReplicator.java | 99 +
.../cluster/manager/HttpResponseMapper.java | 42 +
.../nifi/cluster/manager/NodeResponse.java | 343 ++
.../exception/BlockedByFirewallException.java | 60 +
.../manager/exception/ClusterException.java | 40 +
.../ConnectingNodeMutableRequestException.java | 41 +
...DisconnectedNodeMutableRequestException.java | 41 +
.../exception/IllegalClusterStateException.java | 41 +
.../exception/IllegalNodeDeletionException.java | 41 +
.../IllegalNodeDisconnectionException.java | 42 +
.../IllegalNodeReconnectionException.java | 41 +
.../IneligiblePrimaryNodeException.java | 41 +
.../exception/MutableRequestException.java | 42 +
.../exception/NoConnectedNodesException.java | 41 +
.../exception/NoResponseFromNodesException.java | 42 +
.../exception/NodeDisconnectionException.java | 41 +
.../exception/NodeReconnectionException.java | 40 +
.../PrimaryRoleAssignmentException.java | 41 +
.../SafeModeMutableRequestException.java | 41 +
.../manager/exception/UnknownNodeException.java | 41 +
.../exception/UriConstructionException.java | 42 +
.../manager/impl/ClusteredEventAccess.java | 135 +
.../manager/impl/ClusteredReportingContext.java | 165 +
.../manager/impl/HttpRequestReplicatorImpl.java | 531 +++
.../manager/impl/HttpResponseMapperImpl.java | 85 +
.../cluster/manager/impl/WebClusterManager.java | 4237 ++++++++++++++++++
.../java/org/apache/nifi/cluster/node/Node.java | 252 ++
...anagerProtocolServiceLocatorFactoryBean.java | 116 +
...FileBasedClusterNodeFirewallFactoryBean.java | 58 +
.../spring/WebClusterManagerFactoryBean.java | 134 +
.../reporting/ClusteredReportingTaskNode.java | 49 +
.../resources/nifi-cluster-manager-context.xml | 128 +
.../event/impl/EventManagerImplTest.java | 119 +
.../impl/FileBasedClusterNodeFirewallTest.java | 98 +
.../impl/DataFlowManagementServiceImplTest.java | 343 ++
.../impl/HttpRequestReplicatorImplTest.java | 368 ++
.../impl/HttpResponseMapperImplTest.java | 126 +
.../manager/impl/TestWebClusterManager.java | 54 +
.../cluster/manager/testutils/HttpRequest.java | 239 +
.../cluster/manager/testutils/HttpResponse.java | 93 +
.../manager/testutils/HttpResponseAction.java | 60 +
.../cluster/manager/testutils/HttpServer.java | 240 +
.../ClusterManagerProtocolSenderImplTest.java | 133 +
.../impl/ClusterServiceLocatorTest.java | 119 +
.../impl/ClusterServicesBroadcasterTest.java | 131 +
.../impl/MulticastProtocolListenerTest.java | 171 +
.../impl/NodeProtocolSenderImplTest.java | 201 +
.../impl/SocketProtocolListenerTest.java | 132 +
.../testutils/DelayedProtocolHandler.java | 57 +
.../testutils/ReflexiveProtocolHandler.java | 47 +
.../src/test/resources/logback-test.xml | 48 +
.../apache/nifi/cluster/firewall/impl/empty.txt | 0
.../apache/nifi/cluster/firewall/impl/ips.txt | 12 +
.../nifi-framework-core-api/.gitignore | 1 +
.../nifi-framework-core-api/pom.xml | 2 +-
.../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 +
.../org/apache/nifi/groups/ProcessGroup.java | 44 +-
.../nifi-framework/nifi-framework-core/pom.xml | 21 +-
.../apache/nifi/controller/FlowController.java | 280 +-
.../nifi/controller/FlowFromDOMFactory.java | 60 +-
.../nifi/controller/StandardFlowSerializer.java | 68 +-
.../nifi/controller/StandardFlowService.java | 30 +-
.../controller/StandardFlowSynchronizer.java | 242 +-
.../nifi/controller/StandardProcessorNode.java | 47 +-
.../apache/nifi/controller/TemplateManager.java | 33 +-
.../reporting/AbstractReportingTaskNode.java | 76 +-
.../reporting/StandardReportingContext.java | 11 +
.../StandardReportingInitializationContext.java | 23 +-
.../repository/FileSystemRepository.java | 78 +-
.../repository/StandardProcessSession.java | 11 +-
.../repository/StandardRepositoryRecord.java | 15 +-
.../io/DisableOnCloseInputStream.java | 93 +
.../scheduling/StandardProcessScheduler.java | 210 +-
.../service/ControllerServiceLoader.java | 149 +-
...dControllerServiceInitializationContext.java | 20 +-
.../service/StandardControllerServiceNode.java | 128 +-
.../StandardControllerServiceProvider.java | 460 +-
.../StandardControllerServiceReference.java | 19 +-
.../tasks/ContinuallyRunConnectableTask.java | 15 +-
.../controller/tasks/ReportingTaskWrapper.java | 29 +-
.../nifi/fingerprint/FingerprintFactory.java | 79 +
.../nifi/groups/StandardProcessGroup.java | 90 +-
.../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 | 37 +-
.../StandardValidationContextFactory.java | 5 +
.../java/org/apache/nifi/util/DomUtils.java | 10 +
.../ControllerServiceConfiguration.xsd | 61 -
.../src/main/resources/FlowConfiguration.xsd | 49 +-
.../resources/ReportingTaskConfiguration.xsd | 87 -
.../repository/TestStandardProcessSession.java | 149 +
.../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 +
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-resources/LICENSE | 202 +
.../nifi-framework/nifi-resources/NOTICE | 5 +
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../src/main/assembly/dependencies.xml | 16 +
.../src/main/resources/conf/bootstrap.conf | 5 +
.../main/resources/conf/controller-services.xml | 18 -
.../src/main/resources/conf/nifi.properties | 2 -
.../src/main/resources/conf/reporting-tasks.xml | 49 -
.../nifi-framework/nifi-runtime/pom.xml | 7 +-
.../src/main/java/org/apache/nifi/NiFi.java | 3 +
.../nifi-framework/nifi-security/pom.xml | 2 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../nifi/remote/StandardRemoteGroupPort.java | 6 +-
.../nifi/remote/StandardRootGroupPort.java | 11 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../java/org/apache/nifi/action/Component.java | 4 +-
.../component/details/ExtensionDetails.java | 34 +
.../component/details/ProcessorDetails.java | 34 -
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../HttpServletConfigurationRequestContext.java | 56 +
.../nifi/web/HttpServletRequestContext.java | 100 +
.../web/HttpServletRequestContextConfig.java | 1 +
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 17 +-
.../org/apache/nifi/web/server/JettyServer.java | 282 +-
.../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 | 14 +-
.../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 | 208 +-
.../nifi/web/StandardNiFiContentAccess.java | 147 +
.../nifi/web/StandardNiFiServiceFacade.java | 1374 +++---
.../StandardNiFiWebConfigurationContext.java | 736 +++
.../apache/nifi/web/StandardNiFiWebContext.java | 30 +-
.../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 +-
.../apache/nifi/web/api/ProvenanceResource.java | 2 +-
.../web/api/RemoteProcessGroupResource.java | 10 +-
.../nifi/web/api/ReportingTaskResource.java | 663 +++
.../apache/nifi/web/api/SnippetResource.java | 6 +-
.../web/api/config/NotFoundExceptionMapper.java | 48 +
.../nifi/web/api/config/ThrowableMapper.java | 7 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 303 +-
.../ApplicationStartupContextListener.java | 6 +-
.../nifi/web/controller/ControllerFacade.java | 114 +-
.../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 +
.../nifi/web/util/DownloadableContent.java | 47 -
.../org/apache/nifi/web/util/SnippetUtils.java | 181 +-
.../src/main/resources/nifi-web-api-context.xml | 68 +-
.../nifi/integration/util/NiFiTestServer.java | 5 +
.../nifi-web/nifi-web-content-access/pom.xml | 25 +
.../java/org/apache/nifi/web/ContentAccess.java | 33 +
.../apache/nifi/web/ContentRequestContext.java | 51 +
.../apache/nifi/web/DownloadableContent.java | 62 +
.../nifi-web/nifi-web-content-viewer/.gitignore | 1 +
.../nifi-web/nifi-web-content-viewer/pom.xml | 91 +
.../nifi/web/ContentViewerController.java | 290 ++
.../src/main/resources/META-INF/NOTICE | 19 +
.../src/main/webapp/WEB-INF/jsp/footer.jsp | 20 +
.../src/main/webapp/WEB-INF/jsp/header.jsp | 96 +
.../src/main/webapp/WEB-INF/jsp/hexview.jsp | 32 +
.../src/main/webapp/WEB-INF/jsp/no-viewer.jsp | 20 +
.../src/main/webapp/WEB-INF/web.xml | 26 +
.../src/main/webapp/css/main.css | 113 +
.../src/main/webapp/js/hexview/LICENSE | 32 +
.../main/webapp/js/hexview/hexview.default.css | 10 +
.../src/main/webapp/js/hexview/hexview.js | 199 +
.../nifi-web/nifi-web-docs/pom.xml | 8 +-
.../nifi/web/docs/DocumentationController.java | 5 +-
.../main/webapp/WEB-INF/jsp/documentation.jsp | 20 +-
.../src/main/webapp/css/component-usage.css | 98 +-
.../src/main/webapp/js/application.js | 7 +-
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 14 +-
.../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/nifi-web-security/pom.xml | 2 +-
.../nifi/web/security/user/NiFiUserUtils.java | 10 +
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 33 +-
.../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/WEB-INF/web.xml | 11 +
.../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
.../js/codemirror/addon/fold/foldgutter.css | 20 +
.../js/codemirror/lib/codemirror-compressed.js | 14 +-
.../webapp/js/jquery/combo/jquery.combo.css | 8 +
.../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 | 1608 +++++++
.../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 | 3 +
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 107 +-
.../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 | 22 +-
.../nifi-framework/pom.xml | 9 +-
.../nifi-framework-bundle/pom.xml | 44 +-
.../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 | 210 +
.../nifi/processors/maxmind/DatabaseReader.java | 286 ++
.../org.apache.nifi.processor.Processor | 16 +
nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 42 +
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../hadoop/CreateHadoopSequenceFile.java | 2 +
.../apache/nifi/processors/hadoop/GetHDFS.java | 21 +-
.../processors/hadoop/GetHDFSSequenceFile.java | 2 +
.../apache/nifi/processors/hadoop/PutHDFS.java | 20 +-
.../additionalDetails.html | 46 +
.../index.html | 88 -
.../index.html | 162 -
.../index.html | 150 -
.../index.html | 159 -
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 5 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 36 +
.../nifi-hl7-processors/.gitignore | 1 +
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 106 +
.../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/1.hl7 | 16 +
.../src/test/resources/hypoglycemia.hl7 | 5 +
nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 33 +
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 | 6 +
.../apache/nifi/processors/kafka/PutKafka.java | 90 +-
.../additionalDetails.html | 45 +
.../index.html | 173 -
.../additionalDetails.html | 45 +
.../index.html | 189 -
.../nifi/processors/kafka/TestPutKafka.java | 76 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 44 +-
.../src/main/resources/META-INF/LICENSE | 38 -
.../src/main/resources/META-INF/NOTICE | 37 +-
.../nifi-kite-processors/pom.xml | 18 +-
.../processors/kite/AbstractKiteProcessor.java | 39 +-
.../nifi/processors/kite/ConvertCSVToAvro.java | 29 +-
.../nifi/processors/kite/ConvertJSONToAvro.java | 20 +-
.../nifi/processors/kite/JSONFileReader.java | 114 -
.../processors/kite/StoreInKiteDataset.java | 10 +-
.../data/spi/filesystem/CSVFileReaderFixed.java | 172 -
.../nifi/processors/kite/TestGetSchema.java | 3 +
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 18 +-
.../nifi-language-translation-nar/pom.xml | 36 +
.../nifi-yandex-processors/.gitignore | 1 +
.../nifi-yandex-processors/pom.xml | 63 +
.../nifi/processors/yandex/YandexTranslate.java | 325 ++
.../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 | 141 +
.../nifi-language-translation-bundle/pom.xml | 48 +
.../pom.xml | 2 +-
.../PersistentProvenanceRepository.java | 10 +-
.../TestPersistentProvenanceRepository.java | 42 +-
.../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 | 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 | 76 +
.../web/StandardContentViewerController.java | 103 +
.../src/main/resources/META-INF/NOTICE | 19 +
.../main/webapp/META-INF/nifi-content-viewer | 3 +
.../src/main/webapp/WEB-INF/jsp/codemirror.jsp | 50 +
.../src/main/webapp/WEB-INF/web.xml | 29 +
.../src/main/webapp/css/main.css | 20 +
.../nifi-standard-nar/pom.xml | 7 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 88 +-
.../standard/Base64EncodeContent.java | 2 +-
.../processors/standard/CompressContent.java | 4 +
.../nifi/processors/standard/ControlRate.java | 2 +-
.../processors/standard/DetectDuplicate.java | 15 +-
.../processors/standard/DistributeLoad.java | 24 +-
.../processors/standard/EvaluateJsonPath.java | 32 +-
.../standard/EvaluateRegularExpression.java | 19 +-
.../nifi/processors/standard/EvaluateXPath.java | 5 +
.../processors/standard/EvaluateXQuery.java | 22 +-
.../processors/standard/ExecuteProcess.java | 2 +
.../standard/ExecuteStreamCommand.java | 25 +-
.../nifi/processors/standard/ExtractText.java | 316 ++
.../apache/nifi/processors/standard/GetFTP.java | 12 +
.../nifi/processors/standard/GetFile.java | 21 +-
.../nifi/processors/standard/GetHTTP.java | 8 +-
.../nifi/processors/standard/GetJMSQueue.java | 2 +
.../nifi/processors/standard/GetJMSTopic.java | 2 +
.../nifi/processors/standard/GetSFTP.java | 17 +-
.../processors/standard/HandleHttpRequest.java | 26 +-
.../processors/standard/HandleHttpResponse.java | 8 +-
.../nifi/processors/standard/HashAttribute.java | 23 +-
.../nifi/processors/standard/HashContent.java | 2 +
.../processors/standard/IdentifyMimeType.java | 13 +-
.../nifi/processors/standard/InvokeHTTP.java | 52 +-
.../nifi/processors/standard/MergeContent.java | 17 +
.../processors/standard/MonitorActivity.java | 15 +-
.../nifi/processors/standard/PostHTTP.java | 13 +-
.../nifi/processors/standard/PutEmail.java | 149 +-
.../apache/nifi/processors/standard/PutFTP.java | 22 +-
.../nifi/processors/standard/PutFile.java | 8 +-
.../apache/nifi/processors/standard/PutJMS.java | 6 +-
.../nifi/processors/standard/PutSFTP.java | 10 +-
.../processors/standard/RouteOnAttribute.java | 15 +-
.../processors/standard/RouteOnContent.java | 5 +
.../nifi/processors/standard/ScanContent.java | 18 +-
.../processors/standard/SegmentContent.java | 12 +
.../nifi/processors/standard/SplitContent.java | 116 +-
.../nifi/processors/standard/SplitText.java | 10 +
.../nifi/processors/standard/TransformXml.java | 15 +-
.../nifi/processors/standard/UnpackContent.java | 37 +-
.../org.apache.nifi.processor.Processor | 1 +
.../index.html | 63 -
.../index.html | 166 -
.../index.html | 116 -
.../index.html | 65 -
.../index.html | 147 -
.../index.html | 106 -
.../index.html | 97 -
.../additionalDetails.html | 31 +
.../index.html | 155 -
.../index.html | 160 -
.../index.html | 135 -
.../additionalDetails.html | 149 +
.../index.html | 311 --
.../index.html | 100 -
.../index.html | 111 -
.../index.html | 64 -
.../index.html | 227 -
.../index.html | 186 -
.../index.html | 143 -
.../index.html | 118 -
.../index.html | 122 -
.../index.html | 250 --
.../additionalDetails.html | 43 +
.../index.html | 255 --
.../additionalDetails.html | 44 +
.../index.html | 112 -
.../index.html | 88 -
.../index.html | 89 -
.../additionalDetails.html | 59 +
.../index.html | 136 -
.../index.html | 181 -
.../index.html | 86 -
.../index.html | 144 -
.../index.html | 80 -
.../index.html | 347 --
.../index.html | 64 -
.../index.html | 143 -
.../index.html | 187 -
.../index.html | 114 -
.../index.html | 283 --
.../index.html | 109 -
.../index.html | 152 -
.../index.html | 281 --
.../index.html | 91 -
.../index.html | 114 -
.../additionalDetails.html | 46 +
.../index.html | 110 -
.../index.html | 82 -
.../index.html | 85 -
.../index.html | 100 -
.../index.html | 123 -
.../index.html | 107 -
.../index.html | 85 -
.../index.html | 121 -
.../index.html | 64 -
.../index.html | 63 -
.../index.html | 163 -
.../index.html | 56 -
.../standard/TestDetectDuplicate.java | 5 +-
.../standard/TestEvaluateRegularExpression.java | 319 --
.../processors/standard/TestExtractText.java | 314 ++
.../nifi/processors/standard/TestPutEmail.java | 40 +-
.../processors/standard/TestSplitContent.java | 123 +
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../additionalDetails.html | 70 +
.../index.html | 85 -
.../index.html | 58 -
.../index.html | 77 -
.../additionalDetails.html | 41 +
.../index.html | 65 -
.../nifi-standard-bundle/pom.xml | 18 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../DistributedMapCacheClientService.java | 23 +-
.../DistributedSetCacheClientService.java | 16 +-
.../additionalDetails.html | 45 +
.../index.html | 98 -
.../index.html | 51 -
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../cache/protocol/ProtocolHandshake.java | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../cache/server/AbstractCacheServer.java | 2 +-
.../cache/server/DistributedCacheServer.java | 13 +-
.../server/map/DistributedMapCacheServer.java | 2 +
.../additionalDetails.html | 46 +
.../index.html | 103 -
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 4 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../nifi-http-context-map/pom.xml | 2 +-
.../nifi/http/StandardHttpContextMap.java | 9 +
.../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/StandardSSLContextService.java | 39 +-
.../additionalDetails.html | 49 +
.../index.html | 63 -
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 2 +-
.../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 +-
.../processors/attributes/UpdateAttribute.java | 5 +
.../additionalDetails.html | 253 ++
.../index.html | 253 --
.../nifi-update-attribute-ui/pom.xml | 7 +-
.../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 | 12 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
nifi/nifi-nar-bundles/pom.xml | 38 +-
nifi/pom.xml | 132 +-
1045 files changed, 54421 insertions(+), 34367 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/93a12104/nifi/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --cc nifi/nifi-assembly/NOTICE
index 92c48f0,9da37ae..f14c662
--- a/nifi/nifi-assembly/NOTICE
+++ b/nifi/nifi-assembly/NOTICE
@@@ -496,22 -501,39 +501,55 @@@ The following binary components are pro
Apache License Version 2.0 http://www.apache.org/licenses/.
(c) Daniel Lemire, http://lemire.me/en/
+ (ASLv2) Twitter4J
+ The following NOTICE information applies:
+ Copyright 2007 Yusuke Yamamoto
+
+ Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
+
+ (ASLv2) JOAuth
+ The following NOTICE information applies:
+ JOAuth
+ Copyright 2010-2013 Twitter, Inc
+
+ Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+
+ (ASLv2) Hosebird Client
+ The following NOTICE information applies:
+ Hosebird Client (hbc)
+ Copyright 2013 Twitter, Inc.
+
+ Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+
+ (ASLv2) GeoIP2 Java API
+ The following NOTICE information applies:
+ GeoIP2 Java API
+ This software is Copyright (c) 2013 by MaxMind, Inc.
+
+ This is free software, licensed under the Apache License, Version 2.0.
+
+ (ASLv2) Google HTTP Client Library for Java
+ The following NOTICE information applies:
+ Google HTTP Client Library for Java
+
+ This is free software, licensed under the Apache License, Version 2.0.
+
+ (ASLv2) Amazon Web Services SDK
+ The following NOTICE information applies:
+ Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+ This product includes software developed by
+ Amazon Technologies, Inc (http://www.amazon.com/).
+
+ **********************
+ THIRD PARTY COMPONENTS
+ **********************
+ This software includes third party software subject to the following copyrights:
+ - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
+ - JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org.
+ - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+
+
************************
Common Development and Distribution License 1.1
************************
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/93a12104/nifi/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/pom.xml
index 374304a,50a9407..7d80826
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@@ -34,8 -35,11 +34,12 @@@
<module>nifi-update-attribute-bundle</module>
<module>nifi-kafka-bundle</module>
<module>nifi-kite-bundle</module>
+ <module>nifi-aws-bundle</module>
- </modules>
+ <module>nifi-social-media-bundle</module>
+ <module>nifi-geo-bundle</module>
+ <module>nifi-hl7-bundle</module>
+ <module>nifi-language-translation-bundle</module>
+ </modules>
<dependencyManagement>
<dependencies>
<dependency>