You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/06/23 20:22:49 UTC
[45/45] git commit: Merge PR#36 from rbnks 'rbnks/STREAMS-105'
Merge PR#36 from rbnks 'rbnks/STREAMS-105'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c7cbecdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c7cbecdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c7cbecdc
Branch: refs/heads/master
Commit: c7cbecdcd3e7fd5cf754d7ba3720a377e4e10a42
Parents: bce1657 7d9ee34
Author: mfranklin <mf...@apache.org>
Authored: Mon Jun 23 14:04:49 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon Jun 23 14:04:49 2014 -0400
----------------------------------------------------------------------
.../provider/DatasiftStreamConfigurator.java | 2 +-
.../provider/DatasiftStreamProvider.java | 2 +-
.../DatasiftTypeConverterProcessor.java | 75 +-
.../serializer/DatasiftActivitySerializer.java | 209 +-
.../DatasiftDefaultActivitySerializer.java | 211 +
.../DatasiftTweetActivitySerializer.java | 234 +
.../main/jsonschema/com/datasift/Datasift.json | 44 +-
.../com/datasift/test/DatasiftSerDeTest.java | 19 +-
.../DatasiftTypeConverterProcessorTest.java | 2 +-
.../DatasiftActivitySerializerTest.java | 74 +
.../src/test/resources/amazon_datasift_json.txt | 10 +
.../src/test/resources/blog_datasift_json.txt | 719 +++
.../src/test/resources/board_datasift_json.txt | 4160 ++++++++++++++++++
.../test/resources/facebook_datasift_json.txt | 1843 ++++++++
.../src/test/resources/part-r-00000.json | 1724 ++++----
.../resources/rand_sample_datasift_json.txt | 1547 +++++++
.../resources/random_sample_datasift_json.txt | 1547 +++++++
.../src/test/resources/reddit_datasift_json.txt | 33 +
.../test/resources/twitter_datasift_json.txt | 1000 +++++
.../test/resources/wikipedia_datasift_json.txt | 252 ++
.../test/resources/youtube_datasift_json.txt | 7 +
.../apache/streams/data/util/RFC3339Utils.java | 5 +
.../jackson/StreamsDateTimeDeserializer.java | 2 +-
23 files changed, 12660 insertions(+), 1061 deletions(-)
----------------------------------------------------------------------