You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2013/07/02 10:19:05 UTC

[12/12] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

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/8a76dbf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8a76dbf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8a76dbf7

Branch: refs/heads/master
Commit: 8a76dbf71bbad74504221ff27bbc05f97019c745
Parents: 6724d97 27ed5a9
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Tue Jul 2 13:48:27 2013 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Tue Jul 2 13:48:27 2013 +0530

----------------------------------------------------------------------
 .../4.1.0/pom.xml                               |  31 +--
 .../4.1.0/src/main/Main2.iml                    | 205 ------------------
 .../4.1.0/src/main/Main5.iml                    | 205 ------------------
 .../autoscaler/service/IAutoscalerService.java  |  35 ++--
 .../exception/AutoscalerServiceException.java   |  35 ++--
 .../exception/DeserializationException.java     |  35 ++--
 .../MalformedConfigurationFileException.java    |  35 ++--
 .../exception/NoInstanceFoundException.java     |  33 +--
 .../exception/SerializationException.java       |  35 ++--
 .../service/impl/AutoscalerServiceImpl.java     |  33 +--
 .../internal/AutoscalerServiceDSComponent.java  |  19 ++
 .../autoscaler/service/io/Deserializer.java     |  33 +--
 .../autoscaler/service/io/Serializer.java       |  33 +--
 .../service/jcloud/ComputeServiceBuilder.java   |  35 ++--
 .../service/util/AutoscalerConstant.java        |  35 ++--
 .../autoscaler/service/util/IaasContext.java    |  35 ++--
 .../autoscaler/service/util/IaasProvider.java   |  35 ++--
 .../service/util/InstanceContext.java           |  35 ++--
 .../service/util/ServiceTemplate.java           |  35 ++--
 .../xml/ElasticScalerConfigFileReader.java      |  33 +--
 .../4.1.0/src/test/Test2.iml                    | 206 -------------------
 .../4.1.0/src/test/Test4.iml                    | 205 ------------------
 .../service/util/IaasContextComparatorTest.java |  35 ++--
 .../service/util/IaasContextTest.java           |  35 ++--
 .../xml/ElasticScalerConfigFileReaderTest.java  |  35 ++--
 .../test/resources/elastic-scaler-config.xml    |  31 +--
 .../4.1.3/pom.xml                               |  31 +--
 .../callables/AppNodeSanityCheckCallable.java   |  46 +++--
 .../callables/AutoscaleDeciderCallable.java     |  48 ++---
 .../callables/InstanceCountCallable.java        |  45 ++--
 .../callables/PendingInstanceCountCallable.java |  39 ++--
 .../callables/RunningInstanceCountCallable.java |  41 ++--
 .../clients/CloudControllerClient.java          |  35 ++--
 .../clients/CloudControllerOsgiClient.java      |  33 +--
 .../clients/CloudControllerStubClient.java      |  33 +--
 .../lbautoscale/context/AppDomainContext.java   |  35 ++--
 .../context/LoadBalancerContext.java            |  35 ++--
 .../AutoscalerTaskServiceComponent.java         |  55 +++--
 .../lbautoscale/internal/RegistryManager.java   |  31 +--
 .../mediators/AutoscaleInMediator.java          |  33 +--
 .../mediators/AutoscaleOutMediator.java         |  33 +--
 .../check/PendingInstancesStateChecker.java     |  35 ++--
 .../check/TerminatingInstancesStateChecker.java |  35 ++--
 .../task/AutoscalerTaskInitializer.java         |  29 +--
 .../task/AutoscalerTaskMgmtAdminService.java    |  29 +--
 .../lbautoscale/task/AutoscalingJob.java        |  29 +--
 .../lbautoscale/task/TaskSchedulingManager.java |  29 +--
 .../lbautoscale/util/AutoscaleConstants.java    |  31 +--
 .../lbautoscale/util/AutoscaleUtil.java         |  43 ++--
 .../util/AutoscalerTaskDSHolder.java            |  35 ++--
 .../lbautoscale/AppDomainContextsTest.java      |  35 ++--
 .../4.1.3/pom.xml                               |  31 +--
 .../stratos/lb/endpoint/EndpointConstants.java  |  29 +--
 .../stratos/lb/endpoint/EndpointDeployer.java   |  29 +--
 ...TenantAwareLoadBalanceEndpointException.java |  29 +--
 .../TenantLoadBalanceMembershipHandler.java     |  18 ++
 .../lb/endpoint/builder/TopologySyncher.java    |  18 ++
 .../manager/ClusterDomainManagerImpl.java       |  33 +--
 .../TenantAwareLoadBalanceEndpoint.java         |  18 ++
 .../group/mgt/GroupMgtAgentBuilder.java         |  18 ++
 .../LoadBalanceEndpointServiceComponent.java    |  31 +--
 .../lb/endpoint/internal/RegistryManager.java   |  31 +--
 .../endpoint/subscriber/TopicHealthChecker.java |  35 ++--
 .../endpoint/subscriber/TopologyListener.java   |  18 ++
 .../endpoint/subscriber/TopologySubscriber.java |  18 ++
 .../stratos/lb/endpoint/util/ConfigHolder.java  |  29 +--
 .../lb/endpoint/util/TopologyConstants.java     |  18 ++
 .../common/conf/LoadBalancerConfiguration.java  |  35 ++--
 .../LoadBalancerConfigurationDSComponent.java   |  35 ++--
 .../stratos/lb/common/conf/structure/Node.java  |  33 +--
 .../lb/common/conf/structure/NodeBuilder.java   |  33 +--
 .../stratos/lb/common/conf/util/Constants.java  |  35 ++--
 .../lb/common/conf/util/HostContext.java        |  35 ++--
 .../conf/util/LoadBalancerConfigUtil.java       |  31 +--
 .../common/conf/util/TenantDomainContext.java   |  35 ++--
 .../mgt/SubDomainAwareGroupManagementAgent.java |  35 ++--
 .../RequestTokenReplicationCommand.java         |  33 +--
 .../LoadBalancerConfigurationService.java       |  40 ++--
 .../LoadBalancerConfigurationServiceImpl.java   |  43 ++--
 .../stratos/lb/common/util/DomainMapping.java   |  18 ++
 .../test/LoadBalancerConfigurationTest.java     |  33 +--
 .../stratos/lb/common/test/NodeBuilderTest.java |  33 +--
 82 files changed, 1408 insertions(+), 1962 deletions(-)
----------------------------------------------------------------------