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/27d07cf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/27d07cf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/27d07cf2 Branch: refs/heads/master Commit: 27d07cf2e7e5841353545d9d6d6e695e9ba4f19e Parents: 5241cdd 98f9ba3 Author: Imesh Gunaratne <[email protected]> Authored: Wed Feb 12 20:26:54 2014 -0500 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Feb 12 20:26:54 2014 -0500 ---------------------------------------------------------------------- .gitignore | 3 + .../stratos/autoscaler/AutoscalerContext.java | 29 +- .../autoscaler/NetworkPartitionLbHolder.java | 41 +- .../topology/AutoscalerTopologyReceiver.java | 91 +- .../autoscaler/partition/PartitionManager.java | 14 + .../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 +- .../java/org/apache/stratos/cli/CliTool.java | 2 +- .../stratos/cli/CommandLineApplication.java | 32 +- .../apache/stratos/cli/GenericRestClient.java | 2 +- .../java/org/apache/stratos/cli/RestClient.java | 31 +- .../stratos/cli/RestCommandLineService.java | 327 +++- .../apache/stratos/cli/StratosApplication.java | 40 +- .../stratos/cli/beans/cartridge/Cartridge.java | 9 + .../beans/cartridge/ServiceDefinitionBean.java | 86 ++ .../cli/commands/ActivateTenantCommand.java | 70 + .../cli/commands/DeactivateTenantCommand.java | 70 + .../cli/commands/DeleteTenantCommand.java | 70 + .../DeployServiceDeploymentCommand.java | 139 ++ .../DescribeAutoScalingPolicyCommand.java | 2 +- .../stratos/cli/commands/ExitCommand.java | 7 +- .../cli/commands/ListDeployServiceCommand.java | 65 + .../UndeployCartridgeDefinitionCommand.java | 70 + .../UndeployServiceDefinitionCommand.java | 70 + .../apache/stratos/cli/utils/CliConstants.java | 42 +- .../org.apache.stratos.cloud.controller/pom.xml | 3 - .../axiom/parser/CartridgeConfigParser.java | 384 ----- .../parser/CloudControllerConfigParser.java | 2 +- .../controller/deployers/CartridgeDeployer.java | 213 --- .../cloud/controller/iaases/AWSEC2Iaas.java | 235 ++- .../controller/iaases/OpenstackNovaIaas.java | 224 ++- .../cloud/controller/iaases/VCloudIaas.java | 67 +- .../impl/CloudControllerServiceImpl.java | 156 +- .../cloud/controller/interfaces/Iaas.java | 78 +- .../jcloud/ComputeServiceBuilderUtil.java | 5 + .../cloud/controller/pojo/CartridgeConfig.java | 10 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../cloud/controller/pojo/ClusterContext.java | 63 +- .../cloud/controller/pojo/IaasProvider.java | 14 +- .../cloud/controller/pojo/MemberContext.java | 49 + .../runtime/FasterLookUpDataHolder.java | 226 +-- .../controller/topology/TopologyBuilder.java | 11 +- .../topology/TopologyEventPublisher.java | 4 +- .../controller/util/CloudControllerUtil.java | 60 + .../validate/AWSEC2PartitionValidator.java | 11 +- .../OpenstackNovaPartitionValidator.java | 10 +- .../axiom/FasterLookupDataHolderTest.java | 92 ++ .../LoadBalancerStatisticsNotifier.java | 4 +- .../console/cartridge_deployments.jag | 18 - .../console/cartridge_info.jag | 9 + .../console/config/console.js | 23 +- .../console/config/console.json | 8 +- .../console/configure_stratos.jag | 20 +- .../console/configure_stratos_wizard.jag | 15 +- .../controllers/cartridgeDefintionSubmit.jag | 2 +- .../console/controllers/checkAvailability.jag | 11 + .../console/controllers/login.jag | 2 +- .../console/controllers/loginSubmit.jag | 39 +- .../console/controllers/logout.jag | 5 +- .../console/controllers/manageTenants.jag | 43 + .../console/controllers/router.jag | 27 +- .../console/controllers/wizardSubmit.jag | 9 +- .../console/index.jag | 1 - .../console/lbs.jag | 20 - .../console/login.jag | 7 +- .../console/modules/pinch.min.js | 4 + .../console/mt_service_deployments.jag | 9 - .../console/partition_deployments.jag | 14 - .../console/policy_deployments.jag | 16 - .../console/subscribe_cartridge.jag | 6 +- .../theme1/partials/cartridge_deployments.hbs | 85 -- .../themes/theme1/partials/cartridge_info.hbs | 37 + .../themes/theme1/partials/cartridges.hbs | 18 +- .../partials/configure_stratos_wizard.hbs | 405 +++-- .../console/themes/theme1/partials/header.hbs | 87 +- .../console/themes/theme1/partials/lbs.hbs | 88 -- .../console/themes/theme1/partials/login.hbs | 12 +- .../theme1/partials/mt_service_deployments.hbs | 89 -- .../themes/theme1/partials/mycartridges.hbs | 18 +- .../theme1/partials/partition_deployments.hbs | 132 -- .../theme1/partials/policy_deployments.hbs | 131 -- .../theme1/partials/subscribe_cartridge.hbs | 53 +- .../theme1/partials/tenant_management.hbs | 12 +- .../themes/theme1/partials/tenant_new.hbs | 8 +- .../theme1/renderers/cartridge_deployments.js | 45 - .../themes/theme1/renderers/cartridge_info.js | 42 + .../theme1/renderers/configure_stratos.js | 9 +- .../renderers/configure_stratos_wizard.js | 3 +- .../console/themes/theme1/renderers/lbs.js | 47 - .../console/themes/theme1/renderers/login.js | 11 +- .../theme1/renderers/mt_service_deployments.js | 48 - .../theme1/renderers/partition_deployments.js | 46 - .../theme1/renderers/policy_deployments.js | 46 - .../theme1/renderers/subscribe_cartridge.js | 8 +- .../console/themes/theme1/theme.js | 7 + .../console/themes/theme1/ui/css/main.css | 50 +- .../themes/theme1/ui/custom-fonts/style.css | 25 +- .../console/themes/theme1/ui/js/login.js | 68 + .../themes/theme1/ui/js/tenant_management.js | 48 +- .../console/themes/theme1/ui/js/wizard.js | 26 +- .../console/util/utility.jag | 40 +- .../manager/client/CartridgeAgentClient.java | 44 - .../stratos/manager/client/RegistryClient.java | 109 -- .../DataCartridgeSubscriptionConnector.java | 34 +- .../stratos/manager/deploy/service/Service.java | 7 +- .../service/ServiceDeploymentManager.java | 24 + .../apache/stratos/manager/dns/DNSManager.java | 89 -- .../stratos/manager/domain/RegistryManager.java | 109 -- .../org/apache/stratos/manager/dto/AppRepo.java | 88 -- .../apache/stratos/manager/dto/Cartridge.java | 46 +- .../stratos/manager/dto/CartridgeDetail.java | 22 - .../manager/dto/CartridgeInformation.java | 22 - .../internal/ADCManagementServerComponent.java | 2 - .../stratos/manager/internal/DataHolder.java | 8 - .../manager/internal/HostingConstants.java | 40 - .../internal/HostingManagementActivator.java | 63 - .../manager/lookup/ClusterIdToSubscription.java | 5 - .../manager/lookup/LookupDataHolder.java | 27 +- .../manager/lookup/SubscriptionContext.java | 2 + .../manager/CartridgeSubscriptionManager.java | 385 +---- .../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 | 46 +- .../RegistryBasedPersistenceManager.java | 311 ++-- .../manager/registry/RegistryManager.java | 130 -- .../DataInsertionAndRetrievalManager.java | 129 +- .../service/ApplicationManagementService.java | 677 --------- .../InstanceInformationManagementService.java | 58 - .../service/RepoNotificationService.java | 128 -- .../subscription/CartridgeSubscription.java | 80 +- .../subscription/CartridgeSubscription_old.java | 431 ------ .../DataCartridgeSubscription_old.java | 127 -- .../MultiTenantCartridgeSubscription.java | 134 -- .../SingleTenantCartridgeSubscription.java | 136 -- .../SubscriptionMultiTenantBehaviour.java | 5 +- .../SubscriptionSingleTenantBehaviour.java | 12 +- .../utils/CartridgeSubscriptionUtils.java | 9 +- .../model/TopologyClusterInformationModel.java | 237 ++- .../StratosManagerTopologyReceiver.java | 75 +- .../utils/ApplicationManagementUtil.java | 857 +---------- .../stratos/manager/utils/CartridgeAppType.java | 44 - .../manager/utils/CartridgeConstants.java | 23 - .../stratos/manager/utils/CartridgeDomain.java | 146 -- .../stratos/manager/utils/DomainInfo.java | 43 - .../manager/utils/PersistenceManager.java | 892 ----------- .../manager/utils/RepositoryFactory.java | 131 -- .../stratos/manager/utils/StratosDBUtils.java | 213 --- .../src/main/resources/META-INF/services.xml | 57 +- .../messaging/domain/topology/Service.java | 4 +- .../event/topology/ClusterRemovedEvent.java | 8 +- .../stratos/messaging/util/Constants.java | 11 +- .../org.apache.stratos.rest.endpoint/pom.xml | 7 + .../definition/CartridgeDefinitionBean.java | 2 + .../rest/endpoint/bean/topology/Cluster.java | 10 +- .../bean/util/converter/PojoConverter.java | 41 +- .../stratos/rest/endpoint/mock/MockContext.java | 14 + .../rest/endpoint/mock/StratosTestAdmin.java | 56 +- .../rest/endpoint/services/ServiceUtils.java | 142 +- .../rest/endpoint/services/StratosAdmin.java | 73 +- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- .../pom.xml | 4 +- .../resources/conf/cartridge-config.properties | 64 - .../src/main/resources/p2.inf | 1 - pom.xml | 2 +- .../distribution/src/main/conf/autoscaler.xml | 3 + .../distribution/src/main/bin/stratos.sh | 12 +- products/stratos-manager/conf/log4j.properties | 1 + .../src/main/conf/cartridge-config.properties | 42 +- .../main/resources/CloudControllerService.wsdl | 607 ++++---- .../puppet/etc/puppet/files/cartridge-agent.sh | 2 +- .../puppet/etc/puppet/files/event-publisher.sh | 28 - .../puppet/etc/puppet/files/event-subscriber.sh | 28 - .../puppet/etc/puppet/files/health-publisher.sh | 33 - tools/puppet/etc/puppet/files/healthcheck.sh | 31 - tools/stratos-installer/README.txt | 41 +- tools/stratos-installer/conf/setup.conf | 2 +- tools/stratos-installer/start-servers.sh | 12 +- 196 files changed, 4899 insertions(+), 10755 deletions(-) ----------------------------------------------------------------------
