Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/22662cc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/22662cc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/22662cc1 Branch: refs/heads/master Commit: 22662cc1fb5a5e36379f96581cf7d98c01daf4db Parents: 9d088ef 48e5c0c Author: Imesh Gunaratne <[email protected]> Authored: Sun Apr 13 21:06:52 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Apr 13 21:06:52 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 17 +- .../health/AutoscalerHealthStatReceiver.java | 11 +- .../topology/AutoscalerTopologyReceiver.java | 57 +- .../stratos/cli/RestCommandLineService.java | 2 +- .../impl/CloudControllerServiceImpl.java | 44 +- .../interfaces/CloudControllerService.java | 12 +- .../cloud/controller/pojo/ClusterContext.java | 18 +- .../controller/topology/TopologyBuilder.java | 17 + .../conf/LoadBalancerConfiguration.java | 1 + .../balancer/mediators/LocationReWriter.java | 80 ++ .../console/controllers/login.jag | 1 + .../console/controllers/loginSubmit.jag | 51 +- .../console/controllers/mycartridges.jag | 2 +- .../console/controllers/wizardSubmit.jag | 94 ++- .../console/themes/theme1/pages/index.hbs | 4 +- .../console/themes/theme1/pages/plain.hbs | 2 +- .../partials/configure_stratos_wizard.hbs | 76 +- .../console/themes/theme1/partials/header.hbs | 6 +- .../theme1/partials/subscribe_cartridge.hbs | 26 +- .../themes/theme1/partials/tenant_new.hbs | 2 +- .../console/themes/theme1/ui/css/main.css | 2 +- .../console/themes/theme1/ui/js/mycartridges.js | 2 +- .../themes/theme1/ui/js/tenant_management.js | 33 +- .../console/themes/theme1/ui/js/wizard.js | 37 +- .../console/util/utility.jag | 7 +- .../org.apache.stratos.manager.styles/pom.xml | 130 +++ .../src/main/resources/META-INF/product.xml | 27 + .../src/main/resources/web/favicon.ico | Bin 0 -> 17542 bytes .../src/main/resources/web/styles/css/main.css | 261 ++++++ .../resources/web/styles/images/def-body-bg.gif | Bin 0 -> 419 bytes .../web/styles/images/def-header-bg.gif | Bin 0 -> 17875 bytes .../web/styles/images/def-header-region-bg.gif | Bin 0 -> 22784 bytes .../main/resources/web/styles/images/logo.gif | Bin 0 -> 3476 bytes .../resources/web/styles/images/powered.gif | Bin 0 -> 1773 bytes .../resources/web/styles/images/right-logo.gif | Bin 0 -> 6102 bytes .../web/styles/images/t-right-logo.gif | Bin 0 -> 3629 bytes .../client/CloudControllerServiceClient.java | 6 +- .../stratos/manager/deploy/service/Service.java | 27 +- .../service/ServiceDeploymentManager.java | 10 + .../service/multitenant/MultiTenantService.java | 16 - .../multitenant/lb/MultiTenantLBService.java | 2 - .../category/DefaultLoadBalancerCategory.java | 6 +- .../lb/category/LoadBalancerCategory.java | 1 - .../ServiceLevelLoadBalancerCategory.java | 84 +- .../manager/CartridgeSubscriptionManager.java | 10 +- .../utils/ApplicationManagementUtil.java | 7 +- .../manager/utils/CartridgeConstants.java | 4 + .../broker/subscribe/TopicSubscriber.java | 15 +- .../rest/endpoint/services/ServiceUtils.java | 26 +- .../rest/endpoint/services/StratosAdmin.java | 9 +- components/pom.xml | 3 + features/manager/pom.xml | 1 + .../pom.xml | 81 ++ .../distribution/src/main/bin/stratos.sh | 2 +- .../synapse-configs/default/sequences/main.xml | 20 +- products/stratos/conf/registry.xml | 100 +++ .../carbon/scripts/server/server.js | 6 +- .../modules/distribution/src/assembly/bin.xml | 13 +- .../distribution/src/assembly/filter.properties | 8 +- .../distribution/src/main/license/LICENSE | 802 ++++++++++++------- .../modules/distribution/src/main/notice/NOTICE | 460 ++++++++++- products/stratos/modules/p2-profile-gen/pom.xml | 9 + .../main/resources/CloudControllerService.wsdl | 279 +++---- tools/puppet3-agent/centos/init.sh | 143 ++++ tools/puppet3/manifests/nodes.pp | 2 +- .../modules/java/templates/java_home.sh.erb | 1 + .../lb/templates/conf/loadbalancer.conf.erb | 3 + tools/puppet3/modules/tomcat/manifests/init.pp | 4 +- tools/stratos-installer/demo.sh | 93 +-- tools/stratos-installer/setup.sh | 56 +- tools/stratos-installer/start-servers.sh | 12 +- 71 files changed, 2449 insertions(+), 894 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/22662cc1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java ----------------------------------------------------------------------
