Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into ga-release
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/eb1e239d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/eb1e239d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/eb1e239d Branch: refs/heads/master Commit: eb1e239d1f7ec7e5fc84006624944c0a8bdbd404 Parents: ce1b80a 9f6009c Author: Pradeep Fernando <[email protected]> Authored: Wed Apr 2 10:58:39 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Wed Apr 2 10:58:39 2014 +0530 ---------------------------------------------------------------------- README.md | 151 +- .../org.apache.stratos.cloud.controller/pom.xml | 2 +- .../concurrent/PartitionValidatorCallable.java | 88 ++ .../cloud/controller/iaases/AWSEC2Iaas.java | 35 +- .../controller/iaases/OpenstackNovaIaas.java | 24 +- .../impl/CloudControllerServiceImpl.java | 85 +- .../cloud/controller/interfaces/Iaas.java | 10 +- .../controller/registry/RegistryManager.java | 8 +- .../runtime/FasterLookUpDataHolder.java | 17 +- .../util/CloudControllerConstants.java | 4 +- .../console/README | 35 +- .../console/README.md | 11 - .../console/app.js | 21 + .../console/cartridge_info.jag | 22 +- .../console/cartridges.jag | 22 +- .../console/config/console.js | 21 + .../console/configure_stratos.jag | 22 +- .../console/configure_stratos_wizard.jag | 22 +- .../console/controllers/acs.jag | 22 +- .../controllers/cartridgeDefintionSubmit.jag | 23 +- .../controllers/cartridgeSubscribeSubmit.jag | 23 +- .../controllers/cartridgeUnsubscribeSubmit.jag | 22 +- .../console/controllers/checkAvailability.jag | 22 +- .../console/controllers/dashboard.jag | 22 +- .../console/controllers/lbDefinitionSubmit.jag | 22 +- .../console/controllers/login.jag | 22 +- .../console/controllers/loginSubmit.jag | 22 +- .../console/controllers/logout.jag | 23 +- .../console/controllers/manageTenants.jag | 22 +- .../console/controllers/mycartridges.jag | 22 +- .../console/controllers/newTenantSubmit.jag | 22 +- .../controllers/partitionDefinitionSubmit.jag | 22 +- .../console/controllers/payloadFactory.jag | 22 +- .../controllers/policyDefinitionSubmit.jag | 22 +- .../console/controllers/profileClient.jag | 22 +- .../console/controllers/router.jag | 20 + .../console/controllers/wizardSubmit.jag | 22 +- .../console/dashboard.jag | 22 +- .../console/default_page.jag | 22 +- .../console/index.jag | 22 +- .../console/js/dialog.js | 21 + .../console/js/main.js | 23 +- .../console/login.jag | 22 +- .../console/modules/file.js | 23 +- .../console/modules/mime.js | 23 +- .../console/modules/pinch.min.js | 23 +- .../modules/security/security.manager.js | 21 + .../modules/security/security.provider.js | 21 + .../console/permission-mapping.txt | 19 - .../console/root-js | 369 ----- .../console/subscribe_cartridge.jag | 22 +- .../console/tenant_management.jag | 22 +- .../console/tenant_new.jag | 22 +- .../console/themes/theme1/pages/index.hbs | 22 +- .../console/themes/theme1/pages/plain.hbs | 21 + .../console/themes/theme1/partials/404.hbs | 21 + .../themes/theme1/partials/cartridge_info.hbs | 227 +-- .../themes/theme1/partials/cartridges.hbs | 67 +- .../theme1/partials/configure_stratos.hbs | 31 +- .../partials/configure_stratos_wizard.hbs | 31 +- .../themes/theme1/partials/dashboard.hbs | 25 +- .../themes/theme1/partials/error_page.hbs | 21 + .../console/themes/theme1/partials/header.hbs | 657 ++++----- .../console/themes/theme1/partials/login.hbs | 69 +- .../themes/theme1/partials/mycartridges.hbs | 67 +- .../theme1/partials/subscribe_cartridge.hbs | 423 +++--- .../theme1/partials/tenant_management.hbs | 25 +- .../themes/theme1/partials/tenant_new.hbs | 23 +- .../console/themes/theme1/partials/title.hbs | 23 +- .../themes/theme1/renderers/account_recovery.js | 67 +- .../themes/theme1/renderers/cartridge_info.js | 25 +- .../themes/theme1/renderers/cartridges.js | 25 +- .../theme1/renderers/configure_stratos.js | 23 +- .../renderers/configure_stratos_wizard.js | 23 +- .../themes/theme1/renderers/dashboard.js | 23 +- .../themes/theme1/renderers/default_page.js | 23 +- .../console/themes/theme1/renderers/index.js | 23 +- .../console/themes/theme1/renderers/login.js | 23 +- .../theme1/renderers/subscribe_cartridge.js | 23 +- .../theme1/renderers/tenant_management.js | 23 +- .../themes/theme1/renderers/tenant_new.js | 25 +- .../theme1/subthemes/theme2/ui/css/main.css | 23 +- .../console/themes/theme1/theme.js | 23 +- .../console/themes/theme1/ui/404.html | 157 -- .../themes/theme1/ui/Open_Sans/open_sans.css | 23 +- .../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 | 15 - .../console/themes/theme1/ui/css/dialog.css | 21 + .../console/themes/theme1/ui/css/main.css | 1139 +++++++-------- .../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 | 20 - .../console/themes/theme1/ui/fonts/stratos.ttf | Bin 6152 -> 0 bytes .../console/themes/theme1/ui/fonts/stratos.woff | Bin 6228 -> 0 bytes .../themes/theme1/ui/js/configure_stratos.js | 21 + .../console/themes/theme1/ui/js/dashboard.js | 21 + .../console/themes/theme1/ui/js/login.js | 23 +- .../console/themes/theme1/ui/js/mycartridges.js | 23 +- .../console/themes/theme1/ui/js/popup.js | 23 +- .../themes/theme1/ui/js/tenant_management.js | 23 +- .../console/themes/theme1/ui/js/utils.js | 23 +- .../console/themes/theme1/ui/js/wizard.js | 21 + .../console/util/acl.jag | 22 +- .../console/util/utility.jag | 20 + .../modules/console/module.xml | 22 + .../modules/console/scripts/server.js | 21 + .../sso/views/login.jag | 277 ++-- .../sso/views/stratos-resources/css/main.css | 313 ++-- .../behaviour/CartridgeMgtBehaviour.java | 5 +- .../org/apache/stratos/manager/dao/Cluster.java | 22 +- .../service/ServiceDeploymentManager.java | 7 + .../category/DefaultLoadBalancerCategory.java | 12 +- .../lb/category/LoadBalancerCategory.java | 7 +- .../manager/CartridgeSubscriptionManager.java | 4 +- .../subscription/LBCartridgeSubscription.java | 30 +- .../manager/utils/RepoPasswordMgtUtil.java | 25 +- .../rest/endpoint/services/ServiceUtils.java | 2 +- .../src/main/resources/addTenantRequest.txt | 4 - .../src/main/resources/getTenantList.txt | 1 - dependencies/pom.xml | 1 + .../main/autoscale-policies/economyPolicy.xml | 28 - .../deployment-policies/economy-deployment.xml | 25 - .../main/autoscale-policies/economyPolicy.xml | 28 - .../deployment-policies/economy-deployment.xml | 25 - .../src/main/resources/AutoScalerService.wsdl | 24 +- .../main/resources/CloudControllerService.wsdl | 24 +- .../InstanceCleanupNotificationService.wsdl | 24 +- .../resources/add_entry_zone_file.sh | 70 - .../resources/billing-mysql.sql | 143 -- .../stratos-installer/resources/db.stratos.com | 15 - tools/stratos-installer/resources/git | 74 - .../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 +- 175 files changed, 5067 insertions(+), 8263 deletions(-) ----------------------------------------------------------------------
