Merge branch 'NIFI-25' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/58ea7af9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/58ea7af9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/58ea7af9 Branch: refs/heads/NIFI-271 Commit: 58ea7af9a73deadba2b57d5c30f73179e56622c4 Parents: 9ee34e2 e813487 Author: Mark Payne <[email protected]> Authored: Sat Apr 11 14:39:07 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Sat Apr 11 14:39:07 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/NOTICE | 16 ++ .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 36 ++++ .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 58 ++++++ .../processors/aws/AbstractAWSProcessor.java | 195 ++++++++++++++++++ .../processors/aws/s3/AbstractS3Processor.java | 171 ++++++++++++++++ .../nifi/processors/aws/s3/FetchS3Object.java | 157 ++++++++++++++ .../nifi/processors/aws/s3/PutS3Object.java | 181 ++++++++++++++++ .../aws/sns/AbstractSNSProcessor.java | 60 ++++++ .../apache/nifi/processors/aws/sns/PutSNS.java | 155 ++++++++++++++ .../aws/sqs/AbstractSQSProcessor.java | 51 +++++ .../nifi/processors/aws/sqs/DeleteSQS.java | 95 +++++++++ .../apache/nifi/processors/aws/sqs/GetSQS.java | 204 +++++++++++++++++++ .../apache/nifi/processors/aws/sqs/PutSQS.java | 147 +++++++++++++ .../org.apache.nifi.processor.Processor | 20 ++ .../processors/aws/s3/TestFetchS3Object.java | 44 ++++ .../nifi/processors/aws/s3/TestPutS3Object.java | 87 ++++++++ .../nifi/processors/aws/sns/TestPutSNS.java | 34 ++++ .../nifi/processors/aws/sqs/TestGetSQS.java | 32 +++ .../nifi/processors/aws/sqs/TestPutSQS.java | 35 ++++ .../src/test/resources/hello.txt | 1 + nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 43 ++++ nifi/nifi-nar-bundles/pom.xml | 4 +- 22 files changed, 1824 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
