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/4bf74560 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4bf74560 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4bf74560 Branch: refs/heads/master Commit: 4bf745608159ee765921d362d133b6d12808c4ee Parents: ca4b8f4 de73990 Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 10 17:48:39 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 10 17:48:39 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 4 +- .../org/apache/stratos/adc/mgt/dao/Cluster.java | 4 +- .../adc/mgt/listener/TenantStatusListner.java | 42 + .../ClusterIdToCartridgeSubscriptionMap.java | 70 + .../adc/mgt/lookup/LookupDataHolder.java | 254 ++ ...criptionAliasToCartridgeSubscriptionMap.java | 71 + .../apache/stratos/adc/mgt/payload/Payload.java | 7 +- .../DatabaseBasedPersistenceManager.java | 2816 +++++++++--------- .../adc/mgt/persistence/PersistenceManager.java | 28 +- .../RegistryBasedPersistenceManager.java | 125 + .../adc/mgt/registry/RegistryManager.java | 138 + .../stratos/adc/mgt/repository/Repository.java | 4 +- .../adc/mgt/retriever/DataRetrievalManager.java | 184 ++ .../stratos/adc/mgt/subscriber/Subscriber.java | 4 +- .../mgt/subscription/CartridgeSubscription.java | 12 +- .../tenancy/SubscriptionTenancyBehaviour.java | 3 +- .../stratos/adc/mgt/utils/Deserializer.java | 52 + .../stratos/adc/mgt/utils/Serializer.java | 83 + .../bean/util/converter/PojoConverter.java | 14 +- .../rest/endpoint/services/ServiceUtils.java | 2 +- .../pom.xml | 8 +- 21 files changed, 2487 insertions(+), 1438 deletions(-) ----------------------------------------------------------------------
