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/8bf60e1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8bf60e1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8bf60e1a Branch: refs/heads/master Commit: 8bf60e1ace706bba5badd7107eea0a844c957382 Parents: e38de55 8557675 Author: Pradeep Fernando <[email protected]> Authored: Mon Apr 7 13:55:22 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Mon Apr 7 13:55:22 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 14 - .../topology/AutoscalerTopologyReceiver.java | 57 +- .../stratos/autoscaler/TestRulesPackaged.java | 8 +- .../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 + .../console/controllers/mycartridges.jag | 2 +- .../theme1/partials/subscribe_cartridge.hbs | 2 +- .../console/themes/theme1/ui/js/mycartridges.js | 2 +- .../console/util/utility.jag | 4 +- .../client/CloudControllerServiceClient.java | 6 +- .../category/DefaultLoadBalancerCategory.java | 2 +- .../utils/ApplicationManagementUtil.java | 7 +- .../rest/endpoint/services/ServiceUtils.java | 5 - .../rest/endpoint/services/StratosAdmin.java | 9 +- .../synapse-configs/default/sequences/main.xml | 8 +- .../distribution/src/assembly/filter.properties | 8 +- .../main/resources/CloudControllerService.wsdl | 881 +++++++++---------- tools/puppet3/manifests/nodes.pp | 2 +- tools/puppet3/modules/tomcat/manifests/init.pp | 4 +- tools/stratos-installer/demo.sh | 93 +- tools/stratos-installer/setup.sh | 36 +- 25 files changed, 557 insertions(+), 687 deletions(-) ----------------------------------------------------------------------
