Merge branch '0.4-moreover' # Conflicts: # streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverConfigurator.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/67d5cca5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/67d5cca5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/67d5cca5 Branch: refs/heads/master Commit: 67d5cca51ee250b5dea0012cd9576157b19e57ec Parents: 9861124 015f0ae Author: Steve Blackmon @steveblackmon <[email protected]> Authored: Sat Oct 22 14:44:38 2016 -0500 Committer: Steve Blackmon @steveblackmon <[email protected]> Committed: Sat Oct 22 14:44:38 2016 -0500 ---------------------------------------------------------------------- .../data/MoreoverJsonActivitySerializer.java | 97 --------- .../data/MoreoverXmlActivitySerializer.java | 105 ---------- .../streams/data/moreover/MoreoverClient.java | 110 ---------- .../streams/data/moreover/MoreoverProvider.java | 114 ----------- .../data/moreover/MoreoverProviderTask.java | 94 --------- .../streams/data/moreover/MoreoverResult.java | 204 ------------------- .../data/moreover/MoreoverResultSetWrapper.java | 34 ---- .../apache/streams/data/util/MoreoverUtils.java | 155 -------------- .../apache/streams/moreover/MoreoverClient.java | 110 ++++++++++ .../MoreoverJsonActivitySerializer.java | 98 +++++++++ .../streams/moreover/MoreoverProvider.java | 177 ++++++++++++++++ .../streams/moreover/MoreoverProviderTask.java | 91 +++++++++ .../apache/streams/moreover/MoreoverResult.java | 200 ++++++++++++++++++ .../moreover/MoreoverResultSetWrapper.java | 32 +++ .../apache/streams/moreover/MoreoverUtils.java | 155 ++++++++++++++ .../moreover/MoreoverXmlActivitySerializer.java | 106 ++++++++++ .../src/main/resources/moreover.conf | 25 --- .../data/MoreoverJsonActivitySerializerIT.java | 79 ------- .../data/MoreoverXmlActivitySerializerIT.java | 65 ------ .../streams/data/util/MoreoverTestUtil.java | 43 ---- .../streams/moreover/MoreoverTestUtil.java | 43 ++++ .../test/MoreoverJsonActivitySerializerIT.java | 76 +++++++ .../test/MoreoverXmlActivitySerializerIT.java | 66 ++++++ .../test/provider/MoreoverProviderIT.java | 67 ++++++ .../src/test/resources/moreover.conf | 25 +++ 25 files changed, 1246 insertions(+), 1125 deletions(-) ----------------------------------------------------------------------
