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/12 00:53:15 UTC

[15/15] git commit: Merge branch 'STREAMS-46'

Merge branch 'STREAMS-46'


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d475b913
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d475b913
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d475b913

Branch: refs/heads/master
Commit: d475b913d19587f3edc9dda5780b3846a9faf5f9
Parents: d309a59 dc432af
Author: sblackmon <sb...@apache.org>
Authored: Mon Aug 11 17:48:21 2014 -0500
Committer: sblackmon <sb...@apache.org>
Committed: Mon Aug 11 17:48:21 2014 -0500

----------------------------------------------------------------------
 .../streams-provider-facebook/pom.xml           |  22 +-
 .../api/FacebookPostActivitySerializer.java     | 334 -------------------
 ...FacebookPublicFeedXmlActivitySerializer.java |  29 --
 .../api/FacebookPostActivitySerializer.java     | 286 ++++++++++++++++
 ...FacebookPublicFeedXmlActivitySerializer.java |  29 ++
 .../processor/FacebookTypeConverter.java        | 194 +++++++++++
 .../provider/FacebookFriendFeedProvider.java    | 282 ++++++++++++++++
 .../provider/FacebookFriendUpdatesProvider.java | 286 ++++++++++++++++
 .../FacebookUserInformationProvider.java        | 299 +++++++++++++++++
 .../provider/FacebookUserstreamProvider.java    | 320 ++++++++++++++++++
 .../jsonschema/com/facebook/graph/Post.json     | 192 -----------
 .../streams/facebook/FacebookConfiguration.json |  49 +++
 .../FacebookUserInformationConfiguration.json   |  23 ++
 .../FacebookUserstreamConfiguration.json        |  22 ++
 .../org/apache/streams/facebook/graph/Post.json | 203 +++++++++++
 .../test/FacebookActivitySerDeTest.java         |  78 +++++
 .../FacebookPostActivitySerializerTest.java     | 215 ------------
 .../facebook/test/FacebookPostSerDeTest.java    |   6 +-
 .../src/test/resources/Facebook.json            | 250 ++++++++++++++
 .../org/apache/streams/data/Facebook.json       | 251 --------------
 .../gnip-edc-facebook/pom.xml                   |   2 +-
 .../src/test/resources/FlickrEDC.xml            | 128 +++----
 .../src/test/resources/RedditEDC.xml            | 200 +++++------
 .../src/test/resources/RedditEDCFlattened.xml   | 200 +++++------
 .../src/test/resources/redditTest.xml           |   2 +-
 25 files changed, 2611 insertions(+), 1291 deletions(-)
----------------------------------------------------------------------