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/70a006d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/70a006d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/70a006d6 Branch: refs/heads/master Commit: 70a006d66804ee8c59519e8bf562b2ff49ad2a77 Parents: 172c86c 1e0496c Author: Nirmal Fernando <[email protected]> Authored: Wed Feb 5 14:53:14 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Feb 5 14:53:14 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 1 + .../apache/stratos/autoscaler/Constants.java | 3 + .../stratos/autoscaler/PartitionContext.java | 26 +- .../autoscaler/algorithm/OneAfterAnother.java | 20 +- .../autoscaler/algorithm/RoundRobin.java | 159 ++--- .../cloud/controller/CloudControllerClient.java | 2 +- .../controller/InstanceNotificationClient.java | 2 +- .../autoscaler/commands/ASPolicyCommands.java | 54 ++ .../commands/DeploymentPolicyCommands.java | 53 ++ .../autoscaler/commands/PartitionsCommands.java | 53 ++ .../autoscaler/internal/ASBundleActivater.java | 50 ++ .../health/AutoscalerHealthStatReceiver.java | 4 +- .../autoscaler/monitor/ClusterMonitor.java | 6 + .../autoscaler/partition/PartitionManager.java | 36 +- .../policy/model/AutoscalePolicy.java | 8 +- .../autoscaler/rule/RuleTasksDelegator.java | 8 +- .../stratos/autoscaler/util/ConfUtil.java | 20 +- .../stratos/autoscaler/TestMinimumRule.java | 14 +- .../autoscaler/TestObsoletedMemberRule.java | 20 +- .../src/test/resources/autoscaler.xml | 43 ++ .../stratos/cartridge/agent/CartridgeAgent.java | 2 + .../synchronizer/RepositoryInformation.java | 7 + .../git/impl/GitBasedArtifactRepository.java | 59 +- .../config/CartridgeAgentConfiguration.java | 14 +- .../agent/util/CartridgeAgentConstants.java | 1 + .../stratos/cli/RestCommandLineService.java | 599 +++++++++++++++++-- .../apache/stratos/cli/StratosApplication.java | 48 +- .../stratos/cli/beans/AutoscalePolicy.java | 52 -- .../org/apache/stratos/cli/beans/Cartridge.java | 201 ------- .../stratos/cli/beans/CartridgeInfoBean.java | 124 ---- .../stratos/cli/beans/DeploymentPolicy.java | 31 - .../org/apache/stratos/cli/beans/Partition.java | 76 --- .../apache/stratos/cli/beans/PropertyBean.java | 42 -- .../beans/autoscaler/partition/Partition.java | 76 +++ .../autoscaler/partition/PartitionGroup.java | 54 ++ .../autoscaler/partition/PropertyBean.java | 42 ++ .../policy/autoscale/AutoscalePolicy.java | 63 ++ .../policy/autoscale/LoadAverage.java | 32 + .../policy/autoscale/LoadThresholds.java | 28 + .../policy/autoscale/MemoryConsumption.java | 33 + .../policy/autoscale/RequestsInFlight.java | 33 + .../policy/deployment/DeploymentPolicy.java | 58 ++ .../stratos/cli/beans/cartridge/Cartridge.java | 220 +++++++ .../cli/beans/cartridge/CartridgeInfoBean.java | 124 ++++ .../cli/beans/cartridge/PortMapping.java | 68 +++ .../stratos/cli/beans/topology/Cluster.java | 81 +++ .../stratos/cli/beans/topology/Member.java | 87 +++ .../cli/beans/topology/MemberStatus.java | 5 + .../apache/stratos/cli/beans/topology/Port.java | 43 ++ .../DescribeAutoScalingPolicyCommand.java | 70 +++ .../cli/commands/DescribeCartridgeCommand.java | 70 +++ .../DescribeDeploymentPolicyCommand.java | 70 +++ .../cli/commands/DescribePartitionCommand.java | 70 +++ .../cli/commands/ListCartridgeInfoCommand.java | 127 ++++ .../stratos/cli/commands/ListCommand.java | 2 +- .../stratos/cli/commands/ListMemberCommand.java | 136 +++++ .../apache/stratos/cli/utils/CliConstants.java | 38 ++ .../controller/hive/HiveQueryExecutor.java | 36 +- .../impl/CloudControllerServiceImpl.java | 28 +- .../controller/pojo/CartridgeInstanceData.java | 10 - .../CartridgeInstanceDataPublisher.java | 211 +++++++ .../CartridgeInstanceDataPublisherTask.java | 459 -------------- .../runtime/FasterLookUpDataHolder.java | 20 +- .../controller/topology/TopologyBuilder.java | 28 +- .../util/CloudControllerConstants.java | 14 +- .../stratos/keystore/mgt/KeyStoreGenerator.java | 19 + .../keystore/mgt/KeystoreTenantMgtListener.java | 4 +- .../extension/api/LoadBalancerExtension.java | 28 +- .../conf/configurator/CEPConfigurator.java | 8 +- .../balancer/mediators/ResponseInterceptor.java | 10 +- .../console/app.js | 2 +- .../console/app.js~ | 14 + .../console/cartridge_deployments.jag | 11 +- .../console/config/acl.json | 4 +- .../console/config/console.json | 14 +- .../console/configure_stratos.jag | 48 +- .../console/configure_stratos_wizard.jag | 30 +- .../console/console.ipr | 59 -- .../console/controllers/acs.jag | 32 +- .../console/controllers/addTenantSubmit.jag | 9 - .../controllers/cartridgeDefintionSubmit.jag | 0 .../controllers/cartridgeSubscribeSubmit.jag | 0 .../console/controllers/lbDefinitionSubmit.jag | 0 .../console/controllers/login.jag | 66 +- .../console/controllers/loginSubmit.jag | 33 + .../console/controllers/logout.jag | 14 +- .../console/controllers/newTenantSubmit.jag | 28 + .../controllers/partitionDefinitionSubmit.jag | 0 .../console/controllers/payloadFactory.jag | 0 .../controllers/policyDefinitionSubmit.jag | 9 +- .../console/controllers/profileClient.jag | 0 .../console/controllers/router.jag | 79 +-- .../console/controllers/wizardSubmit.jag | 33 + .../console/data/partition_deployments.json | 22 +- .../console/default_page.jag | 5 + .../console/index.jag | 4 +- .../console/jaggery.conf | 10 +- .../console/lbs.jag | 13 +- .../console/modules/file.js | 13 + .../console/modules/mime.js | 22 + .../modules/security/security.provider.js | 1 - .../console/partition_deployments.jag | 9 +- .../console/permission-mapping.txt | 19 + .../console/policy_deployments.jag | 9 +- .../console/tenant_management.jag | 7 +- .../console/themes/theme1/pages/plain.hbs | 67 +++ .../console/themes/theme1/partials/404.hbs | 31 + .../theme1/partials/cartridge_deployments.hbs | 15 +- .../theme1/partials/configure_stratos.hbs | 48 +- .../partials/configure_stratos_wizard.hbs | 189 +++++- .../console/themes/theme1/partials/header.hbs | 208 +++++-- .../console/themes/theme1/partials/lbs.hbs | 12 +- .../console/themes/theme1/partials/login.hbs | 8 +- .../theme1/partials/mt_service_deployments.hbs | 5 +- .../themes/theme1/partials/mycartridges.hbs | 2 +- .../theme1/partials/partition_deployments.hbs | 59 +- .../theme1/partials/policy_deployments.hbs | 91 ++- .../theme1/partials/subscribe_cartridge.hbs | 8 +- .../themes/theme1/partials/tenant_new.hbs | 24 +- .../theme1/renderers/cartridge_deployments.js | 4 +- .../theme1/renderers/configure_stratos.js | 60 +- .../renderers/configure_stratos_wizard.js | 19 +- .../themes/theme1/renderers/default_page.js | 38 ++ .../console/themes/theme1/renderers/index.js | 6 +- .../console/themes/theme1/renderers/lbs.js | 8 +- .../theme1/renderers/mt_service_deployments.js | 1 + .../theme1/renderers/partition_deployments.js | 5 +- .../theme1/renderers/policy_deployments.js | 7 +- .../theme1/renderers/subscribe_cartridge.js | 4 +- .../console/themes/theme1/ui/css/main.css | 16 +- .../themes/theme1/ui/js/configure_stratos.js | 29 +- .../console/themes/theme1/ui/js/wizard.js | 41 +- .../console/util/utility.jag | 103 +++- .../manager/client/AutoscalerServiceClient.java | 2 +- .../stratos/manager/deploy/service/Service.java | 3 +- .../service/ServiceDeploymentManager.java | 263 ++++---- .../service/multitenant/MultiTenantService.java | 7 +- .../multitenant/lb/MultiTenantLBService.java | 7 +- .../apache/stratos/manager/dto/Cartridge.java | 18 +- .../listener/InstanceStatusListener.java | 2 +- .../manager/lookup/ClusterIdToSubscription.java | 5 +- .../manager/lookup/LookupDataHolder.java | 11 +- .../manager/lookup/SubscriptionContext.java | 7 +- .../lookup/TenantIdToSubscriptionContext.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 6 +- .../DatabaseBasedPersistenceManager.java | 2 +- .../manager/persistence/PersistenceManager.java | 4 +- .../RegistryBasedPersistenceManager.java | 4 +- .../DataInsertionAndRetrievalManager.java | 51 +- .../service/ApplicationManagementService.java | 2 +- .../subscription/DataCartridgeSubscription.java | 2 +- .../tenancy/SubscriptionTenancyBehaviour.java | 2 +- .../StratosManagerTopologyReceiver.java | 2 +- .../manager/test/CartridgeSubscriptionTest.java | 72 ++- .../manager/test/LookupDataHolderTest.java | 282 +++++++++ .../stratos/manager/test/PolicyHolderTest.java | 168 +++--- .../messaging/domain/topology/Member.java | 12 +- .../org/apache/stratos/rest/endpoint/Utils.java | 13 +- .../rest/endpoint/bean/topology/Cluster.java | 20 + .../rest/endpoint/bean/topology/Member.java | 18 + .../bean/util/converter/PojoConverter.java | 50 +- .../endpoint/context/AuthenticationContext.java | 38 ++ ...tractAuthenticationAuthorizationHandler.java | 11 +- .../CookieBasedAuthenticationHandler.java | 91 +++ .../rest/endpoint/handlers/OAuthHandler.java | 2 + .../handlers/StratosAuthenticationHandler.java | 9 +- .../handlers/StratosAuthorizingHandler.java | 34 +- .../endpoint/services/AuthenticationAdmin.java | 67 +++ .../rest/endpoint/services/ServiceUtils.java | 157 ++++- .../rest/endpoint/services/StratosAdmin.java | 80 ++- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 26 +- .../extension/FaultHandlingWindowProcessor.java | 2 +- .../src/main/bin/haproxy-extension.sh | 4 +- .../src/main/conf/log4j.properties | 1 + .../stratos/haproxy/extension/Constants.java | 36 ++ .../haproxy/extension/HAProxyConfigWriter.java | 6 +- .../haproxy/extension/HAProxyContext.java | 62 +- .../apache/stratos/haproxy/extension/Main.java | 2 +- .../main/resources/conf/cloud-controller.xml | 2 - .../distribution/src/main/conf/autoscaler.xml | 35 +- .../distribution/src/main/conf/scaling.drl | 26 +- .../distribution/src/main/bin/stratos.bat | 2 +- .../distribution/src/main/bin/stratos.sh | 1 + products/stratos-manager/conf/log4j.properties | 168 ++++++ .../conf/temp-artifacts/carbon/module.xml | 47 ++ .../carbon/scripts/registry/artifacts.js | 574 ++++++++++++++++++ .../carbon/scripts/registry/registry-osgi.js | 445 ++++++++++++++ .../carbon/scripts/registry/registry-ws.js | 56 ++ .../carbon/scripts/registry/registry.js | 24 + .../carbon/scripts/server/config.js | 32 + .../carbon/scripts/server/osgi.js | 10 + .../carbon/scripts/server/server.js | 90 +++ .../carbon/scripts/server/tenant.js | 49 ++ .../carbon/scripts/user/registry-space.js | 39 ++ .../temp-artifacts/carbon/scripts/user/space.js | 10 + .../carbon/scripts/user/user-manager.js | 158 +++++ .../temp-artifacts/carbon/scripts/user/user.js | 78 +++ .../temp-artifacts/sso/scripts/sso.client.js | 4 +- .../modules/distribution/src/assembly/bin.xml | 77 +-- tools/puppet/manifests/classes/mysql.pp | 122 ++++ tools/puppet/manifests/nodes.pp | 16 +- tools/stratos-installer/README.txt | 38 +- tools/stratos-installer/conf/setup.conf | 5 +- .../config/as/repository/conf/autoscaler.xml | 39 ++ .../stratos-installer/config/cc/bin/stratos.sh | 304 ---------- .../cc/repository/conf/cloud-controller.xml | 6 - .../config/cc/repository/conf/jndi.properties | 2 +- .../repository/conf/cartridge-config.properties | 6 +- tools/stratos-installer/setup.sh | 48 +- 209 files changed, 7715 insertions(+), 2533 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70a006d6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
