Merge pull request #17 from apache/master Merge Apache Master 2014/12/04
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/f31b82fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/f31b82fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/f31b82fb Branch: refs/heads/master Commit: f31b82fb20198f192945b20e303bdbc8be5e1326 Parents: 5f3343b 7ba66e0 Author: Ryan Ebanks <[email protected]> Authored: Thu Dec 4 13:09:01 2014 -0600 Committer: Ryan Ebanks <[email protected]> Committed: Thu Dec 4 13:09:01 2014 -0600 ---------------------------------------------------------------------- .gitignore | 6 + pom.xml | 12 ++ .../http/processor/SimpleHTTPGetProcessor.java | 2 +- streams-contrib/pom.xml | 5 + .../streams-persist-elasticsearch/pom.xml | 5 + .../processor/PercolateTagProcessor.java | 3 +- .../peoplepattern/AccountTypeProcessor.java | 2 +- .../peoplepattern/DemographicsProcessor.java | 2 +- streams-contrib/streams-processor-regex/pom.xml | 6 +- .../regex/AbstractRegexExtensionExtractor.java | 11 +- .../regex/RegexHashtagExtractorTest.java | 4 +- .../regex/RegexMentionExtractorTest.java | 4 +- .../streams/regex/RegexUrlExtractorTest.java | 1 + .../DatasiftInstagramActivitySerializer.java | 3 +- .../DatasiftInteractionActivitySerializer.java | 5 +- .../DatasiftTwitterActivitySerializer.java | 5 +- .../streams-provider-facebook/pom.xml | 5 + .../serializer/FacebookActivityUtil.java | 3 +- .../gnip-edc-googleplus/pom.xml | 6 + .../com/gplus/api/GPlusActivitySerializer.java | 4 +- .../gnip-edc-reddit/pom.xml | 6 + .../reddit/api/RedditActivitySerializer.java | 4 +- .../google-gmail/pom.xml | 4 + .../GMailMessageActivitySerializer.java | 15 +- .../google-gplus/pom.xml | 4 + .../serializer/util/GooglePlusActivityUtil.java | 3 +- .../streams-provider-instagram/pom.xml | 4 + .../serializer/util/InstagramActivityUtil.java | 5 +- .../streams-provider-moreover/pom.xml | 4 + .../apache/streams/data/util/MoreoverUtils.java | 5 +- streams-contrib/streams-provider-rss/pom.xml | 4 + .../serializer/SyndEntryActivitySerializer.java | 2 - .../streams-provider-sysomos/pom.xml | 4 + .../SysomosBeatActivityConverter.java | 3 +- .../streams-provider-twitter/README.markdown | 48 ------ .../streams-provider-twitter/README.md | 38 +++++ .../processor/TwitterEventProcessor.java | 5 +- .../twitter/processor/TwitterTypeConverter.java | 5 +- .../twitter/provider/TwitterConfigurator.java | 5 +- .../provider/TwitterEventClassifier.java | 2 +- .../twitter/provider/TwitterStreamProvider.java | 3 +- .../serializer/StreamsTwitterMapper.java | 4 +- .../serializer/util/TwitterActivityUtil.java | 9 +- .../test/TwitterEventClassifierTest.java | 2 +- .../twitter/test/TwitterStreamProviderTest.java | 2 +- .../persist/impl/SLF4JMessagePersister.java | 25 +++ .../tasks/BroadcastMonitorThread.java | 18 ++- .../apache/streams/data/util/ExtensionUtil.java | 108 ------------- .../streams/pojo/extensions/ExtensionUtil.java | 154 +++++++++++++++++++ .../apache/streams/data/util/ActivityUtil.java | 3 + streams-web/pom.xml | 14 +- 51 files changed, 385 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
