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/05/01 20:24:38 UTC
[21/26] incubator-nifi git commit: Merge remote-tracking branch
'upstream/develop' into nifi-solr-bundle
Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e557e1e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e557e1e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e557e1e6
Branch: refs/heads/develop
Commit: e557e1e6e72ab269ba234cb85dfd43ea5bcae1e3
Parents: f5c46bb 57e78bf
Author: bbende <bb...@gmail.com>
Authored: Tue Apr 28 18:29:07 2015 -0400
Committer: bbende <bb...@gmail.com>
Committed: Tue Apr 28 18:29:07 2015 -0400
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 7 +
nifi-parent/pom.xml | 73 +-
.../client/socket/EndpointConnectionPool.java | 2 +-
.../flowfile/attributes/CoreAttributes.java | 12 +-
.../apache/nifi/remote/VersionNegotiator.java | 15 +-
.../TransmissionDisabledException.java | 3 +-
.../nifi/remote/io/CompressionOutputStream.java | 3 +-
.../remote/io/socket/BufferStateManager.java | 4 +-
.../socket/ssl/SSLSocketChannelInputStream.java | 3 +-
.../ssl/SSLSocketChannelOutputStream.java | 3 +-
.../nifi/stream/io/BufferedInputStream.java | 7 +-
.../nifi/stream/io/BufferedOutputStream.java | 31 +-
.../nifi/stream/io/ByteArrayInputStream.java | 113 +--
.../nifi/stream/io/ByteArrayOutputStream.java | 80 +-
.../nifi/stream/io/ByteCountingInputStream.java | 5 +
.../stream/io/ByteCountingOutputStream.java | 5 +
.../apache/nifi/stream/io/DataOutputStream.java | 113 +--
.../apache/nifi/stream/io/GZIPOutputStream.java | 4 +-
.../stream/io/LeakyBucketStreamThrottler.java | 3 +-
.../stream/io/MinimumLengthInputStream.java | 3 +-
.../nifi/stream/io/NonCloseableInputStream.java | 5 +-
.../org/apache/nifi/stream/io/StreamUtils.java | 30 +-
.../apache/nifi/stream/io/ZipOutputStream.java | 5 +-
.../java/org/apache/nifi/util/EscapeUtils.java | 4 +-
.../java/org/apache/nifi/util/LongHolder.java | 6 +-
.../apache/nifi/util/NaiveSearchRingBuffer.java | 21 +-
.../java/org/apache/nifi/util/RingBuffer.java | 26 +-
.../java/org/apache/nifi/util/StopWatch.java | 3 +-
.../org/apache/nifi/util/file/FileUtils.java | 114 +--
.../file/monitor/CompoundUpdateMonitor.java | 7 +-
.../file/monitor/SynchronousFileWatcher.java | 6 +-
.../org/apache/nifi/util/search/Search.java | 18 +-
.../org/apache/nifi/util/search/SearchTerm.java | 5 +-
.../nifi/web/api/dto/BulletinBoardDTO.java | 3 +-
.../apache/nifi/web/api/dto/BulletinDTO.java | 7 +-
.../nifi/web/api/dto/BulletinQueryDTO.java | 3 +-
.../apache/nifi/web/api/dto/ConnectableDTO.java | 6 +-
.../apache/nifi/web/api/dto/ConnectionDTO.java | 25 +-
.../web/api/dto/ControllerConfigurationDTO.java | 6 +-
.../apache/nifi/web/api/dto/ControllerDTO.java | 17 +-
.../nifi/web/api/dto/ControllerServiceDTO.java | 10 +-
...ontrollerServiceReferencingComponentDTO.java | 19 +-
.../org/apache/nifi/web/api/dto/CounterDTO.java | 3 +-
.../org/apache/nifi/web/api/dto/LabelDTO.java | 1 -
.../nifi/web/api/dto/NiFiComponentDTO.java | 3 +-
.../org/apache/nifi/web/api/dto/PortDTO.java | 10 +-
.../nifi/web/api/dto/ProcessGroupDTO.java | 3 +-
.../nifi/web/api/dto/ProcessorConfigDTO.java | 32 +-
.../apache/nifi/web/api/dto/ProcessorDTO.java | 10 +-
.../nifi/web/api/dto/PropertyDescriptorDTO.java | 22 +-
.../nifi/web/api/dto/RemoteProcessGroupDTO.java | 15 +-
.../web/api/dto/RemoteProcessGroupPortDTO.java | 3 +-
.../nifi/web/api/dto/ReportingTaskDTO.java | 19 +-
.../apache/nifi/web/api/dto/RevisionDTO.java | 11 +-
.../org/apache/nifi/web/api/dto/SnippetDTO.java | 48 +-
.../org/apache/nifi/web/api/dto/UserDTO.java | 3 +-
.../web/api/dto/provenance/ProvenanceDTO.java | 3 +-
.../api/dto/provenance/ProvenanceEventDTO.java | 35 +-
.../provenance/lineage/LineageRequestDTO.java | 7 +-
.../provenance/lineage/ProvenanceNodeDTO.java | 3 +-
.../web/api/dto/status/ControllerStatusDTO.java | 3 +-
.../nifi/web/api/dto/status/PortStatusDTO.java | 6 +-
.../api/dto/status/ProcessGroupStatusDTO.java | 9 +-
.../web/api/dto/status/ProcessorStatusDTO.java | 9 +-
.../dto/status/RemoteProcessGroupStatusDTO.java | 6 +-
.../apache/nifi/web/api/entity/AboutEntity.java | 4 +-
.../nifi/web/api/entity/ActionEntity.java | 4 +-
.../nifi/web/api/entity/AuthorityEntity.java | 4 +-
.../nifi/web/api/entity/BannerEntity.java | 4 +-
.../web/api/entity/BulletinBoardEntity.java | 4 +-
.../entity/ClusterConnectionStatusEntity.java | 4 +-
.../nifi/web/api/entity/ClusterEntity.java | 4 +-
.../web/api/entity/ClusterPortStatusEntity.java | 4 +-
.../entity/ClusterProcessGroupStatusEntity.java | 4 +-
.../entity/ClusterProcessorStatusEntity.java | 4 +-
.../ClusterRemoteProcessGroupStatusEntity.java | 5 +-
.../api/entity/ClusterSearchResultsEntity.java | 4 +-
.../web/api/entity/ClusterStatusEntity.java | 4 +-
.../api/entity/ClusterStatusHistoryEntity.java | 4 +-
.../web/api/entity/ComponentHistoryEntity.java | 4 +-
.../nifi/web/api/entity/ConnectionEntity.java | 4 +-
.../nifi/web/api/entity/ConnectionsEntity.java | 4 +-
.../entity/ControllerConfigurationEntity.java | 4 +-
.../nifi/web/api/entity/ControllerEntity.java | 4 +-
.../web/api/entity/ControllerServiceEntity.java | 4 +-
...ollerServiceReferencingComponentsEntity.java | 8 +-
.../entity/ControllerServiceTypesEntity.java | 4 +-
.../api/entity/ControllerServicesEntity.java | 4 +-
.../web/api/entity/ControllerStatusEntity.java | 4 +-
.../nifi/web/api/entity/CounterEntity.java | 4 +-
.../nifi/web/api/entity/CountersEntity.java | 7 +-
.../nifi/web/api/entity/FlowSnippetEntity.java | 4 +-
.../nifi/web/api/entity/FunnelEntity.java | 4 +-
.../nifi/web/api/entity/FunnelsEntity.java | 4 +-
.../nifi/web/api/entity/HistoryEntity.java | 4 +-
.../nifi/web/api/entity/InputPortEntity.java | 4 +-
.../nifi/web/api/entity/InputPortsEntity.java | 4 +-
.../apache/nifi/web/api/entity/LabelEntity.java | 4 +-
.../nifi/web/api/entity/LabelsEntity.java | 4 +-
.../nifi/web/api/entity/LineageEntity.java | 4 +-
.../apache/nifi/web/api/entity/NodeEntity.java | 4 +-
.../nifi/web/api/entity/NodeStatusEntity.java | 4 +-
.../api/entity/NodeSystemDiagnosticsEntity.java | 4 +-
.../nifi/web/api/entity/OutputPortEntity.java | 4 +-
.../nifi/web/api/entity/OutputPortsEntity.java | 4 +-
.../web/api/entity/PrioritizerTypesEntity.java | 4 +-
.../nifi/web/api/entity/ProcessGroupEntity.java | 4 +-
.../api/entity/ProcessGroupStatusEntity.java | 4 +-
.../web/api/entity/ProcessGroupsEntity.java | 4 +-
.../nifi/web/api/entity/ProcessorEntity.java | 4 +-
.../web/api/entity/ProcessorTypesEntity.java | 4 +-
.../nifi/web/api/entity/ProcessorsEntity.java | 4 +-
.../api/entity/PropertyDescriptorEntity.java | 4 +-
.../web/api/entity/ProvenanceEventEntity.java | 4 +-
.../web/api/entity/ProvenanceOptionsEntity.java | 4 +-
.../api/entity/RemoteProcessGroupEntity.java | 4 +-
.../entity/RemoteProcessGroupPortEntity.java | 4 +-
.../api/entity/RemoteProcessGroupsEntity.java | 4 +-
.../web/api/entity/ReportingTaskEntity.java | 4 +-
.../api/entity/ReportingTaskTypesEntity.java | 4 +-
.../web/api/entity/ReportingTasksEntity.java | 4 +-
.../web/api/entity/SearchResultsEntity.java | 6 +-
.../nifi/web/api/entity/SnippetEntity.java | 4 +-
.../web/api/entity/StatusHistoryEntity.java | 4 +-
.../web/api/entity/SystemDiagnosticsEntity.java | 4 +-
.../nifi/web/api/entity/TemplateEntity.java | 4 +-
.../nifi/web/api/entity/TemplatesEntity.java | 4 +-
.../apache/nifi/web/api/entity/UserEntity.java | 4 +-
.../nifi/web/api/entity/UserGroupEntity.java | 4 +-
.../web/api/entity/UserSearchResultsEntity.java | 5 +-
.../apache/nifi/web/api/entity/UsersEntity.java | 4 +-
.../nifi-file-authorization-provider/pom.xml | 8 +
.../FileAuthorizationProvider.java | 90 +-
.../FileAuthorizationProviderTest.java | 63 +-
.../org/apache/nifi/cluster/event/Event.java | 6 +-
.../apache/nifi/cluster/event/EventManager.java | 8 +-
.../cluster/event/impl/EventManagerImpl.java | 6 +-
.../cluster/firewall/ClusterNodeFirewall.java | 6 +-
.../impl/FileBasedClusterNodeFirewall.java | 16 +-
.../apache/nifi/cluster/flow/DataFlowDao.java | 3 +-
.../cluster/flow/DataFlowManagementService.java | 23 +-
.../nifi/cluster/flow/StaleFlowException.java | 3 +-
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 30 +-
.../impl/DataFlowManagementServiceImpl.java | 19 +-
.../nifi/cluster/manager/ClusterManager.java | 100 +--
.../cluster/manager/HttpClusterManager.java | 111 +--
.../cluster/manager/HttpRequestReplicator.java | 41 +-
.../cluster/manager/HttpResponseMapper.java | 3 +-
.../nifi/cluster/manager/NodeResponse.java | 57 +-
.../ConnectingNodeMutableRequestException.java | 3 +-
...DisconnectedNodeMutableRequestException.java | 3 +-
.../exception/IllegalClusterStateException.java | 3 +-
.../exception/IllegalNodeDeletionException.java | 3 +-
.../IllegalNodeDisconnectionException.java | 4 +-
.../IllegalNodeReconnectionException.java | 3 +-
.../IneligiblePrimaryNodeException.java | 3 +-
.../exception/MutableRequestException.java | 5 +-
.../exception/NoConnectedNodesException.java | 3 +-
.../exception/NoResponseFromNodesException.java | 5 +-
.../exception/NodeDisconnectionException.java | 3 +-
.../PrimaryRoleAssignmentException.java | 3 +-
.../SafeModeMutableRequestException.java | 3 +-
.../manager/exception/UnknownNodeException.java | 3 +-
.../exception/UriConstructionException.java | 4 +-
.../manager/impl/HttpRequestReplicatorImpl.java | 42 +-
.../manager/impl/HttpResponseMapperImpl.java | 9 +-
.../cluster/manager/impl/WebClusterManager.java | 261 +++---
.../java/org/apache/nifi/cluster/node/Node.java | 40 +-
...anagerProtocolServiceLocatorFactoryBean.java | 8 +-
.../spring/WebClusterManagerFactoryBean.java | 4 +-
.../event/impl/EventManagerImplTest.java | 5 +-
.../impl/FileBasedClusterNodeFirewallTest.java | 4 +-
.../impl/HttpRequestReplicatorImplTest.java | 5 +-
.../impl/HttpResponseMapperImplTest.java | 6 +-
.../cluster/manager/testutils/HttpRequest.java | 7 +-
.../cluster/manager/testutils/HttpResponse.java | 3 +-
.../manager/testutils/HttpResponseAction.java | 4 +-
.../cluster/manager/testutils/HttpServer.java | 3 +-
.../ClusterManagerProtocolSenderImplTest.java | 6 +-
.../impl/ClusterServiceLocatorTest.java | 6 +-
.../impl/ClusterServicesBroadcasterTest.java | 3 +-
.../impl/MulticastProtocolListenerTest.java | 2 +-
.../impl/NodeProtocolSenderImplTest.java | 3 +-
.../impl/SocketProtocolListenerTest.java | 3 +-
.../nifi-framework/nifi-framework-core/pom.xml | 1 +
.../apache/nifi/cluster/HeartbeatPayload.java | 3 +-
.../org/apache/nifi/connectable/LocalPort.java | 5 +-
.../nifi/connectable/StandardConnection.java | 10 +-
.../nifi/controller/FileSystemSwapManager.java | 6 +-
.../apache/nifi/controller/FlowController.java | 214 ++---
.../controller/FlowSerializationException.java | 3 +-
.../apache/nifi/controller/FlowSerializer.java | 3 +-
.../FlowSynchronizationException.java | 3 +-
.../nifi/controller/FlowSynchronizer.java | 25 +-
.../nifi/controller/FlowUnmarshaller.java | 4 +-
.../controller/StandardFlowSynchronizer.java | 12 +-
.../nifi/controller/StandardProcessorNode.java | 64 +-
.../apache/nifi/controller/TemplateManager.java | 19 +-
.../controller/UninheritableFlowException.java | 3 +-
.../repository/FileSystemRepository.java | 4 +-
.../controller/repository/ProcessContext.java | 18 +-
.../repository/ProvenanceEventEnricher.java | 3 +-
.../repository/RepositoryPurgeException.java | 3 +-
.../repository/StandardFlowFileRecord.java | 7 +-
.../repository/StandardProcessSession.java | 34 +-
.../repository/StandardProvenanceReporter.java | 6 +-
.../repository/StandardRepositoryRecord.java | 3 +-
.../StandardRepositoryStatusReport.java | 12 +-
.../repository/VolatileContentRepository.java | 30 +-
.../repository/VolatileFlowFileRepository.java | 4 +-
.../WriteAheadFlowFileRepository.java | 25 +-
.../repository/claim/ContentDirection.java | 9 +-
.../repository/claim/StandardContentClaim.java | 7 +-
.../io/DisableOnCloseInputStream.java | 4 +-
.../io/DisableOnCloseOutputStream.java | 4 +-
.../io/FlowFileAccessInputStream.java | 11 +-
.../io/FlowFileAccessOutputStream.java | 9 +-
.../controller/repository/io/LongHolder.java | 6 +-
.../scheduling/ConnectableProcessContext.java | 3 +-
.../controller/scheduling/ScheduleState.java | 12 +-
.../scheduling/StandardProcessScheduler.java | 18 +-
.../StandardControllerServiceProvider.java | 6 +-
.../status/history/StandardStatusSnapshot.java | 2 +-
.../tasks/ContinuallyRunConnectableTask.java | 4 +-
.../tasks/ContinuallyRunProcessorTask.java | 4 +-
.../nifi/controller/tasks/ExpireFlowFiles.java | 4 +-
.../apache/nifi/encrypt/StringEncryptor.java | 12 +-
.../java/org/apache/nifi/engine/FlowEngine.java | 16 +-
.../nifi/events/VolatileBulletinRepository.java | 5 +-
.../nifi/fingerprint/FingerprintFactory.java | 17 +-
.../nifi/groups/StandardProcessGroup.java | 13 +-
.../org/apache/nifi/lifecycle/LifeCycle.java | 17 +-
.../nifi/lifecycle/LifeCycleException.java | 3 +-
.../nifi/lifecycle/LifeCycleStartException.java | 4 +-
.../nifi/lifecycle/LifeCycleStopException.java | 3 +-
.../nifi/persistence/FlowConfigurationDAO.java | 33 +-
.../nifi/processor/StandardProcessContext.java | 3 +-
.../nifi/processor/StandardPropertyValue.java | 12 +-
.../org/apache/nifi/remote/RemoteNiFiUtils.java | 11 +-
.../nifi/remote/StandardRemoteProcessGroup.java | 49 +-
.../org/apache/nifi/services/FlowService.java | 55 +-
.../nifi/spring/FlowControllerFactoryBean.java | 4 +-
.../spring/StandardFlowServiceFactoryBean.java | 4 +-
.../apache/nifi/util/ComponentStatusReport.java | 4 +-
.../org/apache/nifi/util/ReflectionUtils.java | 71 +-
.../java/org/apache/nifi/util/SnippetUtils.java | 6 +-
.../apache/nifi/audit/ControllerAuditor.java | 38 +-
.../nifi/audit/ControllerServiceAuditor.java | 93 +--
.../org/apache/nifi/audit/FunnelAuditor.java | 33 +-
.../java/org/apache/nifi/audit/NiFiAuditor.java | 8 +-
.../java/org/apache/nifi/audit/PortAuditor.java | 45 +-
.../apache/nifi/audit/ProcessGroupAuditor.java | 42 +-
.../org/apache/nifi/audit/ProcessorAuditor.java | 66 +-
.../apache/nifi/audit/RelationshipAuditor.java | 72 +-
.../nifi/audit/RemoteProcessGroupAuditor.java | 56 +-
.../apache/nifi/audit/ReportingTaskAuditor.java | 64 +-
.../org/apache/nifi/audit/SnippetAuditor.java | 40 +-
.../IllegalClusterResourceRequestException.java | 3 +-
.../nifi/web/StandardNiFiServiceFacade.java | 36 +-
.../StandardNiFiWebConfigurationContext.java | 35 +-
.../apache/nifi/web/StandardNiFiWebContext.java | 8 +-
.../nifi/web/api/ApplicationResource.java | 34 +-
.../nifi/web/api/BulletinBoardResource.java | 7 +-
.../apache/nifi/web/api/ClusterResource.java | 6 +-
.../apache/nifi/web/api/ConnectionResource.java | 80 +-
.../apache/nifi/web/api/ControllerResource.java | 113 +--
.../nifi/web/api/ControllerServiceResource.java | 132 ++-
.../org/apache/nifi/web/api/FunnelResource.java | 43 +-
.../apache/nifi/web/api/HistoryResource.java | 52 +-
.../apache/nifi/web/api/InputPortResource.java | 48 +-
.../org/apache/nifi/web/api/LabelResource.java | 46 +-
.../org/apache/nifi/web/api/NodeResource.java | 20 +-
.../apache/nifi/web/api/OutputPortResource.java | 48 +-
.../nifi/web/api/ProcessGroupResource.java | 155 ++--
.../apache/nifi/web/api/ProcessorResource.java | 69 +-
.../apache/nifi/web/api/ProvenanceResource.java | 129 +--
.../web/api/RemoteProcessGroupResource.java | 99 +--
.../nifi/web/api/ReportingTaskResource.java | 92 +--
.../apache/nifi/web/api/SnippetResource.java | 79 +-
.../nifi/web/api/SystemDiagnosticsResource.java | 4 +-
.../apache/nifi/web/api/TemplateResource.java | 38 +-
.../apache/nifi/web/api/UserGroupResource.java | 44 +-
.../org/apache/nifi/web/api/UserResource.java | 33 +-
.../config/AdministrationExceptionMapper.java | 1 -
...ationCredentialsNotFoundExceptionMapper.java | 3 +-
.../web/api/config/ClusterExceptionMapper.java | 1 -
.../NoResponseFromNodesExceptionMapper.java | 3 +-
.../nifi/web/api/config/ThrowableMapper.java | 1 -
.../org/apache/nifi/web/api/dto/DtoFactory.java | 172 ++--
.../org/apache/nifi/web/api/package-info.java | 41 +-
.../request/BulletinBoardPatternParameter.java | 3 +-
.../nifi/web/api/request/ClientIdParameter.java | 3 +-
.../nifi/web/api/request/DateTimeParameter.java | 3 +-
.../nifi/web/api/request/DoubleParameter.java | 3 +-
.../nifi/web/api/request/IntegerParameter.java | 3 +-
.../nifi/web/api/request/LongParameter.java | 3 +-
.../ApplicationStartupContextListener.java | 8 +-
.../nifi/web/controller/ControllerFacade.java | 162 ++--
.../nifi/web/dao/ControllerServiceDAO.java | 3 +-
.../java/org/apache/nifi/web/dao/PortDAO.java | 2 +-
.../apache/nifi/web/dao/ProcessGroupDAO.java | 11 +-
.../org/apache/nifi/web/dao/ProcessorDAO.java | 3 +-
.../nifi/web/dao/RemoteProcessGroupDAO.java | 4 +-
.../apache/nifi/web/dao/ReportingTaskDAO.java | 11 +-
.../org/apache/nifi/web/dao/SnippetDAO.java | 3 +-
.../org/apache/nifi/web/dao/TemplateDAO.java | 17 +-
.../apache/nifi/web/dao/impl/ComponentDAO.java | 21 +-
.../web/dao/impl/StandardConnectionDAO.java | 48 --
.../dao/impl/StandardControllerServiceDAO.java | 67 +-
.../nifi/web/dao/impl/StandardFunnelDAO.java | 48 --
.../nifi/web/dao/impl/StandardInputPortDAO.java | 41 -
.../nifi/web/dao/impl/StandardLabelDAO.java | 48 --
.../web/dao/impl/StandardOutputPortDAO.java | 41 -
.../web/dao/impl/StandardProcessGroupDAO.java | 34 -
.../nifi/web/dao/impl/StandardProcessorDAO.java | 49 --
.../dao/impl/StandardRemoteProcessGroupDAO.java | 29 +-
.../web/dao/impl/StandardReportingTaskDAO.java | 63 +-
.../nifi/web/dao/impl/StandardSnippetDAO.java | 43 -
.../nifi/web/filter/NodeRequestFilter.java | 21 +-
.../org/apache/nifi/web/util/Availability.java | 3 +-
.../org/apache/nifi/web/util/SnippetUtils.java | 14 +-
.../apache/nifi/integration/NiFiWebApiTest.java | 27 -
.../accesscontrol/AdminAccessControlTest.java | 162 +---
.../accesscontrol/DfmAccessControlTest.java | 140 +---
.../ReadOnlyAccessControlTest.java | 162 +---
.../util/NiFiTestAuthorizationProvider.java | 36 +-
.../nifi/integration/util/NiFiTestServer.java | 7 +-
.../nifi/integration/util/NiFiTestUser.java | 88 +-
.../nifi/web/docs/DocumentationController.java | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 17 -
.../org/apache/nifi/processors/GeoEnrichIP.java | 13 +-
.../nifi/processors/maxmind/DatabaseReader.java | 40 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 28 +-
.../hadoop/AbstractHadoopProcessor.java | 7 +-
.../hadoop/CreateHadoopSequenceFile.java | 28 +-
.../apache/nifi/processors/hadoop/GetHDFS.java | 60 +-
.../processors/hadoop/GetHDFSSequenceFile.java | 18 +-
.../nifi/processors/hadoop/KeyValueReader.java | 6 +-
.../nifi/processors/hadoop/ValueReader.java | 5 +-
.../hadoop/util/ByteFilteringOutputStream.java | 24 +-
.../hadoop/util/InputStreamWritable.java | 6 +-
.../hadoop/util/OutputStreamWritable.java | 3 +-
.../hadoop/util/SequenceFileWriter.java | 12 +-
.../nifi/provenance/IndexConfiguration.java | 12 +-
.../PersistentProvenanceRepository.java | 648 ++++++++-------
.../provenance/RepositoryConfiguration.java | 100 +--
.../nifi/provenance/StandardRecordReader.java | 221 ++++-
.../nifi/provenance/StandardRecordWriter.java | 110 ++-
.../provenance/expiration/ExpirationAction.java | 6 +-
.../provenance/lucene/DeleteIndexAction.java | 77 +-
.../nifi/provenance/lucene/DocsReader.java | 99 ++-
.../nifi/provenance/lucene/FieldNames.java | 1 +
.../nifi/provenance/lucene/IndexManager.java | 467 +++++++++++
.../nifi/provenance/lucene/IndexSearch.java | 67 +-
.../nifi/provenance/lucene/IndexingAction.java | 232 ++----
.../nifi/provenance/lucene/LineageQuery.java | 6 +-
.../nifi/provenance/lucene/LuceneUtil.java | 26 +-
.../provenance/rollover/CompressionAction.java | 59 --
.../provenance/rollover/RolloverAction.java | 35 -
.../provenance/serialization/RecordReader.java | 72 ++
.../provenance/serialization/RecordReaders.java | 123 +--
.../provenance/serialization/RecordWriter.java | 25 +-
.../provenance/serialization/RecordWriters.java | 13 +-
.../nifi/provenance/toc/StandardTocReader.java | 108 +++
.../nifi/provenance/toc/StandardTocWriter.java | 119 +++
.../apache/nifi/provenance/toc/TocReader.java | 62 ++
.../org/apache/nifi/provenance/toc/TocUtil.java | 40 +
.../apache/nifi/provenance/toc/TocWriter.java | 50 ++
.../TestPersistentProvenanceRepository.java | 192 +++--
.../TestStandardRecordReaderWriter.java | 189 +++++
.../org/apache/nifi/provenance/TestUtil.java | 82 ++
.../provenance/toc/TestStandardTocReader.java | 91 +++
.../provenance/toc/TestStandardTocWriter.java | 42 +
.../web/StandardContentViewerController.java | 9 +-
.../nifi-standard-processors/pom.xml | 3 +
.../standard/AbstractJsonPathProcessor.java | 14 +-
.../standard/Base64EncodeContent.java | 11 +-
.../nifi/processors/standard/BinFiles.java | 155 ++--
.../processors/standard/CompressContent.java | 29 +-
.../nifi/processors/standard/ControlRate.java | 36 +-
.../standard/ConvertCharacterSet.java | 43 +-
.../processors/standard/DetectDuplicate.java | 28 +-
.../processors/standard/DistributeLoad.java | 76 +-
.../nifi/processors/standard/EncodeContent.java | 27 +-
.../processors/standard/EncryptContent.java | 23 +-
.../processors/standard/EvaluateJsonPath.java | 99 ++-
.../standard/EvaluateRegularExpression.java | 31 +-
.../nifi/processors/standard/EvaluateXPath.java | 80 +-
.../processors/standard/EvaluateXQuery.java | 57 +-
.../processors/standard/ExecuteProcess.java | 10 +-
.../standard/ExecuteStreamCommand.java | 50 +-
.../nifi/processors/standard/ExtractText.java | 23 +-
.../processors/standard/GenerateFlowFile.java | 7 +-
.../apache/nifi/processors/standard/GetFTP.java | 14 +-
.../nifi/processors/standard/GetFile.java | 26 +-
.../processors/standard/GetFileTransfer.java | 9 +-
.../nifi/processors/standard/GetHTTP.java | 79 +-
.../nifi/processors/standard/GetJMSTopic.java | 47 +-
.../nifi/processors/standard/GetSFTP.java | 16 +-
.../processors/standard/HandleHttpRequest.java | 463 ++++++-----
.../processors/standard/HandleHttpResponse.java | 126 +--
.../nifi/processors/standard/HashAttribute.java | 64 +-
.../nifi/processors/standard/HashContent.java | 18 +-
.../processors/standard/IdentifyMimeType.java | 17 +-
.../nifi/processors/standard/InvokeHTTP.java | 127 ++-
.../nifi/processors/standard/JmsConsumer.java | 104 +--
.../nifi/processors/standard/ListenHTTP.java | 18 +-
.../nifi/processors/standard/ListenUDP.java | 269 +++---
.../nifi/processors/standard/LogAttribute.java | 5 +-
.../nifi/processors/standard/MergeContent.java | 174 ++--
.../nifi/processors/standard/ModifyBytes.java | 3 -
.../processors/standard/MonitorActivity.java | 27 +-
.../nifi/processors/standard/PostHTTP.java | 111 +--
.../nifi/processors/standard/PutEmail.java | 199 ++---
.../apache/nifi/processors/standard/PutFTP.java | 23 +-
.../nifi/processors/standard/PutFile.java | 29 +-
.../processors/standard/PutFileTransfer.java | 36 +-
.../apache/nifi/processors/standard/PutJMS.java | 49 +-
.../nifi/processors/standard/PutSFTP.java | 3 +-
.../nifi/processors/standard/ReplaceText.java | 36 +-
.../standard/ReplaceTextWithMapping.java | 45 +-
.../processors/standard/RouteOnAttribute.java | 41 +-
.../processors/standard/RouteOnContent.java | 18 +-
.../nifi/processors/standard/ScanAttribute.java | 15 +-
.../nifi/processors/standard/ScanContent.java | 21 +-
.../processors/standard/SegmentContent.java | 39 +-
.../nifi/processors/standard/SplitContent.java | 39 +-
.../nifi/processors/standard/SplitJson.java | 27 +-
.../nifi/processors/standard/SplitText.java | 50 +-
.../nifi/processors/standard/SplitXml.java | 18 +-
.../nifi/processors/standard/TransformXml.java | 20 +-
.../nifi/processors/standard/UnpackContent.java | 54 +-
.../nifi/processors/standard/ValidateXml.java | 10 +-
.../servlets/ContentAcknowledgmentServlet.java | 11 +-
.../standard/servlets/ListenHTTPServlet.java | 29 +-
.../nifi/processors/standard/util/Bin.java | 38 +-
.../processors/standard/util/BinManager.java | 19 +-
.../standard/util/DocumentReaderCallback.java | 13 +-
.../processors/standard/util/FTPTransfer.java | 3 +-
.../nifi/processors/standard/util/FTPUtils.java | 59 +-
.../processors/standard/util/FileTransfer.java | 29 +-
.../processors/standard/util/JmsFactory.java | 3 +-
.../standard/util/JmsProcessingSummary.java | 100 ++-
.../processors/standard/util/JmsProperties.java | 5 +-
.../util/JsonPathExpressionValidator.java | 86 +-
.../standard/util/NLKBufferedReader.java | 14 +-
.../standard/util/SFTPConnection.java | 9 -
.../processors/standard/util/SFTPTransfer.java | 26 +-
.../processors/standard/util/SFTPUtils.java | 12 -
.../util/ValidatingBase32InputStream.java | 4 +-
.../util/ValidatingBase64InputStream.java | 3 +-
.../additionalDetails.html | 6 +-
.../additionalDetails.html | 2 +-
.../org/apache/tika/mime/custom-mimetypes.xml | 144 ++--
.../processors/standard/CaptureServlet.java | 9 +-
.../processors/standard/HelloWorldServlet.java | 3 +-
.../standard/TestBase64EncodeContent.java | 1 -
.../standard/TestCompressContent.java | 13 +-
.../processors/standard/TestControlRate.java | 3 +-
.../standard/TestDetectDuplicate.java | 9 +-
.../processors/standard/TestDistributeLoad.java | 1 -
.../processors/standard/TestEncryptContent.java | 1 -
.../standard/TestEvaluateJsonPath.java | 3 -
.../processors/standard/TestEvaluateXPath.java | 1 -
.../processors/standard/TestExecuteProcess.java | 18 +-
.../standard/TestExecuteStreamCommand.java | 4 +-
.../processors/standard/TestExtractText.java | 23 +-
.../nifi/processors/standard/TestGetHTTP.java | 59 +-
.../standard/TestHandleHttpRequest.java | 30 +-
.../standard/TestHandleHttpResponse.java | 64 +-
.../processors/standard/TestHashAttribute.java | 2 +-
.../processors/standard/TestHashContent.java | 1 -
.../standard/TestIdentifyMimeType.java | 1 -
.../processors/standard/TestInvokeHTTP.java | 57 +-
.../processors/standard/TestJmsConsumer.java | 192 +++--
.../nifi/processors/standard/TestListenUDP.java | 1 -
.../processors/standard/TestMergeContent.java | 20 +-
.../processors/standard/TestModifyBytes.java | 1 -
.../standard/TestMonitorActivity.java | 18 +-
.../nifi/processors/standard/TestPostHTTP.java | 87 +-
.../nifi/processors/standard/TestPutEmail.java | 77 +-
.../standard/TestReplaceTextLineByLine.java | 1 -
.../standard/TestReplaceTextWithMapping.java | 4 +-
.../standard/TestRouteOnAttribute.java | 1 -
.../processors/standard/TestRouteOnContent.java | 1 -
.../processors/standard/TestScanAttribute.java | 1 -
.../processors/standard/TestSegmentContent.java | 1 -
.../nifi/processors/standard/TestServer.java | 65 +-
.../processors/standard/TestSplitContent.java | 21 +-
.../nifi/processors/standard/TestSplitText.java | 10 -
.../nifi/processors/standard/TestSplitXml.java | 1 -
.../processors/standard/TestTransformXml.java | 5 -
.../processors/standard/TestUnpackContent.java | 2 -
.../processors/standard/TestValidateXml.java | 1 -
.../standard/UserAgentTestingServlet.java | 1 -
.../test/resources/TestJson/json-sample.json | 814 +++++++++----------
.../ControllerStatusReportingTask.java | 19 +-
.../apache/nifi/controller/MonitorMemory.java | 3 +-
.../distributed/cache/client/CommsSession.java | 16 +-
.../DistributedMapCacheClientService.java | 9 +-
.../DistributedSetCacheClientService.java | 8 +-
.../cache/client/SSLCommsSession.java | 25 +-
.../cache/client/StandardCommsSession.java | 1 +
.../additionalDetails.html | 45 -
.../cache/server/AbstractCacheServer.java | 25 +-
.../distributed/cache/server/CacheRecord.java | 12 +-
.../distributed/cache/server/CacheServer.java | 3 +-
.../cache/server/DistributedCacheServer.java | 3 +-
.../cache/server/DistributedSetCacheServer.java | 13 +-
.../cache/server/EvictionPolicy.java | 24 +-
.../cache/server/SetCacheServer.java | 25 +-
.../server/map/DistributedMapCacheServer.java | 12 +-
.../distributed/cache/server/map/MapCache.java | 4 +
.../cache/server/map/MapCacheRecord.java | 19 +-
.../cache/server/map/MapCacheServer.java | 113 +--
.../cache/server/map/MapPutResult.java | 5 +-
.../cache/server/map/PersistentMapCache.java | 51 +-
.../cache/server/map/SimpleMapCache.java | 47 +-
.../cache/server/set/PersistentSetCache.java | 57 +-
.../distributed/cache/server/set/SetCache.java | 5 +-
.../cache/server/set/SetCacheRecord.java | 15 +-
.../cache/server/set/SetCacheResult.java | 11 +-
.../cache/server/set/SimpleSetCache.java | 41 +-
.../additionalDetails.html | 46 --
.../cache/server/TestServerAndClient.java | 9 +-
.../nifi-http-context-map-api/pom.xml | 34 +-
.../org/apache/nifi/http/HttpContextMap.java | 45 +-
.../nifi-http-context-map/pom.xml | 20 +-
.../nifi/http/StandardHttpContextMap.java | 83 +-
.../index.html | 67 --
.../nifi/ssl/StandardSSLContextService.java | 3 +-
.../additionalDetails.html | 49 --
.../apache/nifi/ssl/SSLContextServiceTest.java | 4 +-
533 files changed, 8020 insertions(+), 9214 deletions(-)
----------------------------------------------------------------------