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/eb91034c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/eb91034c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/eb91034c Branch: refs/heads/master Commit: eb91034c647f3985cae9ccc2e71f6d5752194650 Parents: 7cc26b6 b746b90 Author: rekathiru <[email protected]> Authored: Mon Feb 10 10:12:06 2014 +0530 Committer: rekathiru <[email protected]> Committed: Mon Feb 10 10:12:06 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 29 +- .../topology/AutoscalerTopologyReceiver.java | 60 +- .../controller/deployers/CartridgeDeployer.java | 213 --- .../cloud/controller/iaases/AWSEC2Iaas.java | 121 +- .../controller/iaases/OpenstackNovaIaas.java | 114 +- .../cloud/controller/iaases/VCloudIaas.java | 53 +- .../impl/CloudControllerServiceImpl.java | 68 +- .../cloud/controller/interfaces/Iaas.java | 51 +- .../cloud/controller/pojo/ClusterContext.java | 12 +- .../cloud/controller/pojo/IaasProvider.java | 5 +- .../cloud/controller/pojo/MemberContext.java | 39 + .../runtime/FasterLookUpDataHolder.java | 3 + .../controller/topology/TopologyBuilder.java | 5 +- .../topology/TopologyEventPublisher.java | 2 +- .../controller/util/CloudControllerUtil.java | 30 + .../validate/AWSEC2PartitionValidator.java | 11 +- .../OpenstackNovaPartitionValidator.java | 10 +- .../manager/client/CartridgeAgentClient.java | 44 - .../stratos/manager/client/RegistryClient.java | 109 -- .../apache/stratos/manager/dns/DNSManager.java | 89 -- .../stratos/manager/domain/RegistryManager.java | 109 -- .../org/apache/stratos/manager/dto/AppRepo.java | 88 -- .../stratos/manager/dto/CartridgeDetail.java | 22 - .../manager/dto/CartridgeInformation.java | 22 - .../stratos/manager/internal/DataHolder.java | 8 - .../manager/internal/HostingConstants.java | 40 - .../internal/HostingManagementActivator.java | 63 - .../manager/lookup/ClusterIdToSubscription.java | 5 - .../manager/lookup/LookupDataHolder.java | 6 - .../manager/CartridgeSubscriptionManager.java | 333 ----- .../manager/payload/BasicPayloadData.java | 28 - .../stratos/manager/payload/CarbonPayload.java | 43 - .../stratos/manager/payload/DataPayload.java | 40 - .../manager/payload/NonCarbonPayload.java | 125 -- .../apache/stratos/manager/payload/Payload.java | 224 --- .../stratos/manager/payload/PayloadArg.java | 194 --- .../stratos/manager/payload/PayloadData.java | 16 +- .../DatabaseBasedPersistenceManager.java | 1408 ------------------ .../manager/persistence/PersistenceManager.java | 44 - .../RegistryBasedPersistenceManager.java | 216 --- .../manager/registry/RegistryManager.java | 130 -- .../DataInsertionAndRetrievalManager.java | 117 +- .../subscription/CartridgeSubscription_old.java | 431 ------ .../DataCartridgeSubscription_old.java | 127 -- .../MultiTenantCartridgeSubscription.java | 134 -- .../SingleTenantCartridgeSubscription.java | 136 -- .../SubscriptionMultiTenantBehaviour.java | 5 +- .../model/TopologyClusterInformationModel.java | 3 +- .../StratosManagerTopologyReceiver.java | 75 +- .../stratos/manager/utils/CartridgeAppType.java | 44 - .../stratos/manager/utils/CartridgeDomain.java | 146 -- .../stratos/manager/utils/DomainInfo.java | 43 - .../rest/endpoint/bean/topology/Cluster.java | 10 +- .../rest/endpoint/services/ServiceUtils.java | 2 +- .../rest/endpoint/services/StratosAdmin.java | 9 + .../pom.xml | 4 +- pom.xml | 2 +- 57 files changed, 430 insertions(+), 5090 deletions(-) ----------------------------------------------------------------------
