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/8906c14a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8906c14a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8906c14a Branch: refs/heads/docker-grouping-merge Commit: 8906c14acddcda0560de86256c018943d7ce030f Parents: 5b9f420 a619185 Author: R-Rajkumar <[email protected]> Authored: Sat Nov 8 21:44:13 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Sat Nov 8 21:44:13 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 57 ++++++++++++-- .../apache/stratos/cli/StratosApplication.java | 12 +-- .../grouping/applications/Application.java | 70 +++++++++++++++++ .../grouping/applications/ApplicationBean.java | 10 +-- .../grouping/applications/Applications.java | 70 ----------------- .../beans/grouping/applications/Cluster.java | 81 +++++++++++++++++++ .../beans/grouping/applications/Clusters.java | 81 ------------------- .../cli/beans/grouping/applications/Group.java | 82 ++++++++++++++++++++ .../cli/beans/grouping/applications/Groups.java | 82 -------------------- .../beans/grouping/applications/SubGroup.java | 70 +++++++++++++++++ .../beans/grouping/applications/SubGroups.java | 70 ----------------- .../cli/commands/ListApplicationsCommand.java | 65 ++++++++++++++++ .../cli/commands/ListDeployServiceCommand.java | 65 ---------------- .../cli/commands/ListServicesCommand.java | 65 ++++++++++++++++ .../src/test/python/test_interactive.py | 18 ++--- 15 files changed, 505 insertions(+), 393 deletions(-) ----------------------------------------------------------------------
