Merge branch 'APEXCORE-107' of https://github.com/tushargosavi/incubator-apex-core
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/da46ec18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/da46ec18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/da46ec18 Branch: refs/heads/master Commit: da46ec18624f66afe782714df4a4159d46c18074 Parents: c77ea11 d4f3a50 Author: Thomas Weise <[email protected]> Authored: Wed May 4 22:42:53 2016 -0700 Committer: Thomas Weise <[email protected]> Committed: Wed May 4 22:42:53 2016 -0700 ---------------------------------------------------------------------- api/src/main/java/com/datatorrent/api/DAG.java | 20 +- .../main/java/com/datatorrent/api/Module.java | 3 +- .../main/java/com/datatorrent/api/Operator.java | 3 +- .../stram/codec/LogicalPlanSerializer.java | 2 +- .../stram/plan/logical/LogicalPlan.java | 198 +++++++------------ .../plan/logical/LogicalPlanConfiguration.java | 76 ++++--- .../stram/plan/logical/Operators.java | 3 +- .../stram/webapp/StramWebServices.java | 2 +- .../plan/logical/module/ModuleAppTest.java | 2 +- .../logical/module/TestModuleExpansion.java | 73 +++++-- .../src/test/resources/testModuleTopology.json | 141 +++++++++++++ .../resources/testModuleTopology.properties | 62 ++++++ 12 files changed, 386 insertions(+), 199 deletions(-) ----------------------------------------------------------------------
