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/06 15:57:25 UTC
[2/3] git commit: fixing a conflict
fixing a conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d5268242
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d5268242
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d5268242
Branch: refs/heads/master
Commit: d52682422b965577591b0b5c698db4d94c678e29
Parents: e8d0886 8305902
Author: Isuru <is...@wso2.com>
Authored: Fri Dec 6 20:09:03 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Dec 6 20:09:03 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 1 +
.../mgt/internal/TopologyMgtDSComponent.java | 4 +-
.../org.apache.stratos.autoscaler/pom.xml | 3 -
.../autoscaler/api/AutoScalerServiceImpl.java | 6 +-
.../interfaces/AutoScalerServiceInterface.java | 4 +-
.../internal/AutoscalerActivator.java | 66 ---
.../internal/AutoscalerServerComponent.java | 2 +-
.../topology/AutoscalerTopologyReceiver.java | 308 +++++++++++++
.../processors/AutoscalerTopologyReceiver.java | 307 -------------
.../topology/processors/TopologyReceiver.java | 79 ----
.../common/topology/TopologyReceiver.java | 80 ----
.../extension/api/LoadBalancerExtension.java | 10 +-
.../balancer/LoadBalancerTopologyReceiver.java | 2 +-
.../event/topology/CompleteTopologyEvent.java | 4 +-
.../tenant/CompleteTenantMessageProcessor.java | 78 ++++
.../tenant/TenantCreatedMessageProcessor.java | 9 +-
.../tenant/TenantMessageProcessorChain.java | 74 ++++
.../tenant/TenantRemovedMessageProcessor.java | 9 +-
.../tenant/TenantUpdatedMessageProcessor.java | 9 +-
.../tenant/TenantEventMessageDelegator.java | 97 +++++
.../tenant/TenantEventMessageListener.java | 55 +++
.../tenant/TenantEventMessageQueue.java | 44 ++
.../message/receiver/tenant/TenantManager.java | 9 +
.../message/receiver/tenant/TenantReceiver.java | 78 ++++
.../topology/TopologyEventMessageDelegator.java | 6 +-
.../topology/TopologyEventMessageListener.java | 53 +++
.../topology/TopologyEventMessageQueue.java | 45 ++
.../topology/TopologyEventMessageReceiver.java | 53 ---
.../receiver/topology/TopologyEventQueue.java | 45 --
.../receiver/topology/TopologyReceiver.java | 78 ++++
.../stratos/messaging/util/Constants.java | 1 +
.../src/main/resources/AutoScalerService.wsdl | 430 ++-----------------
service-stubs/pom.xml | 1 +
33 files changed, 997 insertions(+), 1053 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d5268242/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
----------------------------------------------------------------------