Merge branch 'master' into datumcountable
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d3053713 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d3053713 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d3053713 Branch: refs/heads/master Commit: d305371364b2340f26a66618aa614ca6f3ce6ee4 Parents: 393c2e7 6ecf46d Author: Ryan Ebanks <[email protected]> Authored: Mon Oct 20 12:53:31 2014 -0500 Committer: Ryan Ebanks <[email protected]> Committed: Mon Oct 20 12:53:31 2014 -0500 ---------------------------------------------------------------------- .../local/builders/LocalStreamBuilder.java | 58 +-- .../streams/local/builders/StreamComponent.java | 21 +- .../streams/local/tasks/BaseStreamsTask.java | 52 ++- .../streams/local/tasks/StreamsMergeTask.java | 9 +- .../local/tasks/StreamsPersistWriterTask.java | 43 +- .../local/tasks/StreamsProcessorTask.java | 52 ++- .../local/tasks/StreamsProviderTask.java | 8 +- .../apache/streams/local/tasks/StreamsTask.java | 14 +- .../local/builders/LocalStreamBuilderTest.java | 399 ++++++++++++------- .../local/builders/ToyLocalBuilderExample.java | 5 +- .../streams/local/tasks/BasicTasksTest.java | 52 +-- .../local/tasks/StreamsProviderTaskTest.java | 7 +- .../PassthroughDatumCounterProcessor.java | 51 ++- .../test/providers/NumericMessageProvider.java | 29 +- .../local/test/writer/DatumCounterWriter.java | 61 ++- 15 files changed, 569 insertions(+), 292 deletions(-) ----------------------------------------------------------------------
