Merge pull request #7 from apache/master Merge Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/af1f2943 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/af1f2943 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/af1f2943 Branch: refs/heads/STREAMS-46 Commit: af1f2943c765536ac0424b008d9a5f92984ca984 Parents: 3b98df8 c50ce91 Author: Robert Douglas <[email protected]> Authored: Tue Jul 8 13:35:46 2014 -0500 Committer: Robert Douglas <[email protected]> Committed: Tue Jul 8 13:35:46 2014 -0500 ---------------------------------------------------------------------- .../streams-persist-elasticsearch/README.md | 38 +++ .../ElasticsearchConfigurator.java | 14 + .../elasticsearch/ElasticsearchQuery.java | 34 ++- .../ElasticsearchReaderConfiguration.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 - .../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 | 3 +- 15 files changed, 490 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
