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/07/16 04:02:05 UTC
[13/18] git commit: Merge branch 'master' into STREAMS-105
Merge branch 'master' into STREAMS-105
Conflicts:
streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.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/fbb8ccff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/fbb8ccff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/fbb8ccff
Branch: refs/heads/STREAMS-134
Commit: fbb8ccffc0db8de0f2d591d1e6a3251b6ff96053
Parents: abaf5b0 5c9a531
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Thu Jul 10 10:24:27 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Thu Jul 10 10:24:27 2014 -0500
----------------------------------------------------------------------
.../streams-persist-elasticsearch/README.md | 38 +
.../ElasticsearchConfigurator.java | 18 +
.../ElasticsearchPersistReader.java | 3 +-
.../ElasticsearchPersistUpdater.java | 35 -
.../ElasticsearchPersistWriter.java | 705 +++++++------------
.../ElasticsearchPersistWriterTask.java | 56 --
.../elasticsearch/ElasticsearchQuery.java | 34 +-
.../ElasticsearchReaderConfiguration.json | 5 +
.../ElasticsearchWriterConfiguration.json | 5 +
.../src/main/resources/reference.json | 9 +
streams-contrib/streams-persist-mongo/README.md | 16 +
.../streams/mongo/MongoPersistReader.java | 270 +++++++
.../src/main/resources/reference.json | 8 +
.../src/main/resources/reference.properties | 10 -
.../DatasiftTypeConverterProcessor.java | 12 +-
.../DatasiftTweetActivitySerializer.java | 180 ++---
.../provider/SysomosHeartbeatStream.java | 12 +-
.../sysomos/provider/SysomosProvider.java | 4 +-
.../twitter/processor/TwitterTypeConverter.java | 2 +-
.../TwitterJsonActivitySerializer.java | 3 +
.../TwitterJsonUserActivitySerializer.java | 72 ++
.../serializer/util/TwitterActivityUtil.java | 22 +
.../streams/local/builders/StreamComponent.java | 2 +-
.../local/tasks/StreamsProviderTask.java | 54 +-
.../local/builders/LocalStreamBuilderTest.java | 52 +-
.../local/test/processors/SlowProcessor.java | 50 ++
.../test/providers/EmptyResultSetProvider.java | 2 +-
.../test/providers/NumericMessageProvider.java | 63 +-
.../test/component/FileReaderProvider.java | 52 +-
29 files changed, 1024 insertions(+), 770 deletions(-)
----------------------------------------------------------------------