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/3596c3b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3596c3b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3596c3b9 Branch: refs/heads/master Commit: 3596c3b998387503a416ae7eeb0734b32a57af43 Parents: 1747003 9f69444 Author: Udara Liyanage <[email protected]> Authored: Fri Nov 29 09:02:58 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Fri Nov 29 09:02:58 2013 -0500 ---------------------------------------------------------------------- .../client/CloudControllerServiceClient.java | 53 +- .../stratos/adc/mgt/dto/SubscriptionInfo.java | 2 + .../manager/CartridgeSubscriptionManager.java | 4 +- .../adc/mgt/payload/NonCarbonPayload.java | 6 +- .../stratos/adc/mgt/payload/PayloadArg.java | 2 +- .../DatabaseBasedPersistenceManager.java | 2 +- .../service/ApplicationManagementService.java | 2 +- .../adc/mgt/service/RepositoryInfoBean.java | 3 +- .../mgt/subscription/CartridgeSubscription.java | 2 +- .../subscription/DataCartridgeSubscription.java | 2 +- .../MultiTenantCartridgeSubscription.java | 2 +- .../SingleTenantCartridgeSubscription.java | 2 +- .../factory/CartridgeSubscriptionFactory.java | 2 +- .../mgt/utils/ApplicationManagementUtil.java | 524 ++- .../adc/mgt/test/CartridgeSubscriptionTest.java | 3 +- .../stratos/adc/mgt/test/PayloadTest.java | 5 +- .../stratos/autoscaler/ClusterContext.java | 62 +- .../stratos/autoscaler/ClusterMonitor.java | 163 + .../stratos/autoscaler/PartitionContext.java | 78 + .../algorithm/AutoscaleAlgorithm.java | 16 +- .../autoscaler/algorithm/OneAfterAnother.java | 106 +- .../PartitionGroupOneAfterAnother.java | 120 +- .../autoscaler/algorithm/RoundRobin.java | 110 +- .../cloud/controller/CloudControllerClient.java | 102 +- .../exception/PolicyValidationException.java | 19 + .../autoscaler/exception/SpawningException.java | 12 +- .../exception/TerminationException.java | 4 + .../internal/AutoscalerServerComponent.java | 26 +- .../health/HealthEventMessageDelegator.java | 61 +- .../autoscaler/policy/PolicyManager.java | 2 +- .../deployers/DeploymentPolicyDeployer.java | 2 +- .../deployers/DeploymentPolicyReader.java | 39 +- .../policy/model/DeploymentPolicy.java | 67 - .../autoscaler/policy/model/Partition.java | 87 - .../autoscaler/policy/model/PartitionGroup.java | 81 - .../rule/AutoscalerRuleEvaluator.java | 134 +- .../autoscaler/rule/ExecutorTaskScheduler.java | 58 +- .../processors/AutoscalerTopologyReceiver.java | 267 ++ .../topology/processors/TopologyReceiver.java | 80 + .../stratos/autoscaler/util/AutoscalerUtil.java | 75 +- .../stratos/autoscaler/TestKnowledgeBase.java | 58 +- .../policy/DeploymentPolicyDeployerTest.java | 53 + .../src/test/resources/autoscaler.drl | 124 + .../src/test/resources/deployment-policy.xml | 16 + .../test/resources/minimum-autoscaler-rule.drl | 62 + .../resources/test-minimum-autoscaler-rule.drl | 34 + .../org.apache.stratos.cloud.controller/pom.xml | 10 +- .../controller/axiom/AxiomXpathParser.java | 3431 +++++++++--------- .../controller/axiom/AxiomXpathParserUtil.java | 263 ++ .../axiom/parser/CartridgeConfigParser.java | 384 ++ .../parser/CloudControllerConfigParser.java | 205 ++ .../axiom/parser/IaasProviderConfigParser.java | 308 ++ .../axiom/parser/ServiceConfigParser.java | 563 +++ .../controller/concurrent/ThreadExecutor.java | 4 +- .../controller/deployers/CartridgeDeployer.java | 46 +- .../deployers/CloudControllerDeployer.java | 94 +- .../controller/deployers/ServiceDeployer.java | 216 +- .../deployment/partition/Partition.java | 130 + .../deployment/partition/PartitionGroup.java | 87 + .../deployment/policy/DeploymentPolicy.java | 93 + .../InvalidCartridgeTypeException.java | 38 + .../exception/InvalidClusterException.java | 38 + .../exception/InvalidHostException.java | 38 + .../exception/InvalidIaasProviderException.java | 39 + .../exception/InvalidMemberException.java | 38 + .../exception/InvalidPartitionException.java | 38 + .../exception/InvalidRegionException.java | 38 + .../exception/InvalidZoneException.java | 38 + .../exception/UnregisteredClusterException.java | 33 + .../exception/UnregisteredServiceException.java | 33 - .../hector/CassandraDataRetriever.java | 6 +- .../controller/hive/HiveQueryExecutor.java | 12 +- .../cloud/controller/iaases/AWSEC2Iaas.java | 113 +- .../controller/iaases/OpenstackNovaIaas.java | 96 +- .../cloud/controller/iaases/VCloudIaas.java | 27 +- .../impl/CloudControllerServiceImpl.java | 1245 ++++--- .../interfaces/CloudControllerService.java | 127 +- .../cloud/controller/interfaces/Iaas.java | 44 +- .../jcloud/ComputeServiceBuilderUtil.java | 3 +- .../stratos/cloud/controller/pojo/AppType.java | 62 + .../cloud/controller/pojo/Cartridge.java | 288 ++ .../cloud/controller/pojo/CartridgeInfo.java | 163 + .../controller/pojo/CartridgeInstanceData.java | 130 + .../cloud/controller/pojo/ClusterContext.java | 76 + .../controller/pojo/DataPublisherConfig.java | 82 + .../stratos/cloud/controller/pojo/Host.java | 73 + .../cloud/controller/pojo/IaasContext.java | 162 + .../cloud/controller/pojo/IaasProvider.java | 271 ++ .../cloud/controller/pojo/LocationScope.java | 70 + .../cloud/controller/pojo/MemberContext.java | 89 + .../cloud/controller/pojo/PortMapping.java | 64 + .../cloud/controller/pojo/Properties.java | 37 + .../stratos/cloud/controller/pojo/Property.java | 54 + .../stratos/cloud/controller/pojo/Region.java | 125 + .../cloud/controller/pojo/Registrant.java | 79 + .../cloud/controller/pojo/ServiceContext.java | 366 ++ .../cloud/controller/pojo/TopologyConfig.java | 59 + .../stratos/cloud/controller/pojo/Zone.java | 90 + .../CartridgeInstanceDataPublisherTask.java | 9 +- .../runtime/FasterLookUpDataHolder.java | 187 +- .../controller/topology/TopologyBuilder.java | 192 +- .../topology/TopologyEventSender.java | 107 +- .../stratos/cloud/controller/util/AppType.java | 62 - .../cloud/controller/util/Cartridge.java | 255 -- .../cloud/controller/util/CartridgeInfo.java | 163 - .../controller/util/CartridgeInstanceData.java | 130 - .../util/CloudControllerConstants.java | 8 + .../controller/util/CloudControllerUtil.java | 26 + .../stratos/cloud/controller/util/Host.java | 73 - .../cloud/controller/util/IaasContext.java | 162 - .../cloud/controller/util/IaasProvider.java | 271 -- .../cloud/controller/util/LocationScope.java | 70 - .../cloud/controller/util/PortMapping.java | 64 - .../cloud/controller/util/Properties.java | 37 - .../stratos/cloud/controller/util/Property.java | 53 - .../stratos/cloud/controller/util/Region.java | 125 - .../cloud/controller/util/ServiceContext.java | 382 -- .../cloud/controller/util/TopologyConfig.java | 59 - .../stratos/cloud/controller/util/Zone.java | 90 - .../validate/AWSEC2PartitionValidator.java | 94 + .../OpenstackNovaPartitionValidator.java | 97 + .../validate/interfaces/PartitionValidator.java | 47 + .../src/main/resources/META-INF/component.xml | 4 +- .../service/axiom/AxiomValidationTest.java | 57 +- .../service/axiom/AxiomXpathParserTest.java | 21 +- .../service/util/ServiceContextTest.java | 3 +- components/org.apache.stratos.messaging/pom.xml | 6 + .../messaging/domain/topology/Cluster.java | 2 +- .../messaging/domain/topology/Member.java | 8 - .../messaging/domain/topology/Partition.java | 67 - .../stratos/messaging/domain/topology/Port.java | 5 +- .../messaging/domain/topology/Scope.java | 2 +- .../messaging/domain/topology/Service.java | 7 +- .../messaging/domain/topology/Topology.java | 36 +- .../event/topology/ClusterCreatedEvent.java | 9 + .../event/topology/InstanceSpawnedEvent.java | 10 +- .../event/topology/PartitionCreatedEvent.java | 60 +- .../CompleteTopologyEventProcessor.java | 3 - .../topology/InstanceSpawnedEventProcessor.java | 1 - .../stratos/messaging/util/Properties.java | 37 + .../apache/stratos/messaging/util/Property.java | 54 + .../org.apache.stratos.rest.endpoint/pom.xml | 6 + .../rest/endpoint/services/ServiceUtils.java | 2 +- .../executionplans/AverageHeathRequest.xml | 3 + .../src/main/bin/health-publisher.sh | 2 +- .../health/publisher/HealthPublisherClient.java | 25 + .../pom.xml | 11 +- .../main/resources/CloudControllerService.wsdl | 458 +-- 148 files changed, 10855 insertions(+), 5759 deletions(-) ----------------------------------------------------------------------
