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/93bd37f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/93bd37f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/93bd37f2 Branch: refs/heads/master Commit: 93bd37f2f5efcb6e4c9f5870590d737058886a84 Parents: 58fe66d eb1e239 Author: Nirmal Fernando <[email protected]> Authored: Wed Apr 2 14:43:48 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Apr 2 14:43:48 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 17 + .../util/CloudControllerConstants.java | 1 + .../console/README | 35 +- .../console/README.md | 11 - .../console/cartridge_info.jag | 41 +- .../console/cartridges.jag | 41 +- .../console/configure_stratos.jag | 41 +- .../console/configure_stratos_wizard.jag | 41 +- .../console/controllers/acs.jag | 41 +- .../controllers/cartridgeDefintionSubmit.jag | 42 +- .../controllers/cartridgeSubscribeSubmit.jag | 42 +- .../controllers/cartridgeUnsubscribeSubmit.jag | 41 +- .../console/controllers/checkAvailability.jag | 41 +- .../console/controllers/dashboard.jag | 41 +- .../console/controllers/lbDefinitionSubmit.jag | 41 +- .../console/controllers/login.jag | 41 +- .../console/controllers/loginSubmit.jag | 41 +- .../console/controllers/logout.jag | 42 +- .../console/controllers/manageTenants.jag | 41 +- .../console/controllers/mycartridges.jag | 41 +- .../console/controllers/newTenantSubmit.jag | 41 +- .../controllers/partitionDefinitionSubmit.jag | 41 +- .../console/controllers/payloadFactory.jag | 41 +- .../controllers/policyDefinitionSubmit.jag | 41 +- .../console/controllers/profileClient.jag | 41 +- .../console/controllers/router.jag | 41 +- .../console/controllers/wizardSubmit.jag | 41 +- .../console/dashboard.jag | 41 +- .../console/default_page.jag | 41 +- .../console/index.jag | 41 +- .../console/login.jag | 41 +- .../console/permission-mapping.txt | 19 - .../console/root-js | 369 ----- .../console/subscribe_cartridge.jag | 41 +- .../console/tenant_management.jag | 41 +- .../console/tenant_new.jag | 41 +- .../console/themes/theme1/pages/index.hbs | 1 - .../themes/theme1/partials/cartridges.hbs | 8 +- .../theme1/partials/configure_stratos.hbs | 10 +- .../partials/configure_stratos_wizard.hbs | 10 +- .../themes/theme1/partials/dashboard.hbs | 2 +- .../console/themes/theme1/partials/header.hbs | 10 +- .../themes/theme1/partials/mycartridges.hbs | 8 +- .../theme1/partials/subscribe_cartridge.hbs | 4 +- .../theme1/partials/tenant_management.hbs | 2 +- .../themes/theme1/renderers/cartridge_info.js | 2 +- .../themes/theme1/renderers/cartridges.js | 2 +- .../themes/theme1/renderers/tenant_new.js | 2 +- .../console/themes/theme1/ui/404.html | 178 --- .../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 .../console/themes/theme1/ui/crossdomain.xml | 36 - .../theme1/ui/custom-font-new/LICENSE.txt | 9 + .../theme1/ui/custom-font-new/config.json | 532 +++++++ .../ui/custom-font-new/css/fontello-codes.css | 80 +- .../custom-font-new/css/fontello-embedded.css | 92 +- .../custom-font-new/css/fontello-ie7-codes.css | 80 +- .../ui/custom-font-new/css/fontello-ie7.css | 80 +- .../theme1/ui/custom-font-new/css/fontello.css | 92 +- .../themes/theme1/ui/custom-font-new/demo.html | 214 ++- .../theme1/ui/custom-font-new/font/fontello.eot | Bin 30296 -> 42600 bytes .../theme1/ui/custom-font-new/font/fontello.svg | 80 +- .../theme1/ui/custom-font-new/font/fontello.ttf | Bin 30128 -> 42432 bytes .../ui/custom-font-new/font/fontello.woff | Bin 22732 -> 30096 bytes .../console/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 .../themes/theme1/ui/fonts/dropped text.txt | 1 - .../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 .../console/themes/theme1/ui/fonts/stratos.eot | Bin 6316 -> 0 bytes .../console/themes/theme1/ui/fonts/stratos.svg | 41 - .../console/themes/theme1/ui/fonts/stratos.ttf | Bin 6152 -> 0 bytes .../console/themes/theme1/ui/fonts/stratos.woff | Bin 6228 -> 0 bytes .../console/util/acl.jag | 41 +- .../console/util/utility.jag | 41 +- products/stratos/modules/distribution/pom.xml | 7 +- .../modules/distribution/src/assembly/bin.xml | 52 +- .../src/main/conf/siddhi/siddhi.extension | 4 +- .../resources/add_entry_zone_file.sh | 70 - .../resources/billing-mysql.sql | 143 -- .../resources/gitolite-suexec-wrapper.sh | 30 - .../resources/metering_mysql.sql | 172 --- tools/stratos-installer/resources/notify.php | 62 - tools/stratos-installer/resources/registry.sql | 407 ------ .../resources/remove_entry_zone_file.sh | 75 - .../resources/stratos_foundation.sql | 159 --- tools/stratos-installer/resources/userstore.sql | 481 ------- tools/stratos-installer/stratos-setup.sh | 45 +- 107 files changed, 1947 insertions(+), 7073 deletions(-) ----------------------------------------------------------------------
