Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/eddc0b5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/eddc0b5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/eddc0b5c Branch: refs/heads/master Commit: eddc0b5cffc7f5557edff30783431c5f0469d1cd Parents: 11cf2c4 fdc9924 Author: Melan Nimesh <[email protected]> Authored: Thu Jan 30 10:17:03 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Thu Jan 30 10:17:03 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 39 +++-- .../stratos/cli/beans/topology/Cluster.java | 155 ++++--------------- .../stratos/cli/beans/topology/Member.java | 108 ++++--------- .../autoscaler/partition/PartitionGroup.java | 2 +- .../rest/endpoint/bean/topology/Cluster.java | 20 +++ .../rest/endpoint/bean/topology/Member.java | 17 ++ .../bean/util/converter/PojoConverter.java | 51 ++++-- .../stratos/rest/endpoint/mock/MockContext.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 36 +++-- .../rest/endpoint/services/StratosAdmin.java | 20 +-- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 8 +- 11 files changed, 212 insertions(+), 246 deletions(-) ----------------------------------------------------------------------
