Merge branch 'Trident-RAS-v2' of https://github.com/knusbaum/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fb880cae Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fb880cae Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fb880cae Branch: refs/heads/master Commit: fb880cae02415889708bb38138795a886164db2f Parents: 50701df 251bc56 Author: Kyle Nusbaum <[email protected]> Authored: Thu Mar 17 15:03:07 2016 -0500 Committer: Kyle Nusbaum <[email protected]> Committed: Thu Mar 17 15:03:07 2016 -0500 ---------------------------------------------------------------------- .../clj/org/apache/storm/trident/testing.clj | 12 +- .../ComponentConfigurationDeclarer.java | 5 +- .../apache/storm/topology/ResourceDeclarer.java | 28 +++++ .../jvm/org/apache/storm/trident/Stream.java | 31 +++++- .../org/apache/storm/trident/TridentState.java | 27 ++++- .../apache/storm/trident/TridentTopology.java | 91 ++++++++++++++- .../org/apache/storm/trident/graph/Group.java | 22 +++- .../operation/DefaultResourceDeclarer.java | 66 +++++++++++ .../trident/operation/ITridentResource.java | 32 ++++++ .../org/apache/storm/trident/planner/Node.java | 5 +- .../apache/storm/trident/integration_test.clj | 110 ++++++++++++++++--- 11 files changed, 390 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb880cae/storm-core/src/clj/org/apache/storm/trident/testing.clj ----------------------------------------------------------------------
