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/c87320d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c87320d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c87320d7 Branch: refs/heads/master Commit: c87320d750a0b8761adbb1118cbd8e273f1952f9 Parents: 9e83a5d bdaf0e3 Author: Udara Liyanage <[email protected]> Authored: Tue Dec 17 21:40:46 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 17 21:40:46 2013 -0500 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterMonitor.java | 2 +- .../stratos/cli/RestCommandLineService.java | 78 +- .../apache/stratos/cli/utils/CliConstants.java | 1 + .../org.apache.stratos.manager.console/LICENSE | 191 + .../README.md | 33 + .../org.apache.stratos.manager.console/app.js | 14 + .../cartridges.jag | 7 + .../controllers/payloadFactory.jag | 50 + .../controllers/profileClient.jag | 58 + .../data/cartridges.json | 52 + .../data/mycartridges.json | 65 + .../index.jag | 7 + .../jaggery.conf | 4 +- .../js/dialog.js | 369 + .../js/main.js | 19 + .../login.jag | 5 + .../org.apache.stratos.manager.console/root-js | 369 + .../subscribe_cartridge.jag | 6 + .../themes/theme1/pages/index.hbs | 77 + .../themes/theme1/partials/cartridges.hbs | 37 + .../themes/theme1/partials/header.hbs | 48 + .../themes/theme1/partials/login.hbs | 31 + .../themes/theme1/partials/mycartridges.hbs | 41 + .../theme1/partials/subscribe_cartridge.hbs | 125 + .../themes/theme1/partials/title.hbs | 1 + .../themes/theme1/renderers/account_recovery.js | 23 + .../themes/theme1/renderers/cartridges.js | 33 + .../themes/theme1/renderers/index.js | 33 + .../themes/theme1/renderers/login.js | 22 + .../theme1/renderers/subscribe_cartridge.js | 32 + .../themes/theme1/theme.js | 1 + .../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 .../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 | 304 + .../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 + .../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 | 1479 ++++ .../ui/font-awesome/css/font-awesome.min.css | 403 ++ .../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/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 .../themes/theme1/ui/fonts/stratos.eot | Bin 0 -> 6316 bytes .../themes/theme1/ui/fonts/stratos.svg | 20 + .../themes/theme1/ui/fonts/stratos.ttf | Bin 0 -> 6152 bytes .../themes/theme1/ui/fonts/stratos.woff | Bin 0 -> 6228 bytes .../themes/theme1/ui/img/clouds.png | Bin 0 -> 6663 bytes .../themes/theme1/ui/img/egg-logo.png | Bin 0 -> 8299 bytes .../themes/theme1/ui/img/gray.png | Bin 0 -> 144 bytes .../themes/theme1/ui/img/icon-lock.png | Bin 0 -> 337 bytes .../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 .../themes/theme1/ui/img/logo-login.png | Bin 0 -> 6223 bytes .../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/main.js | 1 + .../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 | 77 + .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- tools/stratos-installer/setup.sh | 7 +- 124 files changed, 18099 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
