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/d4d18a86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d4d18a86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d4d18a86 Branch: refs/heads/master Commit: d4d18a86ad45be105835b088545b53c9cc250a21 Parents: b4d75a0 2274042 Author: Melan Nimesh <[email protected]> Authored: Mon Feb 10 18:23:32 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Mon Feb 10 18:23:32 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 29 +- .../topology/AutoscalerTopologyReceiver.java | 60 +- .../stratos/cli/commands/ExitCommand.java | 19 +- .../controller/iaases/OpenstackNovaIaas.java | 19 +- .../impl/CloudControllerServiceImpl.java | 14 +- .../cloud/controller/pojo/ClusterContext.java | 12 +- .../cloud/controller/pojo/MemberContext.java | 39 + .../runtime/FasterLookUpDataHolder.java | 3 + .../controller/topology/TopologyBuilder.java | 5 +- .../topology/TopologyEventPublisher.java | 2 +- .../console/config/console.js | 23 +- .../console/config/console.json | 8 +- .../console/configure_stratos.jag | 8 +- .../console/controllers/login.jag | 2 +- .../console/controllers/logout.jag | 5 +- .../console/controllers/router.jag | 19 +- .../console/controllers/wizardSubmit.jag | 6 +- .../partials/configure_stratos_wizard.hbs | 152 +- .../theme1/renderers/configure_stratos.js | 9 +- .../renderers/configure_stratos_wizard.js | 3 +- .../console/themes/theme1/ui/js/wizard.js | 26 +- .../console/util/utility.jag | 4 +- .../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 | 69 +- .../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 + 60 files changed, 348 insertions(+), 4801 deletions(-) ----------------------------------------------------------------------
