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/07f80507 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/07f80507 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/07f80507 Branch: refs/heads/master Commit: 07f80507404b95f9d5eb5bb039882d6a01128d16 Parents: 6ff3924 6247adc Author: Pradeep Fernando <[email protected]> Authored: Thu Jan 9 21:14:59 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Thu Jan 9 21:14:59 2014 +0530 ---------------------------------------------------------------------- .../health/AutoscalerHealthStatReceiver.java | 10 +- .../topology/AutoscalerTopologyReceiver.java | 36 +- .../rule/AutoscalerRuleEvaluator.java | 52 +- .../stratos/autoscaler/TestRulesPackaged.java | 6 + .../stratos/cartridge/agent/CartridgeAgent.java | 14 +- .../config/CartridgeAgentConfiguration.java | 2 +- .../stratos/cli/RestCommandLineService.java | 2 +- .../cloud/controller/pojo/ClusterContext.java | 10 +- .../controller/registry/RegistryManager.java | 10 + .../topology/TopologyEventPublisher.java | 3 +- .../org.apache.stratos.manager.console/LICENSE | 191 - .../org.apache.stratos.manager.console/README | 1 - .../README.md | 33 - .../apis/README | 1 - .../org.apache.stratos.manager.console/app.js | 14 - .../cartridge_deployments.jag | 9 - .../cartridges.jag | 7 - .../config/console.js | 8 - .../config/console.json | 22 - .../configure_stratos.jag | 7 - .../console/LICENSE | 191 + .../console/README | 1 + .../console/README.md | 33 + .../console/apis/README | 1 + .../console/app.js | 14 + .../console/cartridge_deployments.jag | 9 + .../console/cartridges.jag | 7 + .../console/config/console.js | 8 + .../console/config/console.json | 22 + .../console/configure_stratos.jag | 7 + .../console/controllers/README | 1 + .../console/controllers/acs.jag | 93 + .../console/controllers/login.jag | 37 + .../console/controllers/logout.jag | 41 + .../console/controllers/payloadFactory.jag | 50 + .../console/controllers/profileClient.jag | 58 + .../console/data/cartridge_deployments.json | 10 + .../console/data/cartridges.json | 35 + .../console/data/config_status.json | 4 + .../console/data/lbs.json | 10 + .../console/data/mt_service_deployments.json | 10 + .../console/data/mycartridges.json | 35 + .../console/data/partition_deployments.json | 10 + .../console/data/policy_deployments.json | 10 + .../console/index.jag | 7 + .../console/jaggery.conf | 3 + .../console/js/dialog.js | 369 + .../console/js/main.js | 19 + .../console/lbs.jag | 9 + .../console/login.jag | 5 + .../console/modules/README | 1 + .../console/mt_service_deployments.jag | 9 + .../console/partition_deployments.jag | 9 + .../console/policy_deployments.jag | 9 + .../console/root-js | 369 + .../console/subscribe_cartridge.jag | 6 + .../console/themes/README | 1 + .../console/themes/theme1/pages/index.hbs | 78 + .../theme1/partials/cartridge_deployments.hbs | 90 + .../themes/theme1/partials/cartridges.hbs | 37 + .../theme1/partials/configure_stratos.hbs | 48 + .../console/themes/theme1/partials/header.hbs | 105 + .../console/themes/theme1/partials/lbs.hbs | 90 + .../console/themes/theme1/partials/login.hbs | 31 + .../theme1/partials/mt_service_deployments.hbs | 90 + .../themes/theme1/partials/mycartridges.hbs | 7 + .../theme1/partials/partition_deployments.hbs | 129 + .../theme1/partials/policy_deployments.hbs | 90 + .../theme1/partials/subscribe_cartridge.hbs | 125 + .../console/themes/theme1/partials/title.hbs | 1 + .../themes/theme1/renderers/account_recovery.js | 23 + .../theme1/renderers/cartridge_deployments.js | 47 + .../themes/theme1/renderers/cartridges.js | 72 + .../theme1/renderers/configure_stratos.js | 42 + .../console/themes/theme1/renderers/index.js | 68 + .../console/themes/theme1/renderers/lbs.js | 47 + .../console/themes/theme1/renderers/login.js | 22 + .../theme1/renderers/mt_service_deployments.js | 47 + .../theme1/renderers/partition_deployments.js | 47 + .../theme1/renderers/policy_deployments.js | 47 + .../theme1/renderers/subscribe_cartridge.js | 37 + .../console/themes/theme1/theme.js | 1 + .../console/themes/theme1/ui/404.html | 157 + .../ui/apple-touch-icon-114x114-precomposed.png | Bin 0 -> 1189 bytes .../ui/apple-touch-icon-144x144-precomposed.png | Bin 0 -> 1475 bytes .../ui/apple-touch-icon-57x57-precomposed.png | Bin 0 -> 730 bytes .../ui/apple-touch-icon-72x72-precomposed.png | Bin 0 -> 854 bytes .../theme1/ui/apple-touch-icon-precomposed.png | Bin 0 -> 730 bytes .../themes/theme1/ui/apple-touch-icon.png | Bin 0 -> 730 bytes .../console/themes/theme1/ui/crossdomain.xml | 15 + .../themes/theme1/ui/css/bootstrap-missing.css | 995 +++ .../themes/theme1/ui/css/bootstrap-theme.css | 404 ++ .../theme1/ui/css/bootstrap-theme.min.css | 1 + .../console/themes/theme1/ui/css/bootstrap.css | 6805 ++++++++++++++++++ .../themes/theme1/ui/css/bootstrap.min.css | 9 + .../console/themes/theme1/ui/css/dialog.css | 128 + .../console/themes/theme1/ui/css/main.css | 363 + .../images/222222_11x11_icon_close.gif | Bin 0 -> 62 bytes .../images/222222_11x11_icon_resize_se.gif | Bin 0 -> 61 bytes .../smoothness/images/222222_7x7_arrow_left.gif | Bin 0 -> 53 bytes .../images/222222_7x7_arrow_right.gif | Bin 0 -> 53 bytes .../images/454545_11x11_icon_close.gif | Bin 0 -> 62 bytes .../smoothness/images/454545_7x7_arrow_left.gif | Bin 0 -> 53 bytes .../images/454545_7x7_arrow_right.gif | Bin 0 -> 53 bytes .../images/888888_11x11_icon_close.gif | Bin 0 -> 62 bytes .../smoothness/images/888888_7x7_arrow_left.gif | Bin 0 -> 53 bytes .../images/888888_7x7_arrow_right.gif | Bin 0 -> 53 bytes .../css/smoothness/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../dadada_40x100_textures_02_glass_75.png | Bin 0 -> 214 bytes .../e6e6e6_40x100_textures_02_glass_75.png | Bin 0 -> 211 bytes .../images/ffffff_40x100_textures_01_flat_0.png | Bin 0 -> 178 bytes .../ffffff_40x100_textures_02_glass_65.png | Bin 0 -> 207 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 212 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 208 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 207 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../smoothness/jquery-ui-1.10.3.custom.min.css | 7 + .../ui/css/smoothness/jqueryui-themeroller.css | 856 +++ .../themes/theme1/ui/custom-fonts/Read Me.txt | 5 + .../theme1/ui/custom-fonts/fonts/stratos.eot | Bin 0 -> 6660 bytes .../theme1/ui/custom-fonts/fonts/stratos.svg | 21 + .../theme1/ui/custom-fonts/fonts/stratos.ttf | Bin 0 -> 6496 bytes .../theme1/ui/custom-fonts/fonts/stratos.woff | Bin 0 -> 6572 bytes .../theme1/ui/custom-fonts/selection.json | 268 + .../themes/theme1/ui/custom-fonts/style.css | 58 + .../console/themes/theme1/ui/favicon.ico | Bin 0 -> 766 bytes .../ui/font-awesome/css/font-awesome-ie7.css | 1203 ++++ .../font-awesome/css/font-awesome-ie7.min.css | 384 + .../theme1/ui/font-awesome/css/font-awesome.css | 1338 ++++ .../ui/font-awesome/css/font-awesome.min.css | 4 + .../theme1/ui/font-awesome/font/FontAwesome.otf | Bin 0 -> 61896 bytes .../font-awesome/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../font-awesome/font/fontawesome-webfont.svg | 399 + .../font-awesome/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../font-awesome/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes .../ui/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 414 ++ .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes .../ui/fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../ui/fonts/glyphicons-halflings-regular.svg | 228 + .../ui/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../ui/fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../console/themes/theme1/ui/fonts/stratos.eot | Bin 0 -> 6316 bytes .../console/themes/theme1/ui/fonts/stratos.svg | 20 + .../console/themes/theme1/ui/fonts/stratos.ttf | Bin 0 -> 6152 bytes .../console/themes/theme1/ui/fonts/stratos.woff | Bin 0 -> 6228 bytes .../console/themes/theme1/ui/img/clouds.png | Bin 0 -> 6663 bytes .../console/themes/theme1/ui/img/egg-logo.png | Bin 0 -> 8299 bytes .../console/themes/theme1/ui/img/gray.png | Bin 0 -> 144 bytes .../console/themes/theme1/ui/img/icon-lock.png | Bin 0 -> 337 bytes .../console/themes/theme1/ui/img/icon-user.png | Bin 0 -> 447 bytes .../themes/theme1/ui/img/login-shadow.png | Bin 0 -> 1214 bytes .../themes/theme1/ui/img/logo-inside.png | Bin 0 -> 7563 bytes .../console/themes/theme1/ui/img/logo-login.png | Bin 0 -> 6223 bytes .../console/themes/theme1/ui/img/repeat.png | Bin 0 -> 7371 bytes .../themes/theme1/ui/img/transparent-white.png | Bin 0 -> 144 bytes .../themes/theme1/ui/js/configure_stratos.js | 38 + .../console/themes/theme1/ui/js/main.js | 1 + .../console/themes/theme1/ui/js/utils.js | 21 + .../themes/theme1/ui/js/vendor/bootstrap.js | 1999 +++++ .../themes/theme1/ui/js/vendor/bootstrap.min.js | 6 + .../theme1/ui/js/vendor/jquery-1.10.1.min.js | 6 + .../ui/js/vendor/jquery-ui-1.10.3.custom.min.js | 6 + .../theme1/ui/js/vendor/jquery.validate.min.js | 2 + .../vendor/modernizr-2.6.2-respond-1.1.0.min.js | 11 + .../themes/theme1/ui/js/vendor/raphael-min.js | 11 + .../console/util/utility.jag | 146 + .../controllers/README | 1 - .../controllers/acs.jag | 93 - .../controllers/login.jag | 37 - .../controllers/logout.jag | 41 - .../controllers/payloadFactory.jag | 50 - .../controllers/profileClient.jag | 58 - .../data/cartridge_deployments.json | 10 - .../data/cartridges.json | 35 - .../data/config_status.json | 4 - .../data/lbs.json | 10 - .../data/mt_service_deployments.json | 10 - .../data/mycartridges.json | 35 - .../data/partition_deployments.json | 10 - .../data/policy_deployments.json | 10 - .../index.jag | 7 - .../jaggery.conf | 3 - .../js/dialog.js | 369 - .../js/main.js | 19 - .../org.apache.stratos.manager.console/lbs.jag | 9 - .../login.jag | 5 - .../modules/README | 1 - .../mt_service_deployments.jag | 9 - .../partition_deployments.jag | 9 - .../policy_deployments.jag | 9 - .../org.apache.stratos.manager.console/root-js | 369 - .../sso/views/login.jag | 128 + .../stratos-resources/css/bootstrap-missing.css | 995 +++ .../stratos-resources/css/bootstrap-theme.css | 404 ++ .../views/stratos-resources/css/bootstrap.css | 6805 ++++++++++++++++++ .../sso/views/stratos-resources/css/main.css | 146 + .../sso/views/stratos-resources/img/clouds.png | Bin 0 -> 6663 bytes .../views/stratos-resources/img/egg-logo.png | Bin 0 -> 8299 bytes .../sso/views/stratos-resources/img/gray.png | Bin 0 -> 144 bytes .../views/stratos-resources/img/icon-lock.png | Bin 0 -> 337 bytes .../views/stratos-resources/img/icon-user.png | Bin 0 -> 447 bytes .../stratos-resources/img/login-shadow.png | Bin 0 -> 1214 bytes .../views/stratos-resources/img/logo-inside.png | Bin 0 -> 7563 bytes .../views/stratos-resources/img/logo-login.png | Bin 0 -> 6223 bytes .../sso/views/stratos-resources/img/repeat.png | Bin 0 -> 7371 bytes .../stratos-resources/img/transparent-white.png | Bin 0 -> 144 bytes .../subscribe_cartridge.jag | 6 - .../themes/README | 1 - .../themes/theme1/pages/index.hbs | 78 - .../theme1/partials/cartridge_deployments.hbs | 90 - .../themes/theme1/partials/cartridges.hbs | 37 - .../theme1/partials/configure_stratos.hbs | 48 - .../themes/theme1/partials/header.hbs | 105 - .../themes/theme1/partials/lbs.hbs | 90 - .../themes/theme1/partials/login.hbs | 31 - .../theme1/partials/mt_service_deployments.hbs | 90 - .../themes/theme1/partials/mycartridges.hbs | 7 - .../theme1/partials/partition_deployments.hbs | 129 - .../theme1/partials/policy_deployments.hbs | 90 - .../theme1/partials/subscribe_cartridge.hbs | 125 - .../themes/theme1/partials/title.hbs | 1 - .../themes/theme1/renderers/account_recovery.js | 23 - .../theme1/renderers/cartridge_deployments.js | 47 - .../themes/theme1/renderers/cartridges.js | 72 - .../theme1/renderers/configure_stratos.js | 42 - .../themes/theme1/renderers/index.js | 68 - .../themes/theme1/renderers/lbs.js | 47 - .../themes/theme1/renderers/login.js | 22 - .../theme1/renderers/mt_service_deployments.js | 47 - .../theme1/renderers/partition_deployments.js | 47 - .../theme1/renderers/policy_deployments.js | 47 - .../theme1/renderers/subscribe_cartridge.js | 37 - .../themes/theme1/theme.js | 1 - .../themes/theme1/ui/404.html | 157 - .../ui/apple-touch-icon-114x114-precomposed.png | Bin 1189 -> 0 bytes .../ui/apple-touch-icon-144x144-precomposed.png | Bin 1475 -> 0 bytes .../ui/apple-touch-icon-57x57-precomposed.png | Bin 730 -> 0 bytes .../ui/apple-touch-icon-72x72-precomposed.png | Bin 854 -> 0 bytes .../theme1/ui/apple-touch-icon-precomposed.png | Bin 730 -> 0 bytes .../themes/theme1/ui/apple-touch-icon.png | Bin 730 -> 0 bytes .../themes/theme1/ui/crossdomain.xml | 15 - .../themes/theme1/ui/css/bootstrap-missing.css | 995 --- .../themes/theme1/ui/css/bootstrap-theme.css | 404 -- .../theme1/ui/css/bootstrap-theme.min.css | 1 - .../themes/theme1/ui/css/bootstrap.css | 6805 ------------------ .../themes/theme1/ui/css/bootstrap.min.css | 9 - .../themes/theme1/ui/css/dialog.css | 128 - .../themes/theme1/ui/css/main.css | 363 - .../images/222222_11x11_icon_close.gif | Bin 62 -> 0 bytes .../images/222222_11x11_icon_resize_se.gif | Bin 61 -> 0 bytes .../smoothness/images/222222_7x7_arrow_left.gif | Bin 53 -> 0 bytes .../images/222222_7x7_arrow_right.gif | Bin 53 -> 0 bytes .../images/454545_11x11_icon_close.gif | Bin 62 -> 0 bytes .../smoothness/images/454545_7x7_arrow_left.gif | Bin 53 -> 0 bytes .../images/454545_7x7_arrow_right.gif | Bin 53 -> 0 bytes .../images/888888_11x11_icon_close.gif | Bin 62 -> 0 bytes .../smoothness/images/888888_7x7_arrow_left.gif | Bin 53 -> 0 bytes .../images/888888_7x7_arrow_right.gif | Bin 53 -> 0 bytes .../css/smoothness/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../dadada_40x100_textures_02_glass_75.png | Bin 214 -> 0 bytes .../e6e6e6_40x100_textures_02_glass_75.png | Bin 211 -> 0 bytes .../images/ffffff_40x100_textures_01_flat_0.png | Bin 178 -> 0 bytes .../ffffff_40x100_textures_02_glass_65.png | Bin 207 -> 0 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 0 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 0 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 0 bytes .../images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_454545_256x240.png | Bin 6992 -> 0 bytes .../images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes .../smoothness/jquery-ui-1.10.3.custom.min.css | 7 - .../ui/css/smoothness/jqueryui-themeroller.css | 856 --- .../themes/theme1/ui/custom-fonts/Read Me.txt | 5 - .../theme1/ui/custom-fonts/fonts/stratos.eot | Bin 6660 -> 0 bytes .../theme1/ui/custom-fonts/fonts/stratos.svg | 21 - .../theme1/ui/custom-fonts/fonts/stratos.ttf | Bin 6496 -> 0 bytes .../theme1/ui/custom-fonts/fonts/stratos.woff | Bin 6572 -> 0 bytes .../theme1/ui/custom-fonts/selection.json | 268 - .../themes/theme1/ui/custom-fonts/style.css | 58 - .../themes/theme1/ui/favicon.ico | Bin 766 -> 0 bytes .../ui/font-awesome/css/font-awesome-ie7.css | 1203 ---- .../font-awesome/css/font-awesome-ie7.min.css | 384 - .../theme1/ui/font-awesome/css/font-awesome.css | 1338 ---- .../ui/font-awesome/css/font-awesome.min.css | 4 - .../theme1/ui/font-awesome/font/FontAwesome.otf | Bin 61896 -> 0 bytes .../font-awesome/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../font-awesome/font/fontawesome-webfont.svg | 399 - .../font-awesome/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../font-awesome/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes .../ui/font-awesome/fonts/FontAwesome.otf | Bin 62856 -> 0 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 38205 -> 0 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 414 -- .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 80652 -> 0 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 44432 -> 0 bytes .../ui/fonts/glyphicons-halflings-regular.eot | Bin 14079 -> 0 bytes .../ui/fonts/glyphicons-halflings-regular.svg | 228 - .../ui/fonts/glyphicons-halflings-regular.ttf | Bin 29512 -> 0 bytes .../ui/fonts/glyphicons-halflings-regular.woff | Bin 16448 -> 0 bytes .../themes/theme1/ui/fonts/stratos.eot | Bin 6316 -> 0 bytes .../themes/theme1/ui/fonts/stratos.svg | 20 - .../themes/theme1/ui/fonts/stratos.ttf | Bin 6152 -> 0 bytes .../themes/theme1/ui/fonts/stratos.woff | Bin 6228 -> 0 bytes .../themes/theme1/ui/img/clouds.png | Bin 6663 -> 0 bytes .../themes/theme1/ui/img/egg-logo.png | Bin 8299 -> 0 bytes .../themes/theme1/ui/img/gray.png | Bin 144 -> 0 bytes .../themes/theme1/ui/img/icon-lock.png | Bin 337 -> 0 bytes .../themes/theme1/ui/img/icon-user.png | Bin 447 -> 0 bytes .../themes/theme1/ui/img/login-shadow.png | Bin 1214 -> 0 bytes .../themes/theme1/ui/img/logo-inside.png | Bin 7563 -> 0 bytes .../themes/theme1/ui/img/logo-login.png | Bin 6223 -> 0 bytes .../themes/theme1/ui/img/repeat.png | Bin 7371 -> 0 bytes .../themes/theme1/ui/img/transparent-white.png | Bin 144 -> 0 bytes .../themes/theme1/ui/js/configure_stratos.js | 38 - .../themes/theme1/ui/js/main.js | 1 - .../themes/theme1/ui/js/utils.js | 21 - .../themes/theme1/ui/js/vendor/bootstrap.js | 1999 ----- .../themes/theme1/ui/js/vendor/bootstrap.min.js | 6 - .../theme1/ui/js/vendor/jquery-1.10.1.min.js | 6 - .../ui/js/vendor/jquery-ui-1.10.3.custom.min.js | 6 - .../theme1/ui/js/vendor/jquery.validate.min.js | 2 - .../vendor/modernizr-2.6.2-respond-1.1.0.min.js | 11 - .../themes/theme1/ui/js/vendor/raphael-min.js | 11 - .../util/utility.jag | 146 - .../listener/InstanceStatusListener.java | 27 +- .../manager/lookup/ClusterIdToSubscription.java | 63 +- .../manager/lookup/LookupDataHolder.java | 9 +- .../manager/lookup/SubscriptionContext.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 23 +- .../publisher/TenantSynzhronizerTask.java | 12 +- .../DataInsertionAndRetrievalManager.java | 7 +- .../SubscriptionMultiTenantBehaviour.java | 36 +- .../SubscriptionSingleTenantBehaviour.java | 46 + .../StratosManagerTopologyReceiver.java | 119 +- .../instance/notifier/InstanceCleanupEvent.java | 7 +- .../event/topology/ClusterRemovedEvent.java | 8 +- .../distribution/src/main/assembly/bin.xml | 52 +- .../distribution/src/main/conf/jndi.properties | 1 - .../distribution/src/main/conf/terminateall.drl | 44 + .../distribution/src/main/assembly/bin.xml | 2 +- .../src/main/bin/cartridge-agent.sh | 43 - .../distribution/src/main/bin/stratos.sh | 43 + .../conf/templates/jndi.properties.template | 3 - .../src/main/resources/jndi.properties | 1 - .../modules/scripts/ec2/cartridge-agent.sh | 67 +- .../ec2/load-balancer/cartridge-agent.sh | 27 +- .../distribution/src/main/assembly/bin.xml | 60 +- .../distribution/src/main/conf/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 84 +- .../conf/templates/jndi.properties.template | 3 - products/stratos-manager/conf/jndi.properties | 1 - .../modules/distribution/src/assembly/bin.xml | 60 +- .../modules/p2-profile-gen/pom.xml | 58 +- products/stratos-manager/pom.xml | 4 + .../config/as/repository/conf/jndi.properties | 1 - .../cc/repository/conf/cloud-controller.xml | 2 - .../config/cc/repository/conf/jndi.properties | 1 - .../config/cep/repository/conf/jndi.properties | 26 +- .../config/sm/repository/conf/carbon.xml | 17 + .../config/sm/repository/conf/jndi.properties | 1 - tools/stratos-installer/resources/userstore.sql | 108 +- 378 files changed, 28580 insertions(+), 19638 deletions(-) ----------------------------------------------------------------------
