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/98f9ba35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/98f9ba35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/98f9ba35 Branch: refs/heads/master Commit: 98f9ba35d78f33e887f885f1d947af580dddeaab Parents: af8cba0 a1e7acb Author: Nirmal Fernando <[email protected]> Authored: Thu Feb 13 00:38:49 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Feb 13 00:38:49 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 72 +- .../apache/stratos/cartridge/agent/Main.java | 1 + .../config/CartridgeAgentConfiguration.java | 15 + .../agent/data/publisher/DataContext.java | 52 ++ .../agent/data/publisher/DataPublisher.java | 97 ++ .../publisher/DataPublisherConfiguration.java | 161 ++++ .../exception/DataPublisherException.java | 31 + .../agent/data/publisher/log/Constants.java | 29 + .../publisher/log/FileBasedLogPublisher.java | 109 +++ .../agent/data/publisher/log/LogPublisher.java | 49 + .../data/publisher/log/LogPublisherManager.java | 105 +++ .../publisher/HealthStatisticsNotifier.java | 2 +- .../publisher/HealthStatisticsReader.java | 3 +- .../agent/util/CartridgeAgentConstants.java | 3 + .../agent/util/CartridgeAgentUtils.java | 12 +- .../apache/stratos/cli/GenericRestClient.java | 2 +- .../java/org/apache/stratos/cli/RestClient.java | 31 +- .../stratos/cli/RestCommandLineService.java | 230 ++++- .../apache/stratos/cli/StratosApplication.java | 22 +- .../beans/cartridge/ServiceDefinitionBean.java | 86 ++ .../cli/commands/ActivateTenantCommand.java | 70 ++ .../cli/commands/DeactivateTenantCommand.java | 70 ++ .../cli/commands/DeleteTenantCommand.java | 70 ++ .../cli/commands/ListDeployServiceCommand.java | 65 ++ .../UndeployCartridgeDefinitionCommand.java | 70 ++ .../UndeployServiceDefinitionCommand.java | 2 +- .../apache/stratos/cli/utils/CliConstants.java | 27 +- .../console/configure_stratos.jag | 18 +- .../console/configure_stratos_wizard.jag | 15 +- .../console/controllers/router.jag | 8 +- .../console/controllers/wizardSubmit.jag | 3 + .../console/lbs.jag | 20 - .../partials/configure_stratos_wizard.hbs | 90 +- .../console/themes/theme1/partials/header.hbs | 80 +- .../console/themes/theme1/partials/lbs.hbs | 88 -- .../theme1/renderers/cartridge_deployments.js | 45 - .../console/themes/theme1/renderers/lbs.js | 47 - .../theme1/renderers/mt_service_deployments.js | 48 - .../theme1/renderers/partition_deployments.js | 46 - .../theme1/renderers/policy_deployments.js | 46 - .../console/util/utility.jag | 13 + .../DataCartridgeSubscriptionConnector.java | 34 +- .../stratos/manager/deploy/service/Service.java | 7 +- .../service/ServiceDeploymentManager.java | 24 + .../internal/ADCManagementServerComponent.java | 2 - .../manager/CartridgeSubscriptionManager.java | 15 + .../manager/persistence/PersistenceManager.java | 2 + .../RegistryBasedPersistenceManager.java | 95 ++ .../DataInsertionAndRetrievalManager.java | 5 + .../service/ApplicationManagementService.java | 677 -------------- .../InstanceInformationManagementService.java | 58 -- .../service/RepoNotificationService.java | 128 --- .../subscription/CartridgeSubscription.java | 71 +- .../SubscriptionSingleTenantBehaviour.java | 12 +- .../utils/CartridgeSubscriptionUtils.java | 5 + .../utils/ApplicationManagementUtil.java | 857 +----------------- .../manager/utils/CartridgeConstants.java | 23 - .../manager/utils/PersistenceManager.java | 892 ------------------- .../manager/utils/RepositoryFactory.java | 131 --- .../stratos/manager/utils/StratosDBUtils.java | 213 ----- .../src/main/resources/META-INF/services.xml | 57 +- .../bean/util/converter/PojoConverter.java | 25 + .../stratos/rest/endpoint/mock/MockContext.java | 10 + .../rest/endpoint/mock/StratosTestAdmin.java | 26 +- .../rest/endpoint/services/ServiceUtils.java | 67 +- .../rest/endpoint/services/StratosAdmin.java | 21 + .../resources/conf/cartridge-config.properties | 64 -- .../src/main/resources/p2.inf | 1 - .../distribution/src/main/conf/autoscaler.xml | 3 + .../distribution/src/main/bin/stratos.sh | 12 +- .../src/main/conf/cartridge-config.properties | 42 +- 71 files changed, 1924 insertions(+), 3708 deletions(-) ----------------------------------------------------------------------
