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/10/01 17:51:30 UTC
[04/50] [abbrv] git commit: Auto-merge | Integrating changes from
apache/master
Auto-merge | Integrating changes from apache/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/a4bc097d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/a4bc097d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/a4bc097d
Branch: refs/heads/REDBULL-1604
Commit: a4bc097d516dbecbb34f9dc2a259a0efaa3cc563
Parents: db2987a d309a59
Author: W2O Deployer <ds...@w2odigital.com>
Authored: Fri Aug 8 16:11:42 2014 -0400
Committer: W2O Deployer <ds...@w2odigital.com>
Committed: Fri Aug 8 16:11:42 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../streams-provider-datasift/pom.xml | 2 +-
.../datasift/provider/DatasiftPushProvider.java | 133 +++++++++++++++++++
.../provider/DatasiftStreamConfigurator.java | 10 +-
.../provider/DatasiftStreamProvider.java | 12 +-
.../DatasiftTypeConverterProcessor.java | 7 +-
.../serializer/DatasiftActivitySerializer.java | 4 +-
.../DatasiftDefaultActivitySerializer.java | 21 +--
.../DatasiftTweetActivitySerializer.java | 14 +-
.../datasift/util/StreamsDatasiftMapper.java | 84 ++++++++++++
.../main/jsonschema/com/datasift/Datasift.json | 36 ++++-
.../com/datasift/DatasiftPushConfiguration.json | 17 +++
.../datasift/DatasiftStreamConfiguration.json | 17 +++
.../com/datasift/DatasiftTwitterUser.json | 9 +-
.../DatasiftActivitySerializerTest.java | 31 ++++-
.../serializer/StreamsTwitterMapper.java | 12 +-
.../local/tasks/StreamsProviderTask.java | 3 +-
17 files changed, 368 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a4bc097d/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a4bc097d/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------