You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/09/04 19:11:50 UTC
[02/41] git commit: Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8d0688f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8d0688f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8d0688f4
Branch: refs/heads/pp
Commit: 8d0688f420363d7c8cd5cac14b960ef9f8076c0b
Parents: db1d6fb 7216a6f
Author: Jason Letourneau <jl...@gmail.com>
Authored: Wed Jul 23 19:31:52 2014 -0400
Committer: Jason Letourneau <jl...@gmail.com>
Committed: Wed Jul 23 19:31:52 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
streams-contrib/pom.xml | 1 +
.../org/apache/streams/s3/S3PersistReader.java | 9 +-
.../streams/console/ConsolePersistReader.java | 23 +
.../streams/console/ConsolePersistWriter.java | 18 +
.../streams-persist-elasticsearch/README.md | 38 +
.../elasticsearch/ElasticsearchClient.java | 20 +-
.../ElasticsearchClientManager.java | 26 +-
.../ElasticsearchConfigurator.java | 36 +
.../ElasticsearchPersistReader.java | 30 +-
.../ElasticsearchPersistUpdater.java | 53 +-
.../ElasticsearchPersistWriter.java | 703 ++-
.../ElasticsearchPersistWriterTask.java | 38 -
.../elasticsearch/ElasticsearchQuery.java | 57 +-
.../elasticsearch/PercolateProcessor.java | 20 +-
.../ElasticsearchReaderConfiguration.json | 5 +
.../ElasticsearchWriterConfiguration.json | 5 +
.../src/main/resources/reference.json | 9 +
.../apache/streams/hbase/HbaseConfigurator.java | 18 +
.../streams/hbase/HbasePersistWriter.java | 18 +
.../streams/hbase/HbasePersistWriterTask.java | 18 +
.../apache/streams/hdfs/HdfsConfigurator.java | 18 +
.../streams/hdfs/WebHdfsPersistReader.java | 27 +-
.../streams/hdfs/WebHdfsPersistReaderTask.java | 18 +
.../streams/hdfs/WebHdfsPersistWriter.java | 162 +-
.../streams/hdfs/WebHdfsPersistWriterTask.java | 18 +
.../apache/streams/kafka/KafkaConfigurator.java | 18 +
.../streams/kafka/KafkaPersistReader.java | 23 +
.../streams/kafka/KafkaPersistReaderTask.java | 18 +
.../streams/kafka/KafkaPersistWriter.java | 18 +
.../streams/kafka/KafkaPersistWriterTask.java | 18 +
.../streams/kafka/StreamsPartitioner.java | 18 +
streams-contrib/streams-persist-mongo/README.md | 16 +
.../apache/streams/mongo/MongoConfigurator.java | 18 +
.../streams/mongo/MongoPersistReader.java | 270 ++
.../streams/mongo/MongoPersistWriter.java | 39 +-
.../src/main/resources/reference.json | 8 +
.../src/main/resources/reference.properties | 10 -
.../apache/streams/json/JsonPathExtractor.java | 18 +-
.../json/test/JsonPathExtractorTwitterTest.java | 92 +
.../src/test/resources/tweet.json | 1 +
.../regex/AbstractRegexExtensionExtractor.java | 23 +-
.../org/apache/streams/regex/RegexUtils.java | 43 +-
.../org/apache/streams/urls/LinkResolver.java | 3 +-
.../urls/LinkResolverHelperFunctions.java | 1 +
.../streams/urls/LinkResolverProcessor.java | 3 +-
.../streams/urls/LinkHelperFunctionsTest.java | 18 +
.../streams/urls/TestLinkUnwinderProcessor.java | 18 +
.../streams-provider-datasift/pom.xml | 50 +-
.../streams/datasift/csdl/DatasiftCsdlUtil.java | 114 +
.../datasift/provider/DatasiftConverter.java | 38 +
.../provider/DatasiftEventProcessor.java | 105 -
.../provider/DatasiftStreamConfigurator.java | 20 +-
.../provider/DatasiftStreamProvider.java | 277 +-
.../DatasiftTypeConverterProcessor.java | 166 +
.../streams/datasift/provider/ErrorHandler.java | 46 +
.../streams/datasift/provider/Subscription.java | 59 +
.../serializer/DatasiftActivitySerializer.java | 193 +-
.../DatasiftDefaultActivitySerializer.java | 214 +
.../DatasiftTweetActivitySerializer.java | 229 +
.../main/jsonschema/com/datasift/Datasift.json | 221 +-
.../com/datasift/DatasiftConfiguration.json | 1 +
.../com/datasift/DatasiftTwitterUser.json | 61 +
.../com/datasift/test/DatasiftSerDeTest.java | 63 -
.../com/datasift/test/DatasiftSerDeTest.java | 80 +
.../provider/DatasiftStreamProviderTest.java | 144 +
.../DatasiftTypeConverterProcessorTest.java | 73 +
.../datasift/provider/ErrorHandlerTest.java | 40 +
.../datasift/provider/SubscriptionTest.java | 58 +
.../DatasiftActivitySerializerTest.java | 74 +
.../src/test/resources/amazon_datasift_json.txt | 10 +
.../src/test/resources/blog_datasift_json.txt | 719 +++
.../src/test/resources/board_datasift_json.txt | 4160 ++++++++++++++++++
.../test/resources/facebook_datasift_json.txt | 1843 ++++++++
.../src/test/resources/part-r-00000.json | 1724 ++++----
.../resources/rand_sample_datasift_json.txt | 1547 +++++++
.../resources/random_sample_datasift_json.txt | 1547 +++++++
.../src/test/resources/reddit_datasift_json.txt | 33 +
.../test/resources/twitter_datasift_json.txt | 1000 +++++
.../test/resources/wikipedia_datasift_json.txt | 252 ++
.../test/resources/youtube_datasift_json.txt | 7 +
...FacebookPublicFeedXmlActivitySerializer.java | 18 +
.../FacebookPostActivitySerializerTest.java | 1 +
.../facebook/test/FacebookPostSerDeTest.java | 18 +
.../facebook/test/FacebookEDCSerDeTest.java | 18 +
.../gnip/flickr/test/FlickrEDCSerDeTest.java | 18 +
.../com/gplus/api/GPlusActivitySerializer.java | 18 +
.../com/gplus/api/GPlusEDCAsActivityTest.java | 18 +
.../com/instagram/test/InstagramSerDeTest.java | 18 +
.../reddit/api/RedditActivitySerializer.java | 18 +
.../reddit/api/RedditEDCAsActivityJSONTest.java | 18 +
.../java/com/gnip/test/YouTubeEDCSerDeTest.java | 20 +-
.../com/gnip/test/YoutubeEDCAsActivityTest.java | 2 +-
.../ActivityXMLActivitySerializer.java | 18 +
.../PowerTrackActivitySerializer.java | 18 +
.../test/PowerTrackDeserializationTest.java | 18 +
.../google-gmail/pom.xml | 2 +-
.../com/google/gmail/GMailConfigurator.java | 18 +
.../gmail/provider/GMailImapProviderTask.java | 18 +
.../GMailMessageActivitySerializer.java | 18 +
.../google/gmail/provider/GMailProvider.java | 26 +-
.../gmail/provider/GMailRssProviderTask.java | 18 +
.../gplus/provider/GPlusActivitySerializer.java | 18 +
.../gplus/provider/GPlusConfigurator.java | 18 +
.../gplus/provider/GPlusEventProcessor.java | 18 +
.../provider/GPlusHistoryProviderTask.java | 18 +
.../google/gplus/provider/GPlusProvider.java | 23 +
.../gmail/test/GMailMessageSerDeTest.java | 18 +
.../streams-provider-instagram/README.md | 17 +
.../InstagramMediaDataActivitySerializer.mup | 894 ++++
.../metadata/instagram_to_activity_mapping.png | Bin 0 -> 1123684 bytes
.../streams-provider-instagram/pom.xml | 145 +
.../instagram/InstagramConfigurator.java | 65 +
.../processor/InstagramTypeConverter.java | 102 +
.../provider/InstagramRecentMediaCollector.java | 165 +
.../provider/InstagramRecentMediaProvider.java | 115 +
.../InstagramJsonActivitySerializer.java | 78 +
.../serializer/util/InstagramActivityUtil.java | 285 ++
.../serializer/util/InstagramDeserializer.java | 33 +
.../com/instagram/InstagramConfiguration.json | 21 +
.../InstagramUserInformationConfiguration.json | 17 +
.../src/main/resources/reference.conf | 5 +
.../InstagramRecentMediaCollectorTest.java | 175 +
.../InstagramRecentMediaProviderTest.java | 160 +
.../test/InstagramActivitySerDeTest.java | 88 +
.../src/test/resources/testMediaFeedObjects.txt | 2 +
.../src/test/resources/testtweets.txt | 695 +++
.../data/MoreoverJsonActivitySerializer.java | 18 +
.../data/MoreoverXmlActivitySerializer.java | 18 +
.../streams/data/moreover/MoreoverClient.java | 18 +
.../data/moreover/MoreoverConfigurator.java | 18 +
.../streams/data/moreover/MoreoverProvider.java | 23 +
.../data/moreover/MoreoverProviderTask.java | 18 +
.../streams/data/moreover/MoreoverResult.java | 18 +
.../data/moreover/MoreoverResultSetWrapper.java | 18 +
.../apache/streams/data/util/MoreoverUtils.java | 18 +
.../MoreoverJsonActivitySerializerTest.java | 1 +
.../data/MoreoverXmlActivitySerializerTest.java | 18 +
.../streams/rss/processor/RssTypeConverter.java | 72 +
.../rss/provider/RssEventClassifier.java | 18 +
.../streams/rss/provider/RssEventProcessor.java | 26 +-
.../rss/provider/RssStreamConfigurator.java | 18 +
.../streams/rss/provider/RssStreamProvider.java | 24 +
.../rss/provider/RssStreamProviderTask.java | 18 +
.../serializer/SyndEntryActivitySerializer.java | 216 +-
.../rss/serializer/SyndEntrySerializer.java | 308 ++
.../streams/rss/test/RssTypeConverterTest.java | 31 +
.../test/SyndEntryActivitySerizlizerTest.java | 102 +
.../streams/rss/test/Top100FeedsTest.java | 66 -
.../src/test/resources/TestSyndEntryJson.txt | 10 +
.../sysomos/config/SysomosConfigurator.java | 39 +
.../sysomos/proessor/SysomosTypeConverter.java | 56 -
.../sysomos/processor/SysomosTypeConverter.java | 56 +
.../sysomos/provider/ContentRequestBuilder.java | 1 +
.../provider/SysomosHeartbeatStream.java | 146 +-
.../sysomos/provider/SysomosProvider.java | 127 +-
.../streams/sysomos/util/SysomosUtils.java | 2 +-
.../com/sysomos/test/SysomosJsonSerDeTest.java | 18 +
.../com/sysomos/test/SysomosXmlSerDeTest.java | 18 +
.../streams-provider-twitter/pom.xml | 5 +-
.../FetchAndReplaceTwitterProcessor.java | 173 +
.../processor/TwitterEventProcessor.java | 18 +
.../processor/TwitterProfileProcessor.java | 56 +-
.../twitter/processor/TwitterTypeConverter.java | 35 +-
.../twitter/provider/TwitterErrorHandler.java | 20 +-
.../provider/TwitterEventClassifier.java | 24 +-
.../provider/TwitterStreamConfigurator.java | 18 +
.../twitter/provider/TwitterStreamProvider.java | 23 +
.../provider/TwitterStreamProviderTask.java | 18 +
.../provider/TwitterTimelineProvider.java | 79 +-
.../provider/TwitterTimelineProviderTask.java | 18 +
.../TwitterUserInformationProvider.java | 12 +-
.../serializer/StreamsTwitterMapper.java | 30 +
.../TwitterJsonActivitySerializer.java | 68 +-
.../TwitterJsonDeleteActivitySerializer.java | 43 +-
.../TwitterJsonRetweetActivitySerializer.java | 108 +-
.../TwitterJsonTweetActivitySerializer.java | 108 +-
.../TwitterJsonUserActivitySerializer.java | 72 +
...erJsonUserstreameventActivitySerializer.java | 25 +-
.../serializer/util/TwitterActivityUtil.java | 335 ++
.../src/main/jsonschema/com/twitter/tweet.json | 21 +-
.../streams/twitter/test/SimpleTweetTest.java | 18 +
.../twitter/test/TweetActivitySerDeTest.java | 19 +-
.../streams/twitter/test/TweetSerDeTest.java | 18 +
.../test/TwitterEventClassifierTest.java | 27 +
.../twitter/test/TwitterStreamProviderTest.java | 18 +
.../org/apache/streams/core/DatumStatus.java | 18 +
.../streams/core/DatumStatusCountable.java | 18 +
.../apache/streams/core/DatumStatusCounter.java | 18 +
.../org/apache/streams/core/StreamBuilder.java | 18 +
.../org/apache/streams/core/StreamHandler.java | 18 +
.../org/apache/streams/core/StreamState.java | 18 +
.../apache/streams/core/StreamsOperation.java | 18 +
.../apache/streams/core/StreamsProvider.java | 38 +-
.../apache/streams/data/util/RFC3339Utils.java | 5 +
.../ActivityDeserializerException.java | 18 +
.../exceptions/ActivitySerializerException.java | 18 +
.../jackson/StreamsDateTimeDeserializer.java | 20 +-
.../jackson/StreamsDateTimeSerializer.java | 18 +
.../streams/jackson/StreamsJacksonMapper.java | 22 +-
.../streams/jackson/StreamsJacksonModule.java | 18 +
.../jackson/StreamsPeriodDeserializer.java | 18 +
.../jackson/StreamsPeriodSerializer.java | 20 +-
.../data/data/util/DateTimeSerDeTest.java | 18 +
.../local/builders/InvalidStreamException.java | 18 +
.../local/builders/LocalStreamBuilder.java | 58 +-
.../streams/local/builders/StreamComponent.java | 20 +-
.../streams/local/tasks/BaseStreamsTask.java | 18 +
.../tasks/LocalStreamProcessMonitorThread.java | 18 +
.../tasks/StatusCounterMonitorRunnable.java | 18 +
.../local/tasks/StatusCounterMonitorThread.java | 37 +-
.../streams/local/tasks/StreamsMergeTask.java | 18 +
.../local/tasks/StreamsPersistWriterTask.java | 18 +
.../local/tasks/StreamsProcessorTask.java | 53 +-
.../local/tasks/StreamsProviderTask.java | 72 +-
.../apache/streams/local/tasks/StreamsTask.java | 18 +
.../local/builders/LocalStreamBuilderTest.java | 70 +-
.../local/builders/ToyLocalBuilderExample.java | 18 +
.../streams/local/tasks/BasicTasksTest.java | 18 +
.../test/processors/DoNothingProcessor.java | 18 +
.../PassthroughDatumCounterProcessor.java | 18 +
.../local/test/processors/SlowProcessor.java | 50 +
.../test/providers/EmptyResultSetProvider.java | 5 +
.../test/providers/NumericMessageProvider.java | 86 +-
.../local/test/writer/DatumCounterWriter.java | 18 +
.../local/test/writer/DoNothingWriter.java | 18 +
.../local/test/writer/SystemOutWriter.java | 18 +
.../component/ExpectedDatumsPersistWriter.java | 18 +
.../test/component/FileReaderProvider.java | 73 +-
.../test/component/StreamsDatumConverter.java | 18 +
.../component/StringToDocumentConverter.java | 18 +
.../tests/TestComponentsLocalStream.java | 18 +
.../tests/TestExpectedDatumsPersitWriter.java | 18 +
.../component/tests/TestFileReaderProvider.java | 18 +
streams-runtimes/streams-runtime-pig/pom.xml | 4 +-
.../streams/pig/StreamsComponentFactory.java | 7 +-
.../streams/pig/StreamsProcessDatumExec.java | 9 +-
.../streams/pig/StreamsProcessDocumentExec.java | 15 +-
.../streams/pig/StreamsSerializerExec.java | 8 +-
.../streams/pig/test/AppendStringProcessor.java | 59 +
.../streams/pig/test/CopyThriceProcessor.java | 7 +-
.../streams/pig/test/DoNothingProcessor.java | 9 +-
.../pig/test/PigProcessDocumentTest.java | 27 +
.../resources/pigprocessdocumentappendtest.pig | 4 +
.../test/resources/pigprocessdocumenttest.pig | 4 +-
.../trident/StreamsPersistWriterState.java | 18 +
.../storm/trident/StreamsProcessorFunction.java | 18 +
.../storm/trident/StreamsProviderSpout.java | 20 +-
.../org/apache/streams/util/ComponentUtils.java | 18 +
.../java/org/apache/streams/util/DateUtil.java | 18 +
.../apache/streams/util/SerializationUtil.java | 18 +
251 files changed, 22420 insertions(+), 2799 deletions(-)
----------------------------------------------------------------------