streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject [6/8] git commit: Merge branch 'master' into STREAMS-93
Date Tue, 27 May 2014 16:37:32 GMT
Merge branch 'master' into STREAMS-93

Conflicts:
	streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivitySerializer.java
	streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
	streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java


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

Branch: refs/heads/master
Commit: 44167ec72c4b9024dc26f29a89f83849f6d6384b
Parents: 36099b6 4580d53
Author: Robert Douglas <rdouglas@w2odigital.com>
Authored: Tue May 27 10:29:16 2014 -0500
Committer: Robert Douglas <rdouglas@w2odigital.com>
Committed: Tue May 27 10:29:16 2014 -0500

----------------------------------------------------------------------
 .../ElasticsearchPersistWriter.java             |  45 +++-
 .../apache/streams/json/JsonPathExtractor.java  |  13 +-
 .../json/test/JsonPathExtractorTwitterTest.java |  92 +++++++
 .../src/test/resources/tweet.json               |   1 +
 .../provider/SysomosHeartbeatStream.java        |  36 ++-
 .../sysomos/provider/SysomosProvider.java       |  83 +++++-
 .../FetchAndReplaceTwitterProcessor.java        | 173 +++++++++++++
 .../provider/TwitterTimelineProvider.java       |  53 +++-
 .../serializer/StreamsTwitterMapper.java        |  12 +
 .../TwitterJsonDeleteActivitySerializer.java    |  25 +-
 ...erJsonUserstreameventActivitySerializer.java |   7 +-
 .../serializer/util/TwitterActivityUtil.java    | 255 +++++++++++++++++++
 .../twitter/test/TweetActivitySerDeTest.java    |   1 -
 streams-runtimes/streams-runtime-pig/pom.xml    |   4 +-
 .../streams/pig/StreamsComponentFactory.java    |   7 +-
 .../streams/pig/StreamsProcessDatumExec.java    |   9 +-
 .../streams/pig/StreamsProcessDocumentExec.java |  15 +-
 .../streams/pig/StreamsSerializerExec.java      |   8 +-
 .../streams/pig/test/AppendStringProcessor.java |  59 +++++
 .../streams/pig/test/CopyThriceProcessor.java   |   7 +-
 .../streams/pig/test/DoNothingProcessor.java    |   9 +-
 .../pig/test/PigProcessDocumentTest.java        |  27 ++
 .../resources/pigprocessdocumentappendtest.pig  |   4 +
 .../test/resources/pigprocessdocumenttest.pig   |   4 +-
 24 files changed, 852 insertions(+), 97 deletions(-)
----------------------------------------------------------------------



Mime
View raw message