Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/106955bc Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/106955bc Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/106955bc Branch: refs/heads/master Commit: 106955bcbdc4955d58cde1c882d26e25c059cee5 Parents: 4e042bc c88a506 Author: Imesh Gunaratne <[email protected]> Authored: Mon Nov 10 23:04:24 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Nov 10 23:04:24 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 15 +- .../applications/topic/ApplicationBuilder.java | 19 +- .../topic/ApplicationsEventPublisher.java | 9 +- .../stratos/autoscaler/monitor/Monitor.java | 14 +- .../monitor/ParentComponentMonitor.java | 24 +- .../monitor/application/ApplicationMonitor.java | 34 +- .../monitor/cluster/AbstractClusterMonitor.java | 4 +- .../autoscaler/monitor/group/GroupMonitor.java | 16 +- .../stratos/autoscaler/pojo/Dependencies.java | 10 + .../status/checker/StatusChecker.java | 10 +- .../termination-change.patch | 596 - .../application/ApplicationTopicReceiver.java | 2 +- .../controller/topology/TopologyBuilder.java | 92 +- .../topology/TopologyEventPublisher.java | 12 +- .../console/.gitignore | 29 + .../console/LICENSE | 201 + .../console/README | 34 - .../console/README.md | 13 + .../console/apis/README | 1 - .../console/app.js | 12 +- .../console/applications.jag | 45 + .../console/applications_form.jag | 93 + .../console/cartridge_info.jag | 75 - .../console/cartridge_info_sg.jag | 80 - .../console/cartridges.jag | 41 - .../console/config/acl.json | 14 +- .../console/config/console.js | 36 +- .../console/config/console.json | 21 +- .../console/configure.jag | 45 + .../console/configure_form.jag | 160 + .../console/configure_stratos.jag | 114 - .../console/configure_stratos_wizard.jag | 113 - .../console/controllers/README | 1 - .../console/controllers/acs.jag | 103 - .../applications/application_requests.jag | 49 + .../controllers/cartridgeDefintionSubmit.jag | 35 - .../controllers/cartridgeSubscribeSubmit.jag | 140 - .../controllers/cartridgeUnsubscribeSubmit.jag | 54 - .../cartridges/subscription_requests.jag | 43 + .../cartridges/unsubscription_requests.jag | 39 + .../console/controllers/checkAvailability.jag | 31 - .../configure/configure_requests.jag | 64 + .../console/controllers/dashboard.jag | 35 - .../default/applications/applications.json | 23 + .../forms/default/applications/groups.json | 9 + .../forms/default/configure/application.json | 1 + .../default/configure/autoscalingpolicies.json | 19 + .../forms/default/configure/cartridges.json | 67 + .../forms/default/configure/deployments.json | 17 + .../forms/default/configure/docker.json | 65 + .../forms/default/configure/loadbalancer.json | 46 + .../forms/default/configure/multitenant.json | 10 + .../forms/default/configure/partitions.json | 16 + .../forms/default/users/tenants.json | 9 + .../controllers/forms/default/users/users.json | 9 + .../controllers/forms/form_generator.jag | 134 + .../forms/schema/applications/applications.json | 112 + .../forms/schema/applications/groups.json | 46 + .../forms/schema/configure/application.json | 1 + .../schema/configure/autoscalingpolicies.json | 143 + .../forms/schema/configure/cartridges.json | 383 + .../forms/schema/configure/deployments.json | 103 + .../forms/schema/configure/docker.json | 302 + .../forms/schema/configure/loadbalancer.json | 263 + .../forms/schema/configure/multitenant.json | 71 + .../forms/schema/configure/partitions.json | 89 + .../controllers/forms/schema/users/tenants.json | 52 + .../controllers/forms/schema/users/users.json | 68 + .../console/controllers/lbDefinitionSubmit.jag | 29 - .../console/controllers/log/console.jag | 30 + .../console/controllers/login.jag | 65 - .../console/controllers/login/login.jag | 89 + .../console/controllers/login/logout.jag | 24 + .../console/controllers/login/validator.jag | 33 + .../console/controllers/loginSubmit.jag | 67 - .../console/controllers/logout.jag | 69 - .../console/controllers/manageTenants.jag | 60 - .../console/controllers/menu/menu.json | 165 + .../console/controllers/menu/menu_generator.jag | 125 + .../console/controllers/mycartridges.jag | 35 - .../console/controllers/newTenantSubmit.jag | 48 - .../controllers/partitionDefinitionSubmit.jag | 29 - .../console/controllers/payloadFactory.jag | 70 - .../controllers/policyDefinitionSubmit.jag | 36 - .../console/controllers/profileClient.jag | 77 - .../console/controllers/rest/rest_calls.jag | 374 + .../console/controllers/router.jag | 136 - .../controllers/users/users_requests.jag | 45 + .../controllers/wizard/wizard_requests.jag | 53 + .../console/controllers/wizardSubmit.jag | 86 - .../console/dashboard.jag | 33 - .../console/error-404.html | 110 - .../console/error.html | 118 - .../console/errorhtml/error-404.html | 1 + .../console/errorhtml/error.html | 1 + .../console/index.jag | 41 +- .../console/jaggery.conf | 83 +- .../console/js/dialog.js | 390 - .../console/js/main.js | 40 - .../console/login.jag | 18 +- .../console/modules/README | 1 - .../console/modules/file.js | 34 - .../console/modules/mime.js | 43 - .../console/modules/pinch.min.js | 8 +- .../modules/security/security.manager.js | 94 - .../modules/security/security.provider.js | 71 - .../console/my_cartridges.jag | 71 + .../console/my_cartridges_info.jag | 65 + .../console/subscribe_cartridge.jag | 70 - .../console/tenant_management.jag | 42 - .../console/tenant_new.jag | 26 - .../console/themes/README | 1 - .../css/bootstrap-3.2.0/bootstrap.min.css | 5 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes .../bootstrap-switch.min.css | 22 + .../console/themes/theme0/css/custom.css | 197 + .../console/themes/theme0/css/custom/style.css | 214 + .../css/font-awesome-4.2.0/font-awesome.min.css | 4 + .../font-awesome-4.2.0/fonts/FontAwesome.otf | Bin 0 -> 85908 bytes .../fonts/fontawesome-webfont.eot | Bin 0 -> 56006 bytes .../fonts/fontawesome-webfont.svg | 520 + .../fonts/fontawesome-webfont.ttf | Bin 0 -> 112160 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 65452 bytes .../theme0/css/font-mfizz-1.2/LICENSE.txt | 21 + .../theme0/css/font-mfizz-1.2/font-mfizz.css | 318 + .../theme0/css/font-mfizz-1.2/font-mfizz.eot | Bin 0 -> 43154 bytes .../theme0/css/font-mfizz-1.2/font-mfizz.svg | 1344 +++ .../theme0/css/font-mfizz-1.2/font-mfizz.ttf | Bin 0 -> 45324 bytes .../theme0/css/font-mfizz-1.2/font-mfizz.woff | Bin 0 -> 29056 bytes ...ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff | Bin 0 -> 21744 bytes ...ySUJH_bn48VBG8sNSnhCUOGz7vYGh680lGh-uXM.woff | Bin 0 -> 21704 bytes ...eOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff | Bin 0 -> 20544 bytes ...02ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff | Bin 0 -> 21272 bytes .../themes/theme0/css/web-fonts/open_sans.css | 24 + .../console/themes/theme0/css/wizard/custom.css | 87 + .../themes/theme0/helpers/applications.js | 7 + .../themes/theme0/helpers/applications_form.js | 6 + .../themes/theme0/helpers/configure_form.js | 6 + .../console/themes/theme0/helpers/login_body.js | 6 + .../themes/theme0/helpers/my_cartridges.js | 7 + .../console/themes/theme0/helpers/users_form.js | 6 + .../console/themes/theme0/helpers/wizard.js | 6 + .../themes/theme0/images/avatar/6497326.png | Bin 0 -> 142145 bytes .../themes/theme0/images/stratos-logo.png | Bin 0 -> 14423 bytes .../themes/theme0/images/stratos_background.png | Bin 0 -> 131283 bytes .../js/JSONEditor-0.7.12/jsoneditor-0.7.12.js | 7001 +++++++++++ .../theme0/js/bootstrap-3.2.0/bootstrap.min.js | 6 + .../bootstrap-switch.min.js | 22 + .../console/themes/theme0/js/custom.js | 144 + .../console/themes/theme0/js/custom/form.js | 72 + .../console/themes/theme0/js/custom/script.js | 5 + .../theme0/js/jquery-1.11.1/jquery-1.11.1.js | 10308 +++++++++++++++++ .../js/jquery-1.11.1/jquery-1.11.1.min.js | 4 + .../console/themes/theme0/js/login/login.js | 92 + .../themes/theme0/js/noty-2.2.9/noty-2.2.9.js | 10 + .../console/themes/theme0/js/wizard/custom.js | 10 + .../console/themes/theme0/pages/index.hbs | 48 + .../themes/theme0/partials/applications.hbs | 86 + .../theme0/partials/applications_form.hbs | 258 + .../themes/theme0/partials/configure_form.hbs | 314 + .../themes/theme0/partials/error_page.hbs | 17 + .../themes/theme0/partials/index_header.hbs | 28 + .../themes/theme0/partials/index_left_menu.hbs | 10 + .../theme0/partials/index_right_menu_help.hbs | 28 + .../theme0/partials/index_right_menu_log.hbs | 11 + .../themes/theme0/partials/index_sub_header.hbs | 13 + .../themes/theme0/partials/index_title.hbs | 22 + .../themes/theme0/partials/login_body.hbs | 38 + .../themes/theme0/partials/login_header.hbs | 12 + .../themes/theme0/partials/metro_menu.hbs | 28 + .../themes/theme0/partials/my_cartridges.hbs | 123 + .../theme0/partials/my_cartridges_info.hbs | 22 + .../themes/theme0/partials/users_form.hbs | 182 + .../console/themes/theme0/partials/wizard.hbs | 247 + .../themes/theme0/renderers/applications.js | 116 + .../theme0/renderers/applications_form.js | 124 + .../themes/theme0/renderers/configure.js | 116 + .../themes/theme0/renderers/configure_form.js | 124 + .../console/themes/theme0/renderers/index.js | 106 + .../console/themes/theme0/renderers/login.js | 89 + .../themes/theme0/renderers/my_cartridges.js | 119 + .../theme0/renderers/my_cartridges_info.js | 117 + .../console/themes/theme0/renderers/users.js | 116 + .../themes/theme0/renderers/users_form.js | 121 + .../console/themes/theme0/renderers/wizard.js | 123 + .../console/themes/theme0/theme.js | 104 + .../console/themes/theme1/pages/index.hbs | 111 - .../console/themes/theme1/pages/plain.hbs | 87 - .../themes/theme1/partials/cartridge_info.hbs | 126 - .../theme1/partials/cartridge_info_sg.hbs | 125 - .../themes/theme1/partials/cartridges.hbs | 113 - .../theme1/partials/configure_stratos.hbs | 107 - .../partials/configure_stratos_wizard.hbs | 485 - .../themes/theme1/partials/dashboard.hbs | 44 - .../themes/theme1/partials/error_page.hbs | 40 - .../console/themes/theme1/partials/header.hbs | 340 - .../console/themes/theme1/partials/login.hbs | 54 - .../themes/theme1/partials/mycartridges.hbs | 98 - .../theme1/partials/subscribe_cartridge.hbs | 294 - .../theme1/partials/tenant_management.hbs | 85 - .../themes/theme1/partials/tenant_new.hbs | 99 - .../console/themes/theme1/partials/title.hbs | 22 - .../themes/theme1/renderers/account_recovery.js | 44 - .../themes/theme1/renderers/cartridge_info.js | 101 - .../theme1/renderers/cartridge_info_sg.js | 99 - .../themes/theme1/renderers/cartridges.js | 161 - .../theme1/renderers/configure_stratos.js | 163 - .../renderers/configure_stratos_wizard.js | 157 - .../themes/theme1/renderers/dashboard.js | 98 - .../console/themes/theme1/renderers/index.js | 183 - .../console/themes/theme1/renderers/login.js | 58 - .../theme1/renderers/subscribe_cartridge.js | 119 - .../theme1/renderers/tenant_management.js | 103 - .../themes/theme1/renderers/tenant_new.js | 66 - .../theme1/subthemes/theme2/ui/css/main.css | 600 - .../console/themes/theme1/theme.js | 104 - .../themes/theme1/ui/Open_Sans/LICENSE.txt | 202 - .../theme1/ui/Open_Sans/OpenSans-Bold.ttf | Bin 224592 -> 0 bytes .../theme1/ui/Open_Sans/OpenSans-BoldItalic.ttf | Bin 213292 -> 0 bytes .../theme1/ui/Open_Sans/OpenSans-ExtraBold.ttf | Bin 222584 -> 0 bytes .../ui/Open_Sans/OpenSans-ExtraBoldItalic.ttf | Bin 213420 -> 0 bytes .../theme1/ui/Open_Sans/OpenSans-Italic.ttf | Bin 212896 -> 0 bytes .../theme1/ui/Open_Sans/OpenSans-Light.ttf | Bin 222412 -> 0 bytes .../ui/Open_Sans/OpenSans-LightItalic.ttf | Bin 213128 -> 0 bytes .../theme1/ui/Open_Sans/OpenSans-Regular.ttf | Bin 217360 -> 0 bytes .../theme1/ui/Open_Sans/OpenSans-Semibold.ttf | Bin 221328 -> 0 bytes .../ui/Open_Sans/OpenSans-SemiboldItalic.ttf | Bin 212820 -> 0 bytes .../themes/theme1/ui/Open_Sans/open_sans.css | 39 - .../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 | 7118 ------------ .../themes/theme1/ui/css/bootstrap.min.css | 9 - .../console/themes/theme1/ui/css/dialog.css | 149 - .../console/themes/theme1/ui/css/main.css | 677 -- .../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 -- .../theme1/ui/custom-font-new/LICENSE.txt | 21 - .../themes/theme1/ui/custom-font-new/README.txt | 75 - .../theme1/ui/custom-font-new/config.json | 1272 -- .../theme1/ui/custom-font-new/css/animation.css | 85 - .../ui/custom-font-new/css/fontello-codes.css | 186 - .../custom-font-new/css/fontello-embedded.css | 239 - .../custom-font-new/css/fontello-ie7-codes.css | 186 - .../ui/custom-font-new/css/fontello-ie7.css | 197 - .../theme1/ui/custom-font-new/css/fontello.css | 237 - .../themes/theme1/ui/custom-font-new/demo.html | 545 - .../theme1/ui/custom-font-new/font/fontello.eot | Bin 42600 -> 0 bytes .../theme1/ui/custom-font-new/font/fontello.svg | 196 - .../theme1/ui/custom-font-new/font/fontello.ttf | Bin 42432 -> 0 bytes .../ui/custom-font-new/font/fontello.woff | Bin 30096 -> 0 bytes .../console/themes/theme1/ui/img/asf-logo.png | Bin 10292 -> 0 bytes .../console/themes/theme1/ui/img/btn-down.png | Bin 738 -> 0 bytes .../themes/theme1/ui/img/btn-restart.png | Bin 801 -> 0 bytes .../console/themes/theme1/ui/img/btn-start.png | Bin 644 -> 0 bytes .../console/themes/theme1/ui/img/clouds.png | Bin 6663 -> 0 bytes .../console/themes/theme1/ui/img/confirm.gif | Bin 2324 -> 0 bytes .../console/themes/theme1/ui/img/dash.png | Bin 927 -> 0 bytes .../console/themes/theme1/ui/img/details.png | Bin 21148 -> 0 bytes .../console/themes/theme1/ui/img/diagram.png | Bin 75441 -> 0 bytes .../console/themes/theme1/ui/img/error.gif | Bin 2258 -> 0 bytes .../console/themes/theme1/ui/img/favicon.png | Bin 585 -> 0 bytes .../console/themes/theme1/ui/img/gray.png | Bin 144 -> 0 bytes .../console/themes/theme1/ui/img/icon-lock.png | Bin 337 -> 0 bytes .../console/themes/theme1/ui/img/icon-plus.png | Bin 178 -> 0 bytes .../themes/theme1/ui/img/icon-problem-dark.png | Bin 495 -> 0 bytes .../themes/theme1/ui/img/icon-problem-light.png | Bin 499 -> 0 bytes .../themes/theme1/ui/img/icon-problem.png | Bin 499 -> 0 bytes .../console/themes/theme1/ui/img/icon-user.png | Bin 447 -> 0 bytes .../console/themes/theme1/ui/img/image_10.png | Bin 49844 -> 0 bytes .../console/themes/theme1/ui/img/info.gif | Bin 2349 -> 0 bytes .../themes/theme1/ui/img/login-shadow.png | Bin 1214 -> 0 bytes .../themes/theme1/ui/img/logo-inside.png | Bin 7563 -> 0 bytes .../console/themes/theme1/ui/img/logo-login.png | Bin 6223 -> 0 bytes .../console/themes/theme1/ui/img/overlay.png | Bin 144 -> 0 bytes .../console/themes/theme1/ui/img/panel-back.png | Bin 152 -> 0 bytes .../console/themes/theme1/ui/img/repeat.png | Bin 7371 -> 0 bytes .../themes/theme1/ui/img/tmp-details.png | Bin 63979 -> 0 bytes .../themes/theme1/ui/img/transparent-white.png | Bin 144 -> 0 bytes .../console/themes/theme1/ui/img/warning.gif | Bin 2345 -> 0 bytes .../themes/theme1/ui/js/configure_stratos.js | 32 - .../console/themes/theme1/ui/js/dashboard.js | 417 - .../console/themes/theme1/ui/js/login.js | 89 - .../console/themes/theme1/ui/js/mycartridges.js | 45 - .../console/themes/theme1/ui/js/popup.js | 102 - .../themes/theme1/ui/js/tenant_management.js | 114 - .../console/themes/theme1/ui/js/utils.js | 42 - .../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 - .../console/themes/theme1/ui/js/wizard.js | 141 - .../console/users.jag | 45 + .../console/users_form.jag | 72 + .../console/util/acl.jag | 100 - .../console/util/utility.jag | 472 - .../console/wizard.jag | 115 + .../domain/applications/DependencyOrder.java | 10 + .../domain/applications/ScalingOrder.java | 40 + .../ApplicationClustersRemovedEvent.java | 44 + ...ApplicationClustersRemovedEventListener.java | 25 + ...licationClustersRemovedMessageProcessor.java | 100 + .../topology/TopologyMessageProcessorChain.java | 14 +- .../modules/event/topology/events.py | 2 +- products/pom.xml | 1 + products/python-cartridge-agent/pom.xml | 60 + tools/puppet3/manifests/nodes/base.pp | 2 + tools/puppet3/modules/mysql/manifests/init.pp | 2 - tools/puppet3/modules/nodejs/manifests/init.pp | 2 - tools/puppet3/modules/php/manifests/init.pp | 2 - .../python_agent/templates/agent.conf.erb | 3 + tools/puppet3/modules/ruby/manifests/init.pp | 2 - .../puppet3/modules/wordpress/manifests/init.pp | 3 +- 345 files changed, 28297 insertions(+), 25109 deletions(-) ----------------------------------------------------------------------
