Merge branch 'master' into NIFI-259
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f6ec437b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f6ec437b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f6ec437b Branch: refs/heads/master Commit: f6ec437bc79b42eb516429381f117a9dd20050d3 Parents: d696391 0d7edcb Author: Mark Payne <marka...@hotmail.com> Authored: Thu Jan 21 09:32:02 2016 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Thu Jan 21 09:32:02 2016 -0500 ---------------------------------------------------------------------- .../nifi/controller/queue/FlowFileQueue.java | 46 +-- .../controller/queue/ListFlowFileStatus.java | 20 -- nifi-assembly/LICENSE | 60 +++- nifi-assembly/pom.xml | 5 + .../src/main/asciidoc/images/iconDetails.png | Bin 0 -> 549 bytes nifi-docs/src/main/asciidoc/user-guide.adoc | 14 +- .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 1 + ...AbstractAWSCredentialsProviderProcessor.java | 102 ++++++ .../processors/aws/AbstractAWSProcessor.java | 37 ++- ...AWSCredentialsProviderControllerService.java | 193 ++++++++++++ .../service/AWSCredentialsProviderService.java | 44 +++ .../processors/aws/s3/AbstractS3Processor.java | 40 ++- .../nifi/processors/aws/s3/DeleteS3Object.java | 2 +- .../nifi/processors/aws/s3/FetchS3Object.java | 2 +- .../nifi/processors/aws/s3/PutS3Object.java | 2 +- .../aws/sns/AbstractSNSProcessor.java | 23 +- .../apache/nifi/processors/aws/sns/PutSNS.java | 5 +- .../aws/sqs/AbstractSQSProcessor.java | 22 +- .../nifi/processors/aws/sqs/DeleteSQS.java | 2 +- .../apache/nifi/processors/aws/sqs/GetSQS.java | 3 +- .../apache/nifi/processors/aws/sqs/PutSQS.java | 2 +- ...org.apache.nifi.controller.ControllerService | 15 + ...redentialsProviderControllerServiceTest.java | 312 +++++++++++++++++++ .../nifi/processors/aws/s3/AbstractS3IT.java | 154 +++++++++ .../nifi/processors/aws/s3/AbstractS3Test.java | 151 --------- .../processors/aws/s3/ITDeleteS3Object.java | 168 ++++++++++ .../nifi/processors/aws/s3/ITFetchS3Object.java | 152 +++++++++ .../nifi/processors/aws/s3/ITPutS3Object.java | 201 ++++++++++++ .../processors/aws/s3/TestDeleteS3Object.java | 109 ------- .../processors/aws/s3/TestFetchS3Object.java | 98 ------ .../nifi/processors/aws/s3/TestPutS3Object.java | 140 --------- .../nifi/processors/aws/sns/ITPutSNS.java | 81 +++++ .../nifi/processors/aws/sns/TestPutSNS.java | 51 --- .../nifi/processors/aws/sqs/TestGetSQS.java | 29 ++ .../nifi/processors/aws/sqs/TestPutSQS.java | 34 ++ .../resources/mock-aws-credentials.properties | 2 + .../nifi/web/api/dto/ListingRequestDTO.java | 71 ++--- .../nifi/web/api/entity/FlowFileEntity.java | 2 +- .../cluster/manager/impl/WebClusterManager.java | 51 ++- .../controller/queue/ListFlowFileRequest.java | 35 +-- .../nifi/connectable/StandardConnection.java | 9 +- .../apache/nifi/controller/FlowController.java | 1 + .../nifi/controller/FlowFileSummaries.java | 95 ------ .../nifi/controller/StandardFlowFileQueue.java | 211 ++++--------- .../controller/TestStandardFlowFileQueue.java | 159 ++-------- .../repository/TestStandardProcessSession.java | 2 +- .../org/apache/nifi/web/NiFiServiceFacade.java | 22 +- .../nifi/web/StandardNiFiServiceFacade.java | 43 ++- .../apache/nifi/web/api/ConnectionResource.java | 61 +--- .../org/apache/nifi/web/api/dto/DtoFactory.java | 4 - .../org/apache/nifi/web/dao/ConnectionDAO.java | 9 +- .../web/dao/impl/StandardConnectionDAO.java | 36 +-- .../WEB-INF/partials/canvas/queue-listing.jsp | 8 +- .../src/main/webapp/css/queue-listing.css | 53 +++- .../src/main/webapp/js/nf/canvas/nf-actions.js | 2 +- .../main/webapp/js/nf/canvas/nf-context-menu.js | 2 +- .../webapp/js/nf/canvas/nf-queue-listing.js | 75 +++-- .../nifi-html-bundle/nifi-html-nar/pom.xml | 40 +++ .../src/main/resources/META-INF/LICENSE | 240 ++++++++++++++ .../src/main/resources/META-INF/NOTICE | 19 ++ .../nifi-html-processors/pom.xml | 71 +++++ .../org/apache/nifi/AbstractHTMLProcessor.java | 130 ++++++++ .../java/org/apache/nifi/GetHTMLElement.java | 241 ++++++++++++++ .../java/org/apache/nifi/ModifyHTMLElement.java | 179 +++++++++++ .../java/org/apache/nifi/PutHTMLElement.java | 165 ++++++++++ .../org.apache.nifi.processor.Processor | 17 + .../java/org/apache/nifi/AbstractHTMLTest.java | 28 ++ .../org/apache/nifi/TestGetHTMLElement.java | 275 ++++++++++++++++ .../org/apache/nifi/TestModifyHTMLElement.java | 204 ++++++++++++ .../org/apache/nifi/TestPutHTMLElement.java | 127 ++++++++ .../src/test/resources/Weather.html | 25 ++ nifi-nar-bundles/nifi-html-bundle/pom.xml | 43 +++ .../nifi/processors/standard/MergeContent.java | 4 +- .../nifi/processors/standard/PostHTTP.java | 102 +++--- .../processors/standard/CaptureServlet.java | 5 +- .../nifi/processors/standard/TestPostHTTP.java | 71 +++++ .../standard/util/TestJdbcCommon.java | 30 +- .../standard/util/TestJdbcHugeStream.java | 22 +- .../standard/util/TestJdbcTypesDerby.java | 26 +- .../standard/util/TestJdbcTypesH2.java | 25 +- nifi-nar-bundles/pom.xml | 1 + pom.xml | 41 ++- 82 files changed, 4020 insertions(+), 1384 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-assembly/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ---------------------------------------------------------------------- diff --cc nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java index 226060b,77005b6..1ebf010 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java @@@ -128,9 -126,7 +128,8 @@@ import org.apache.nifi.cluster.protocol import org.apache.nifi.cluster.protocol.message.ReconnectionFailureMessage; import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage; import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.state.StateManagerProvider; import org.apache.nifi.controller.ControllerService; - import org.apache.nifi.controller.FlowFileSummaries; import org.apache.nifi.controller.Heartbeater; import org.apache.nifi.controller.ReportingTaskNode; import org.apache.nifi.controller.ScheduledState; http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java ---------------------------------------------------------------------- diff --cc nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java index a28252b,150dd67..bc5245c --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java @@@ -28,7 -22,7 +22,8 @@@ import org.apache.nifi.controller.servi import org.apache.nifi.web.api.dto.BulletinBoardDTO; import org.apache.nifi.web.api.dto.BulletinQueryDTO; import org.apache.nifi.web.api.dto.ClusterDTO; +import org.apache.nifi.web.api.dto.ComponentStateDTO; + import org.apache.nifi.web.api.dto.ComponentHistoryDTO; import org.apache.nifi.web.api.dto.ConnectionDTO; import org.apache.nifi.web.api.dto.ControllerConfigurationDTO; import org.apache.nifi.web.api.dto.ControllerDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ec437b/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 78a1911,501593f..97a5e10 --- a/pom.xml +++ b/pom.xml @@@ -755,26 -754,10 +755,30 @@@ language governing permissions and limi <version>1.3.1</version> </dependency> <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.6</version> + </dependency> + + <!-- Test Dependencies for testing interactions with ZooKeeper --> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-test</artifactId> + <version>2.9.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.8.8</version> + <scope>test</scope> + </dependency> - ++ <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>1.8.3</version> + </dependency> + <!-- NiFi modules --> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-api</artifactId>
