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/08/08 22:10:29 UTC
[14/14] git commit: Merge branch 'STREAMS-138' of
https://git-wip-us.apache.org/repos/asf/incubator-streams
Merge branch 'STREAMS-138' of https://git-wip-us.apache.org/repos/asf/incubator-streams
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d309a598
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d309a598
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d309a598
Branch: refs/heads/master
Commit: d309a5987d1f0d1c38142ec366835d58edfa8221
Parents: 41a80ed 5dec4aa
Author: sblackmon <sb...@w2odigital.com>
Authored: Fri Aug 8 15:07:08 2014 -0500
Committer: sblackmon <sb...@w2odigital.com>
Committed: Fri Aug 8 15:07:08 2014 -0500
----------------------------------------------------------------------
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 ++++-
.../local/tasks/StreamsProviderTask.java | 3 +-
16 files changed, 357 insertions(+), 45 deletions(-)
----------------------------------------------------------------------