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/0520d06a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0520d06a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0520d06a Branch: refs/heads/master Commit: 0520d06affa3c3323ec29ddef668c5c877d3d2ad Parents: 5d5c322 92b4b1e Author: Nirmal Fernando <[email protected]> Authored: Fri Feb 7 15:23:59 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Fri Feb 7 15:23:59 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 28 +-- .../LoadBalancerStatisticsNotifier.java | 4 +- .../console/cartridge_deployments.jag | 18 -- .../console/config/console.json | 2 +- .../console/controllers/loginSubmit.jag | 38 ++-- .../console/controllers/manageTenants.jag | 43 ++++ .../console/login.jag | 7 +- .../console/mt_service_deployments.jag | 9 - .../console/partition_deployments.jag | 14 -- .../console/policy_deployments.jag | 16 -- .../theme1/partials/cartridge_deployments.hbs | 85 ------- .../console/themes/theme1/partials/header.hbs | 5 + .../console/themes/theme1/partials/login.hbs | 12 +- .../theme1/partials/mt_service_deployments.hbs | 89 -------- .../theme1/partials/partition_deployments.hbs | 132 ----------- .../theme1/partials/policy_deployments.hbs | 131 ----------- .../theme1/partials/tenant_management.hbs | 12 +- .../themes/theme1/partials/tenant_new.hbs | 4 +- .../console/themes/theme1/renderers/login.js | 11 +- .../console/themes/theme1/ui/css/main.css | 9 +- .../console/themes/theme1/ui/js/login.js | 68 ++++++ .../themes/theme1/ui/js/tenant_management.js | 32 ++- .../console/util/utility.jag | 12 + .../manager/CartridgeSubscriptionManager.java | 33 +-- .../model/TopologyClusterInformationModel.java | 221 +++++++------------ .../bean/util/converter/PojoConverter.java | 13 +- .../rest/endpoint/services/ServiceUtils.java | 8 +- .../rest/endpoint/services/StratosAdmin.java | 2 +- products/stratos-manager/conf/log4j.properties | 1 + .../puppet/etc/puppet/files/cartridge-agent.sh | 2 +- .../puppet/etc/puppet/files/event-publisher.sh | 28 --- .../puppet/etc/puppet/files/event-subscriber.sh | 28 --- .../puppet/etc/puppet/files/health-publisher.sh | 33 --- tools/puppet/etc/puppet/files/healthcheck.sh | 31 --- tools/stratos-installer/README.txt | 41 +++- tools/stratos-installer/conf/setup.conf | 2 +- 36 files changed, 370 insertions(+), 854 deletions(-) ----------------------------------------------------------------------
