You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/10 10:43:31 UTC

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

Branch: refs/heads/master
Commit: 7f4b680cb4dba554020168fef9e4a17296b1364d
Parents: b0c9215 a3c0948
Author: Nirmal Fernando <ni...@apache.org>
Authored: Mon Mar 10 15:12:22 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Mon Mar 10 15:12:22 2014 +0530

----------------------------------------------------------------------
 .../behaviour/CartridgeMgtBehaviour.java        | 120 ++++-
 .../stratos/manager/deploy/service/Service.java |  64 +--
 .../service/ServiceDeploymentManager.java       | 475 +++++++++++--------
 .../service/multitenant/MultiTenantService.java |  12 +-
 .../multitenant/lb/MultiTenantLBService.java    |  15 +-
 .../category/DefaultLoadBalancerCategory.java   |  24 +
 .../category/ExistingLoadBalancerCategory.java  |  53 +++
 .../manager/lb/category/LBDataContext.java      | 107 +++++
 .../lb/category/LoadBalancerCategory.java       |  35 ++
 .../ServiceLevelLoadBalancerCategory.java       |  44 ++
 .../manager/CartridgeSubscriptionManager.java   | 255 +++++++---
 .../ApplicationCartridgeSubscription.java       |   3 +-
 .../subscription/CartridgeSubscription.java     |  38 +-
 .../subscription/DataCartridgeSubscription.java |   3 +-
 .../FrameworkCartridgeSubscription.java         |  19 +
 .../subscription/LBCartridgeSubscription.java   |  66 ++-
 .../subscription/PersistenceContext.java        |  67 +++
 .../manager/subscription/SubscriptionData.java  |  13 +-
 .../factory/CartridgeSubscriptionFactory.java   |  46 +-
 .../SubscriptionSingleTenantBehaviour.java      |  26 +-
 .../tenancy/SubscriptionTenancyBehaviour.java   |  27 +-
 .../utils/CartridgeSubscriptionUtils.java       | 293 +++++++++++-
 .../rest/endpoint/services/ServiceUtils.java    | 351 +-------------
 23 files changed, 1339 insertions(+), 817 deletions(-)
----------------------------------------------------------------------