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/d14a01a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d14a01a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d14a01a7 Branch: refs/heads/master Commit: d14a01a74b40a9ae2611612eb22e06c0d8d695a6 Parents: 549143d 3283500 Author: Melan Nimesh <[email protected]> Authored: Sat Feb 8 11:23:44 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Sat Feb 8 11:23:44 2014 +0530 ---------------------------------------------------------------------- .../controller/deployers/CartridgeDeployer.java | 213 ------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 121 +++++------ .../controller/iaases/OpenstackNovaIaas.java | 114 +++++----- .../cloud/controller/iaases/VCloudIaas.java | 53 ++--- .../impl/CloudControllerServiceImpl.java | 54 ++--- .../cloud/controller/interfaces/Iaas.java | 51 +++-- .../cloud/controller/pojo/IaasProvider.java | 5 +- .../controller/util/CloudControllerUtil.java | 30 +++ .../validate/AWSEC2PartitionValidator.java | 11 +- .../OpenstackNovaPartitionValidator.java | 10 +- .../LoadBalancerStatisticsNotifier.java | 4 +- .../console/controllers/checkAvailability.jag | 11 + .../console/controllers/manageTenants.jag | 36 +++- .../partials/configure_stratos_wizard.hbs | 205 ++++++++++++++++-- .../console/themes/theme1/partials/header.hbs | 5 + .../theme1/partials/tenant_management.hbs | 2 +- .../themes/theme1/partials/tenant_new.hbs | 8 +- .../console/themes/theme1/ui/css/main.css | 50 +++-- .../themes/theme1/ui/js/tenant_management.js | 40 +++- .../console/util/utility.jag | 7 + .../model/TopologyClusterInformationModel.java | 56 ++++- .../StratosManagerTopologyReceiver.java | 6 +- .../org.apache.stratos.rest.endpoint/pom.xml | 7 + .../rest/endpoint/services/StratosAdmin.java | 10 + .../pom.xml | 4 +- pom.xml | 2 +- products/stratos-manager/conf/log4j.properties | 1 + tools/stratos-installer/README.txt | 41 +++- 28 files changed, 665 insertions(+), 492 deletions(-) ----------------------------------------------------------------------
