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/07 19:18:22 UTC

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

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into subscription


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/91970c3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/91970c3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/91970c3a

Branch: refs/heads/master
Commit: 91970c3ac34632e332bbed6b6daad193563623a7
Parents: 702d5ca aa550b6
Author: Isuru <is...@wso2.com>
Authored: Sat Dec 7 23:47:11 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sat Dec 7 23:47:11 2013 +0530

----------------------------------------------------------------------
 components/org.apache.stratos.adc.mgt/pom.xml   |  17 +-
 .../internal/ADCManagementServerComponent.java  |  61 +++++-
 .../mgt/internal/ServiceReferenceHolder.java    |  51 +++++
 .../adc/mgt/publisher/TenantEventPublisher.java | 114 +++++++++++
 .../TenantSynchronizerTaskScheduler.java        |  76 +++++++
 .../mgt/publisher/TenantSynzhronizerTask.java   |  74 +++++++
 .../service/ApplicationManagementService.java   | 118 +++++++----
 .../autoscaler/api/AutoScalerServiceImpl.java   |   7 +-
 .../exception/AutoScalerException.java          |  37 ++++
 .../autoscaler/partition/PartitionManager.java  |  47 +++--
 .../partition/deployers/PartitionDeployer.java  |  14 +-
 .../autoscaler/registry/RegistryManager.java    |  21 +-
 .../autoscaler/util/AutoScalerConstants.java    |   2 +-
 .../controller/topology/TopologyBuilder.java    |   2 +-
 .../topology/TopologyEventSender.java           |   5 +-
 .../common/listeners/TenantMgtListener.java     |   2 +
 .../keystore/mgt/KeystoreTenantMgtListener.java |   4 +
 .../conf/LoadBalancerConfiguration.java         | 202 ++++++++++++-------
 .../conf/configurator/SynapseConfigurator.java  |   4 +-
 .../balancer/conf/domain/TenantIdentifier.java  |   8 +
 .../load/balancer/conf/util/Constants.java      |   9 +-
 .../internal/LoadBalancerServiceComponent.java  |  19 +-
 .../test/LoadBalancerConfigurationTest.java     |  12 +-
 .../sample/configuration/loadbalancer1.conf     |  17 +-
 .../sample/configuration/loadbalancer2.conf     |  17 +-
 .../sample/configuration/loadbalancer3.conf     |  17 +-
 .../stratos/messaging/domain/tenant/Tenant.java |  17 ++
 .../messaging/domain/topology/Cluster.java      |  23 +++
 .../messaging/domain/topology/Service.java      |  30 +--
 .../messaging/domain/topology/ServiceType.java  |  27 +++
 .../event/tenant/CompleteTenantEvent.java       |  42 ++++
 .../event/tenant/TenantSubscribedEvent.java     |  45 +++++
 .../event/tenant/TenantUnSubscribedEvent.java   |  45 +++++
 .../event/topology/ClusterRemovedEvent.java     |  12 +-
 .../event/topology/ServiceCreatedEvent.java     |  13 +-
 .../tenant/CompleteTenantEventListener.java     |  28 +++
 .../tenant/TenantSubscribedEventListener.java   |  28 +++
 .../tenant/TenantUnSubscribedEventListener.java |  28 +++
 .../tenant/CompleteTenantMessageProcessor.java  |  14 +-
 .../tenant/TenantCreatedMessageProcessor.java   |   7 +-
 .../tenant/TenantMessageProcessorChain.java     |   7 +
 .../tenant/TenantRemovedMessageProcessor.java   |   7 +-
 .../TenantSubscribedMessageProcessor.java       |  88 ++++++++
 .../TenantUnSubscribedMessageProcessor.java     |  88 ++++++++
 .../tenant/TenantUpdatedMessageProcessor.java   |   7 +-
 .../ClusterRemovedMessageProcessor.java         |   9 +-
 .../ServiceCreatedMessageProcessor.java         |   2 +-
 .../message/receiver/tenant/TenantManager.java  |   7 +
 .../sender/listener/EmailSenderListener.java    |  10 +-
 .../mgt/services/TenantMgtAdminService.java     |   9 +
 .../stratos/tenant/mgt/util/TenantMgtUtil.java  |   9 +-
 .../theme/mgt/util/ThemeLoadingListener.java    |  20 +-
 .../src/main/conf/loadbalancer.conf             |  15 +-
 .../config/lb/repository/conf/loadbalancer.conf |   6 +-
 54 files changed, 1330 insertions(+), 270 deletions(-)
----------------------------------------------------------------------