Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/256cb0a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/256cb0a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/256cb0a5 Branch: refs/heads/master Commit: 256cb0a5007901e047190188a708e6b2a7554ca4 Parents: f913a9e f8dc515 Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 18 11:54:25 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 18 11:54:25 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 13 +- .../client/CloudControllerServiceClient.java | 9 +- .../service/ServiceDeploymentManager.java | 2 + .../adc/mgt/lookup/LookupDataHolder.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 3 + .../adc/mgt/payload/BasicPayloadData.java | 37 +- .../stratos/adc/mgt/payload/PayloadData.java | 18 +- .../model/TopologyClusterInformationModel.java | 2 +- .../StratosManagerTopologyReceiver.java | 15 + .../adc/mgt/utils/CartridgeConstants.java | 5 + .../stratos/autoscaler/AutoscalerContext.java | 1 + .../stratos/autoscaler/ClusterMonitor.java | 2 +- .../apache/stratos/autoscaler/Constants.java | 15 +- .../autoscaler/NetworkPartitionContext.java | 7 +- .../autoscaler/api/AutoScalerServiceImpl.java | 8 +- .../cloud/controller/CloudControllerClient.java | 4 + .../health/HealthEventMessageDelegator.java | 25 +- .../autoscaler/policy/PolicyManager.java | 21 +- .../topology/AutoscalerTopologyReceiver.java | 7 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 5 +- .../apache/stratos/cli/DeploymentPolicy.java | 31 + .../stratos/cli/RestCommandLineService.java | 147 +- .../apache/stratos/cli/StratosApplication.java | 3 + .../cli/commands/AutoscalePolicyCommand.java | 3 - .../cli/commands/DeploymentPolicyCommand.java | 48 + .../apache/stratos/cli/utils/CliConstants.java | 10 +- .../controller/concurrent/ThreadExecutor.java | 33 +- .../controller/deployers/CartridgeDeployer.java | 4 +- .../impl/CloudControllerServiceImpl.java | 8 +- .../controller/topology/TopologyManager.java | 2 +- .../src/main/resources/META-INF/component.xml | 4 +- .../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 + .../org/apache/stratos/rest/endpoint/Utils.java | 40 + .../endpoint/exception/RestAPIException.java | 20 + .../handlers/CustomExceptionMapper.java | 37 + .../handlers/StratosAuthenticationHandler.java | 19 +- .../handlers/StratosAuthorizingHandler.java | 14 +- .../rest/endpoint/services/StratosAdmin.java | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 + .../src/main/webapp/WEB-INF/web.xml | 4 +- .../HealthStatisticsEventBuilder.xml | 10 - .../InstanceStatusStatisticsBuilder.xml | 10 - .../LoadBalancerStatisticsEventBuilder.xml | 10 - .../AverageInFlightRequestsEventFormatter.xml | 11 - .../AverageLoadAverageEventFormatter.xml | 11 - .../AverageMemoryConsumptionEventFormatter.xml | 11 - .../FaultMessageEventFormatter.xml | 11 - .../GradientInFlightRequestsEventFormatter.xml | 11 - .../GradientLoadAverageEventFormatter.xml | 11 - .../GradientMemoryConsumptionEventFormatter.xml | 11 - ...DerivativeInFlightRequestsEventFormatter.xml | 11 - ...econdDerivativeLoadAverageEventFormatter.xml | 11 - ...erivativeMemoryConsumptionEventFormatter.xml | 11 - .../HealthStatisticsEventBuilder.xml | 10 + .../InstanceStatusStatisticsBuilder.xml | 10 + .../LoadBalancerStatisticsEventBuilder.xml | 10 + .../AverageInFlightRequestsEventFormatter.xml | 11 + .../AverageLoadAverageEventFormatter.xml | 11 + .../AverageMemoryConsumptionEventFormatter.xml | 11 + .../FaultMessageEventFormatter.xml | 11 + .../GradientInFlightRequestsEventFormatter.xml | 11 + .../GradientLoadAverageEventFormatter.xml | 11 + .../GradientMemoryConsumptionEventFormatter.xml | 11 + .../MemberAverageLoadAverageEventFormatter.xml | 11 + ...erAverageMemoryConsumptionEventFormatter.xml | 11 + .../MemberGradientLoadAverageEventFormatter.xml | 11 + ...rGradientMemoryConsumptionEventFormatter.xml | 11 + ...econdDerivativeLoadAverageEventFormatter.xml | 11 + ...erivativeMemoryConsumptionEventFormatter.xml | 11 + ...DerivativeInFlightRequestsEventFormatter.xml | 11 + ...econdDerivativeLoadAverageEventFormatter.xml | 11 + ...erivativeMemoryConsumptionEventFormatter.xml | 11 + .../execution-plans/AverageHeathRequest.xml | 23 - .../AverageInFlightRequestsFinder.xml | 19 - .../execution-plans/GradientOfHealthRequest.xml | 21 - .../GradientOfRequestsInFlightFinder.xml | 18 - .../SecondDerivativeOfHealthRequest.xml | 21 - ...SecondDerivativeOfRequestsInFlightFinder.xml | 19 - .../executionplans/AverageHeathRequest.xml | 29 + .../AverageInFlightRequestsFinder.xml | 19 + .../executionplans/GradientOfHealthRequest.xml | 30 + .../GradientOfRequestsInFlightFinder.xml | 18 + .../SecondDerivativeOfHealthRequest.xml | 27 + ...SecondDerivativeOfRequestsInFlightFinder.xml | 19 + .../DefaultWSO2EventInputAdaptor.xml | 3 - .../DefaultWSO2EventInputAdaptor.xml | 3 + .../DefaultWSO2EventOutputAdaptor.xml | 8 - .../output-event-adaptors/JMSOutputAdaptor.xml | 8 - .../DefaultWSO2EventOutputAdaptor.xml | 8 + .../outputeventadaptors/JMSOutputAdaptor.xml | 8 + .../stream-manager-config.xml | 175 - .../streamdefinitions/stream-manager-config.xml | 269 + .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../distribution/src/main/conf/autoscaler.xml | 1 + .../src/main/bin/health-publisher.sh | 2 +- .../agent/health/publisher/HealthPublisher.java | 8 +- .../src/main/conf/cartridge-config.properties | 10 +- .../pom.xml | 2 - tools/cartridge-create/configure-software | 383 + tools/cartridge-create/configure_software | 383 - tools/cartridge-create/create-kvm-image.sh | 24 + tools/cartridge-create/create_kvm_image.sh | 24 - tools/cartridge-create/image-action.sh | 165 + tools/cartridge-create/image_action.sh | 165 - .../php/cartridge-data-publisher-1.0.2.zip | Bin 0 -> 2832200 bytes .../php/cartridge_data_publisher_1.0.2.zip | Bin 2832200 -> 0 bytes tools/stratos-installer/clean.sh | 27 +- tools/stratos-installer/conf/setup.conf | 17 +- .../repository/conf/cartridge-config.properties | 8 +- tools/stratos-installer/setup.sh | 166 +- tools/stratos-installer/start-servers.sh | 30 +- 229 files changed, 19918 insertions(+), 1253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/256cb0a5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/256cb0a5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/256cb0a5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ----------------------------------------------------------------------
