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/05/13 17:23:04 UTC
[14/14] git commit: Merge commit
'237f2a6ab13c68a61cf715004fe7b85db66237f6'
Merge commit '237f2a6ab13c68a61cf715004fe7b85db66237f6'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e6830093
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e6830093
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e6830093
Branch: refs/heads/master
Commit: e68300936e100409ba4b518499eee66634d96245
Parents: c38eef6 237f2a6
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Tue May 13 10:21:52 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Tue May 13 10:21:52 2014 -0500
----------------------------------------------------------------------
.../streams-persist-elasticsearch/pom.xml | 1 -
.../ElasticsearchConfigurator.java | 11 +-
.../ElasticsearchPersistWriter.java | 297 +++++++++++--------
.../ElasticsearchWriterConfiguration.json | 15 +-
.../provider/SysomosHeartbeatStream.java | 45 +--
.../streams-provider-twitter/pom.xml | 13 +
.../twitter/processor/TwitterTypeConverter.java | 2 +-
.../provider/TwitterEventClassifier.java | 10 +-
.../twitter/provider/TwitterStreamProvider.java | 69 +++--
.../provider/TwitterTimelineProvider.java | 56 ++--
.../TwitterJsonActivitySerializer.java | 3 +-
.../TwitterJsonDeleteActivitySerializer.java | 3 +-
.../TwitterJsonRetweetActivitySerializer.java | 3 +-
.../TwitterJsonTweetActivitySerializer.java | 7 +-
...erJsonUserstreameventActivitySerializer.java | 92 ++++++
.../main/jsonschema/com/twitter/FriendList.json | 20 ++
.../jsonschema/com/twitter/UserstreamEvent.json | 47 +++
.../jackson/StreamsDateTimeDeserializer.java | 3 +-
.../jackson/StreamsDateTimeSerializer.java | 5 +-
.../jackson/StreamsPeriodDeserializer.java | 3 +-
.../jackson/StreamsPeriodSerializer.java | 3 +-
.../local/builders/LocalStreamBuilder.java | 161 ++++++----
.../local/tasks/StreamsPersistWriterTask.java | 6 +-
.../local/tasks/StreamsProcessorTask.java | 2 +-
.../local/tasks/StreamsProviderTask.java | 5 +-
25 files changed, 609 insertions(+), 273 deletions(-)
----------------------------------------------------------------------