Merge branch 'docker-grouping-merge' of https://git-wip-us.apache.org/repos/asf/stratos into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/376a624d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/376a624d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/376a624d Branch: refs/heads/master Commit: 376a624d2dafac93386599705821e66b5c92392b Parents: fd916b4 34a3a8f Author: R-Rajkumar <[email protected]> Authored: Sat Nov 8 19:15:32 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Sat Nov 8 19:15:32 2014 +0530 ---------------------------------------------------------------------- .../algorithm/AutoscaleAlgorithm.java | 2 +- .../dependency/DependencyBuilder.java | 10 +- .../applications/dependency/DependencyTree.java | 51 ++------ .../context/ApplicationContextFactory.java | 18 +-- .../stratos/cli/RestCommandLineService.java | 36 ++++- .../apache/stratos/cli/StratosApplication.java | 3 + .../grouping/applications/ApplicationBean.java | 34 +++++ .../grouping/applications/Applications.java | 70 ++++++++++ .../beans/grouping/applications/Clusters.java | 81 ++++++++++++ .../cli/beans/grouping/applications/Groups.java | 82 ++++++++++++ .../cli/beans/grouping/applications/Member.java | 130 +++++++++++++++++++ .../beans/grouping/applications/Property.java | 46 +++++++ .../beans/grouping/applications/SubGroups.java | 70 ++++++++++ .../definitions/DependencyDefinitions.java | 50 ------- .../definitions/ServiceGroupDefinition.java | 66 ---------- .../grouping/definitions/ServiceGroupList.java | 41 ------ .../definitions/StartupOrderDefinition.java | 43 ------ .../grouping/serviceGroups/Dependencies.java | 46 +++++++ .../serviceGroups/ServiceGroupDefinition.java | 70 ++++++++++ .../serviceGroups/ServiceGroupList.java | 33 +++++ .../commands/DescribeApplicationCommand.java | 67 ++++++++++ 21 files changed, 789 insertions(+), 260 deletions(-) ----------------------------------------------------------------------
