You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/10 21:12:43 UTC
[3/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c07f4595
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c07f4595
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c07f4595
Branch: refs/heads/master
Commit: c07f459558fd17c8e6c5ab0d16e3d23528a65920
Parents: c66b090 93ee236
Author: Isuru <is...@wso2.com>
Authored: Tue Dec 10 15:18:01 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Tue Dec 10 15:18:01 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 67 +-
.../client/CloudControllerServiceClient.java | 3 +-
.../org/apache/stratos/adc/mgt/dao/Cluster.java | 4 +-
.../adc/mgt/listener/TenantStatusListner.java | 42 +
.../ClusterIdToCartridgeSubscriptionMap.java | 70 +
.../adc/mgt/lookup/LookupDataHolder.java | 254 ++
...criptionAliasToCartridgeSubscriptionMap.java | 71 +
.../manager/CartridgeSubscriptionManager.java | 19 +-
.../adc/mgt/payload/NonCarbonPayload.java | 13 +-
.../apache/stratos/adc/mgt/payload/Payload.java | 7 +-
.../DatabaseBasedPersistenceManager.java | 2817 +++++++++---------
.../adc/mgt/persistence/PersistenceManager.java | 28 +-
.../RegistryBasedPersistenceManager.java | 125 +
.../adc/mgt/registry/RegistryManager.java | 138 +
.../stratos/adc/mgt/repository/Repository.java | 4 +-
.../adc/mgt/retriever/DataRetrievalManager.java | 184 ++
.../service/ApplicationManagementService.java | 2 +-
.../stratos/adc/mgt/subscriber/Subscriber.java | 4 +-
.../ApplicationCartridgeSubscription.java | 9 +-
.../mgt/subscription/CartridgeSubscription.java | 41 +-
.../subscription/CartridgeSubscription_old.java | 8 +-
.../subscription/DataCartridgeSubscription.java | 13 +-
.../DataCartridgeSubscription_old.java | 4 +-
.../FrameworkCartridgeSubscription.java | 9 +-
.../MultiTenantCartridgeSubscription.java | 2 +-
.../SingleTenantCartridgeSubscription.java | 2 +-
.../SubscriptionSingleTenantBehaviour.java | 2 +
.../tenancy/SubscriptionTenancyBehaviour.java | 3 +-
.../mgt/utils/ApplicationManagementUtil.java | 10 +-
.../stratos/adc/mgt/utils/Deserializer.java | 52 +
.../stratos/adc/mgt/utils/Serializer.java | 83 +
.../autoscaler/policy/PolicyManager.java | 10 +-
.../autoscaler/registry/RegistryManager.java | 2 +-
.../rule/AutoscalerRuleEvaluator.java | 36 +-
.../cloud/controller/pojo/Registrant.java | 10 +-
.../stratos/load/balancer/EndpointDeployer.java | 8 +-
.../balancer/LoadBalancerTenantReceiver.java | 45 +-
.../balancer/LoadBalancerTopologyReceiver.java | 4 +-
.../stratos/load/balancer/RequestDelegator.java | 12 +-
.../conf/LoadBalancerConfiguration.java | 37 +-
.../conf/configurator/JndiConfigurator.java | 5 +-
.../conf/configurator/SynapseConfigurator.java | 20 +-
.../load/balancer/conf/structure/Node.java | 181 +-
.../balancer/conf/structure/NodeBuilder.java | 34 +-
.../load/balancer/conf/util/Constants.java | 2 +
.../balancer/context/LoadBalancerContext.java | 177 +-
.../context/LoadBalancerContextUtil.java | 56 +-
.../context/map/ClusterIdClusterContextMap.java | 61 +
.../context/map/ClusterIdClusterMap.java | 57 +
.../context/map/HostNameClusterMap.java | 63 +
.../context/map/MultiTenantClusterMap.java | 66 +
.../map/ServiceNameServiceContextMap.java | 58 +
.../TenantIdSynapseEnvironmentServiceMap.java | 63 +
.../TenantAwareLoadBalanceEndpoint.java | 18 +-
.../internal/LoadBalancerServiceComponent.java | 24 +-
.../balancer/mediators/ResponseInterceptor.java | 7 +-
...adBalancerInFlightRequestCountCollector.java | 138 +-
.../stratos/load/balancer/util/Constants.java | 3 +-
.../test/LoadBalancerConfigurationTest.java | 5 +-
.../sample/configuration/loadbalancer1.conf | 2 +-
.../sample/configuration/loadbalancer2.conf | 4 +-
.../sample/configuration/loadbalancer3.conf | 2 +-
.../messaging/domain/topology/Cloud.java | 84 -
.../messaging/domain/topology/Cluster.java | 32 +-
.../messaging/domain/topology/Region.java | 79 -
.../stratos/messaging/domain/topology/Zone.java | 55 -
.../tenant/TenantMessageProcessorChain.java | 13 +-
.../rest/endpoint/bean/CartridgeInfoBean.java | 19 +-
.../autoscaler/partition/PartitionGroup.java | 2 +-
.../policy/deployment/DeploymentPolicy.java | 4 +
.../bean/util/converter/PojoConverter.java | 153 +-
.../rest/endpoint/services/ServiceUtils.java | 90 +-
.../rest/endpoint/services/StratosAdmin.java | 60 +-
.../ec2/load-balancer/start-load-balancer.sh | 70 +
.../templates/loadbalancer.conf.template | 126 +
.../src/main/conf/loadbalancer.conf | 4 +-
.../pom.xml | 5 +-
.../src/main/resources/AutoScalerService.wsdl | 455 ++-
.../main/resources/CloudControllerService.wsdl | 13 +-
79 files changed, 4298 insertions(+), 2266 deletions(-)
----------------------------------------------------------------------