Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0d8cc34a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0d8cc34a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0d8cc34a Branch: refs/heads/NIFI-250 Commit: 0d8cc34ae16979853a05b0ef214cd62694a31daf Parents: baa0e74 048c5d9 Author: Mark Payne <[email protected]> Authored: Wed Mar 11 08:45:36 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Mar 11 08:45:36 2015 -0400 ---------------------------------------------------------------------- nifi/LICENSE | 1 - nifi/NOTICE | 5 + .../nifi/components/PropertyDescriptor.java | 1 + .../apache/nifi/remote/RemoteDestination.java | 53 + nifi/nifi-assembly/LICENSE | 28 + nifi/nifi-assembly/NOTICE | 8 + nifi/nifi-assembly/pom.xml | 11 + .../org/apache/nifi/util/NiFiProperties.java | 5 + .../nifi-site-to-site-client/pom.xml | 45 + .../remote/AbstractCommunicationsSession.java | 54 ++ .../org/apache/nifi/remote/Communicant.java | 47 + .../main/java/org/apache/nifi/remote/Peer.java | 151 +++ .../org/apache/nifi/remote/PeerDescription.java | 79 ++ .../java/org/apache/nifi/remote/PeerStatus.java | 60 ++ .../nifi/remote/RemoteResourceInitiator.java | 73 ++ .../org/apache/nifi/remote/Transaction.java | 214 ++++ .../nifi/remote/TransactionCompletion.java | 63 ++ .../apache/nifi/remote/TransferDirection.java | 34 + .../nifi/remote/VersionedRemoteResource.java | 24 + .../nifi/remote/client/SiteToSiteClient.java | 519 ++++++++++ .../remote/client/SiteToSiteClientConfig.java | 124 +++ .../client/socket/EndpointConnection.java | 54 ++ .../client/socket/EndpointConnectionPool.java | 965 +++++++++++++++++++ .../nifi/remote/client/socket/SocketClient.java | 218 +++++ .../remote/cluster/AdaptedNodeInformation.java | 66 ++ .../remote/cluster/ClusterNodeInformation.java | 67 ++ .../nifi/remote/cluster/NodeInformation.java | 98 ++ .../remote/cluster/NodeInformationAdapter.java | 41 + .../apache/nifi/remote/codec/FlowFileCodec.java | 71 ++ .../remote/codec/StandardFlowFileCodec.java | 129 +++ .../remote/exception/HandshakeException.java | 37 + .../exception/PortNotRunningException.java | 30 + .../remote/exception/ProtocolException.java | 40 + .../remote/exception/UnknownPortException.java | 29 + .../SocketChannelCommunicationsSession.java | 110 +++ .../remote/io/socket/SocketChannelInput.java | 71 ++ .../remote/io/socket/SocketChannelOutput.java | 58 ++ .../SSLSocketChannelCommunicationsSession.java | 113 +++ .../io/socket/ssl/SSLSocketChannelInput.java | 55 ++ .../io/socket/ssl/SSLSocketChannelOutput.java | 44 + .../nifi/remote/protocol/ClientProtocol.java | 86 ++ .../remote/protocol/CommunicationsInput.java | 33 + .../remote/protocol/CommunicationsOutput.java | 27 + .../remote/protocol/CommunicationsSession.java | 64 ++ .../apache/nifi/remote/protocol/DataPacket.java | 45 + .../nifi/remote/protocol/RequestType.java | 43 + .../protocol/socket/HandshakeProperty.java | 61 ++ .../nifi/remote/protocol/socket/Response.java | 51 + .../remote/protocol/socket/ResponseCode.java | 153 +++ .../protocol/socket/SocketClientProtocol.java | 438 +++++++++ .../socket/SocketClientTransaction.java | 399 ++++++++ .../SocketClientTransactionCompletion.java | 57 ++ .../nifi/remote/util/NiFiRestApiUtil.java | 98 ++ .../nifi/remote/util/PeerStatusCache.java | 43 + .../nifi/remote/util/StandardDataPacket.java | 50 + .../socket/TestEndpointConnectionStatePool.java | 95 ++ .../client/socket/TestSiteToSiteClient.java | 105 ++ .../nifi/remote/io/CompressionInputStream.java | 2 +- .../io/socket/SocketChannelInputStream.java | 12 + .../remote/io/socket/ssl/SSLSocketChannel.java | 12 + .../socket/ssl/SSLSocketChannelInputStream.java | 4 + .../nifi/stream/io/LimitingInputStream.java | 111 +++ .../stream/io/MinimumLengthInputStream.java | 93 ++ .../java/org/apache/nifi/util/RingBuffer.java | 2 +- .../nifi/util/timebuffer/TestRingBuffer.java | 10 + .../org/wali/MinimalLockingWriteAheadLog.java | 7 +- nifi/nifi-commons/pom.xml | 1 + .../src/main/asciidoc/administration-guide.adoc | 43 +- nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 +- .../nifi-docs/src/main/asciidoc/user-guide.adoc | 11 + nifi/nifi-external/README.md | 19 + nifi/nifi-external/nifi-spark-receiver/pom.xml | 37 + .../org/apache/nifi/spark/NiFiDataPacket.java | 40 + .../org/apache/nifi/spark/NiFiReceiver.java | 198 ++++ nifi/nifi-external/pom.xml | 29 + .../nifi/util/MockControllerServiceLookup.java | 3 + .../apache/nifi/util/MockProcessContext.java | 4 +- ...ontrollerServiceReferencingComponentDTO.java | 16 + .../nifi-framework/nifi-cluster/pom.xml | 4 + .../nifi/cluster/manager/ClusterManager.java | 18 +- .../cluster/manager/impl/WebClusterManager.java | 4 +- .../nifi-framework-core-api/pom.xml | 4 + .../nifi/cluster/AdaptedNodeInformation.java | 66 -- .../nifi/cluster/ClusterNodeInformation.java | 67 -- .../org/apache/nifi/cluster/NodeInformant.java | 22 - .../apache/nifi/cluster/NodeInformation.java | 98 -- .../nifi/cluster/NodeInformationAdapter.java | 39 - .../apache/nifi/controller/StandardFunnel.java | 2 +- .../apache/nifi/groups/RemoteProcessGroup.java | 39 +- .../main/java/org/apache/nifi/remote/Peer.java | 107 -- .../java/org/apache/nifi/remote/PeerStatus.java | 72 -- .../org/apache/nifi/remote/RemoteGroupPort.java | 22 +- .../apache/nifi/remote/TransferDirection.java | 23 - .../nifi/remote/VersionedRemoteResource.java | 24 - .../nifi/remote/cluster/NodeInformant.java | 22 + .../apache/nifi/remote/codec/FlowFileCodec.java | 79 -- .../remote/exception/HandshakeException.java | 30 - .../exception/PortNotRunningException.java | 26 - .../remote/exception/ProtocolException.java | 34 - .../remote/exception/UnknownPortException.java | 26 - .../nifi/remote/protocol/ClientProtocol.java | 78 -- .../remote/protocol/CommunicationsInput.java | 27 - .../remote/protocol/CommunicationsOutput.java | 27 - .../remote/protocol/CommunicationsSession.java | 64 -- .../nifi/remote/protocol/RequestType.java | 43 - .../nifi/remote/protocol/ServerProtocol.java | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 4 + .../repository/StandardProcessSession.java | 46 +- .../scheduling/QuartzSchedulingAgent.java | 21 +- .../controller/scheduling/ScheduleState.java | 18 +- .../scheduling/StandardProcessScheduler.java | 4 +- .../scheduling/TimerDrivenSchedulingAgent.java | 124 ++- .../tasks/ContinuallyRunConnectableTask.java | 32 +- .../tasks/ContinuallyRunProcessorTask.java | 82 +- .../org/apache/nifi/remote/RemoteNiFiUtils.java | 216 +++++ .../nifi/remote/StandardRemoteProcessGroup.java | 353 +------ .../src/main/resources/conf/nifi.properties | 2 + .../nifi-framework/nifi-site-to-site/.gitignore | 1 + .../nifi-framework/nifi-site-to-site/pom.xml | 4 + .../remote/AbstractCommunicationsSession.java | 54 -- .../nifi/remote/RemoteResourceFactory.java | 50 +- .../nifi/remote/SocketRemoteSiteListener.java | 16 +- .../nifi/remote/StandardRemoteGroupPort.java | 697 ++++---------- .../remote/codec/StandardFlowFileCodec.java | 169 ---- .../SocketChannelCommunicationsSession.java | 90 -- .../remote/io/socket/SocketChannelInput.java | 66 -- .../remote/io/socket/SocketChannelOutput.java | 58 -- .../SSLSocketChannelCommunicationsSession.java | 93 -- .../io/socket/ssl/SSLSocketChannelInput.java | 50 - .../io/socket/ssl/SSLSocketChannelOutput.java | 44 - .../socket/ClusterManagerServerProtocol.java | 7 +- .../protocol/socket/HandshakeProperty.java | 23 - .../nifi/remote/protocol/socket/Response.java | 51 - .../remote/protocol/socket/ResponseCode.java | 152 --- .../protocol/socket/SocketClientProtocol.java | 510 ---------- .../socket/SocketFlowFileServerProtocol.java | 199 ++-- .../remote/TestStandardRemoteGroupPort.java | 97 -- .../web/api/RemoteProcessGroupResource.java | 8 + .../org/apache/nifi/web/api/dto/DtoFactory.java | 16 + .../web/dao/impl/StandardReportingTaskDAO.java | 15 +- .../ControllerServiceProviderFactoryBean.java | 3 +- .../ReportingTaskProviderFactoryBean.java | 69 ++ .../src/main/resources/nifi-web-api-context.xml | 8 +- .../disable-controller-service-dialog.jsp | 57 +- .../canvas/enable-controller-service-dialog.jsp | 55 +- .../canvas/new-remote-process-group-dialog.jsp | 2 +- .../src/main/webapp/css/controller-service.css | 61 +- .../nifi-web-ui/src/main/webapp/css/main.css | 9 + .../src/main/webapp/js/jquery/jquery.each.js | 2 +- .../js/jquery/nfeditor/jquery.nfeditor.js | 5 +- .../propertytable/jquery.propertytable.js | 2 + .../main/webapp/js/jquery/tabbs/jquery.tabbs.js | 2 + .../js/jquery/tagcloud/jquery.tagcloud.js | 8 +- .../js/nf/bulletin-board/nf-bulletin-board.js | 3 + .../src/main/webapp/js/nf/canvas/nf-actions.js | 3 + .../src/main/webapp/js/nf/canvas/nf-birdseye.js | 3 + .../webapp/js/nf/canvas/nf-canvas-header.js | 5 +- .../webapp/js/nf/canvas/nf-canvas-toolbar.js | 3 + .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 3 + .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 3 + .../src/main/webapp/js/nf/canvas/nf-canvas.js | 3 + .../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 | 5 +- .../js/nf/canvas/nf-controller-service.js | 596 +++++++++--- .../js/nf/canvas/nf-custom-processor-ui.js | 3 + .../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 | 3 + .../main/webapp/js/nf/canvas/nf-processor.js | 3 + .../main/webapp/js/nf/canvas/nf-registration.js | 3 + .../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 | 3 + .../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 | 356 +++---- .../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 | 3 + .../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 | 3 + .../main/webapp/js/nf/nf-connection-details.js | 3 + .../src/main/webapp/js/nf/nf-dialog.js | 3 + .../main/webapp/js/nf/nf-processor-details.js | 3 + .../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 + .../hadoop/CreateHadoopSequenceFile.java | 4 +- .../nifi-hadoop-libraries-nar/pom.xml | 85 +- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 47 + .../nifi-kite-processors/pom.xml | 148 +++ .../processors/kite/AbstractKiteProcessor.java | 217 +++++ .../apache/nifi/processors/kite/AvroUtil.java | 43 + .../nifi/processors/kite/ConvertCSVToAvro.java | 258 +++++ .../nifi/processors/kite/ConvertJSONToAvro.java | 157 +++ .../nifi/processors/kite/JSONFileReader.java | 114 +++ .../processors/kite/StoreInKiteDataset.java | 168 ++++ .../data/spi/filesystem/CSVFileReaderFixed.java | 172 ++++ .../org.apache.nifi.processor.Processor | 17 + .../processors/kite/TestCSVToAvroProcessor.java | 126 +++ .../kite/TestConfigurationProperty.java | 77 ++ .../nifi/processors/kite/TestGetSchema.java | 98 ++ .../kite/TestJSONToAvroProcessor.java | 61 ++ .../kite/TestKiteProcessorsCluster.java | 132 +++ .../kite/TestKiteStorageProcessor.java | 171 ++++ .../apache/nifi/processors/kite/TestUtil.java | 103 ++ nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 59 ++ .../src/main/resources/META-INF/LICENSE | 29 + .../src/main/resources/META-INF/NOTICE | 10 +- .../nifi-standard-processors/pom.xml | 13 + .../standard/AbstractJsonPathProcessor.java | 117 +++ .../standard/Base64EncodeContent.java | 13 +- .../processors/standard/CompressContent.java | 27 +- .../nifi/processors/standard/EncodeContent.java | 248 +++++ .../processors/standard/EvaluateJsonPath.java | 278 ++++++ .../processors/standard/ExecuteProcess.java | 513 ++++++++++ .../processors/standard/HandleHttpRequest.java | 604 ++++++++++++ .../processors/standard/HandleHttpResponse.java | 178 ++++ .../nifi/processors/standard/HashContent.java | 14 +- .../processors/standard/IdentifyMimeType.java | 405 +------- .../nifi/processors/standard/PutEmail.java | 5 +- .../processors/standard/SegmentContent.java | 114 ++- .../nifi/processors/standard/SplitJson.java | 184 ++++ .../nifi/processors/standard/TransformXml.java | 3 +- .../util/JsonPathExpressionValidator.java | 487 ++++++++++ .../util/ValidatingBase32InputStream.java | 78 ++ .../org.apache.nifi.processor.Processor | 5 + .../index.html | 155 +++ .../index.html | 100 ++ .../index.html | 255 +++++ .../index.html | 112 +++ .../index.html | 85 ++ .../org/apache/tika/mime/custom-mimetypes.xml | 83 ++ .../standard/TestCompressContent.java | 18 + .../processors/standard/TestEncodeContent.java | 164 ++++ .../standard/TestEvaluateJsonPath.java | 264 +++++ .../processors/standard/TestExecuteProcess.java | 78 ++ .../standard/TestHandleHttpRequest.java | 128 +++ .../standard/TestHandleHttpResponse.java | 172 ++++ .../standard/TestIdentifyMimeType.java | 80 +- .../nifi/processors/standard/TestPutEmail.java | 45 + .../nifi/processors/standard/TestSplitJson.java | 126 +++ .../test/resources/TestIdentifyMimeType/1.tar | Bin 2048 -> 10240 bytes .../resources/TestIdentifyMimeType/1.tar.gz | Bin 0 -> 154 bytes .../test/resources/TestIdentifyMimeType/1.txt | 1 + .../test/resources/TestJson/json-sample.json | 415 ++++++++ .../nifi-http-context-map-api/pom.xml | 23 + .../org/apache/nifi/http/HttpContextMap.java | 72 ++ .../nifi-http-context-map-nar/pom.xml | 37 + .../nifi-http-context-map/pom.xml | 44 + .../nifi/http/StandardHttpContextMap.java | 176 ++++ ...org.apache.nifi.controller.ControllerService | 1 + .../index.html | 67 ++ .../nifi-http-context-map-bundle/pom.xml | 31 + .../nifi-standard-services-api-nar/pom.xml | 5 + .../nifi-standard-services/pom.xml | 2 + nifi/nifi-nar-bundles/pom.xml | 12 + nifi/pom.xml | 55 +- 288 files changed, 16225 insertions(+), 4429 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0d8cc34a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ----------------------------------------------------------------------
