Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d05eda2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d05eda2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d05eda2f Branch: refs/heads/master Commit: d05eda2f7536cab4818abd1fecba9384d75f21b2 Parents: 25c7620 91970c3 Author: Imesh Gunaratne <[email protected]> Authored: Sat Dec 7 23:52:13 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sat Dec 7 23:52:13 2013 +0530 ---------------------------------------------------------------------- .../DatabaseBasedPersistenceManager.java | 19 +- .../ApplicationCartridgeSubscription.java | 86 ++++ .../mgt/subscription/CartridgeSubscription.java | 46 +- .../subscription/CartridgeSubscription_old.java | 431 +++++++++++++++++++ .../subscription/DataCartridgeSubscription.java | 49 ++- .../DataCartridgeSubscription_old.java | 127 ++++++ .../FrameworkCartridgeSubscription.java | 78 ++++ .../subscription/LBCartridgeSubscription.java | 51 +++ .../MultiTenantCartridgeSubscription.java | 268 ++++++------ .../SingleTenantCartridgeSubscription.java | 272 ++++++------ .../factory/CartridgeSubscriptionFactory.java | 33 +- .../SubscriptionMultiTenantBehaviour.java | 119 +++++ .../SubscriptionSingleTenantBehaviour.java | 120 ++++++ .../tenancy/SubscriptionTenancyBehaviour.java | 54 +++ .../adc/mgt/test/CartridgeSubscriptionTest.java | 1 - 15 files changed, 1429 insertions(+), 325 deletions(-) ----------------------------------------------------------------------
