You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/07/29 12:11:41 UTC
[3/5] git commit: Merge branch '4.0.0' of github.com:apache/stratos
into jboss
Merge branch '4.0.0' of github.com:apache/stratos into jboss
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6ccc74c5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6ccc74c5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6ccc74c5
Branch: refs/heads/4.0.0
Commit: 6ccc74c55c36d27732dae4e318a467b1d69f0153
Parents: 8d77f9a a7b3867
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Jul 22 11:14:32 2014 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Jul 22 11:14:32 2014 +0530
----------------------------------------------------------------------
NOTICE | 2 +-
README.md | 4 +-
.../stratos/autoscaler/PartitionContext.java | 6 +-
.../cloud/controller/CloudControllerClient.java | 25 +-
.../AutoscalerTopologyEventReceiver.java | 82 +-
.../autoscaler/monitor/AbstractMonitor.java | 25 +-
.../autoscaler/monitor/ClusterMonitor.java | 115 ++-
.../autoscaler/monitor/LbClusterMonitor.java | 26 +-
.../autoscaler/rule/RuleTasksDelegator.java | 43 +-
.../autoscaler/util/AutoScalerConstants.java | 6 +
.../stratos/autoscaler/util/AutoscalerUtil.java | 26 +-
.../cartridge/agent/ArtifactCopyTask.java | 39 +
.../stratos/cartridge/agent/CartridgeAgent.java | 478 ++++++---
.../apache/stratos/cartridge/agent/Main.java | 40 +-
.../cartridge/agent/RepositoryFileListener.java | 8 +-
.../synchronizer/RepositoryInformation.java | 10 +-
.../git/impl/GitBasedArtifactRepository.java | 740 +++++++++-----
.../GitDeploymentSynchronizerConstants.java | 12 +
.../synchronizer/git/util/Utilities.java | 3 +
.../config/CartridgeAgentConfiguration.java | 348 +++++--
.../config/configurator/JndiConfigurator.java | 21 +-
.../agent/data/publisher/log/Constants.java | 13 +
.../publisher/log/FileBasedLogPublisher.java | 6 +-
.../agent/data/publisher/log/LogPublisher.java | 9 +-
.../data/publisher/log/LogPublisherManager.java | 65 +-
.../publisher/CartridgeAgentEventPublisher.java | 11 +-
.../extensions/DefaultExtensionHandler.java | 992 +++++++++++++++++++
.../agent/extensions/ExtensionHandler.java | 64 ++
.../agent/util/CartridgeAgentConstants.java | 56 +-
.../agent/util/CartridgeAgentUtils.java | 5 +-
.../cartridge/agent/util/ExtensionUtils.java | 500 +++++++++-
.../stratos/cli/RestCommandLineService.java | 310 +++++-
.../apache/stratos/cli/StratosApplication.java | 2 +-
.../stratos/cli/beans/cartridge/Cartridge.java | 9 +
.../stratos/cli/commands/SubscribeCommand.java | 347 ++++---
.../concurrent/PartitionValidatorCallable.java | 4 +
.../controller/iaases/OpenstackNovaIaas.java | 8 +-
.../impl/CloudControllerServiceImpl.java | 80 +-
.../cloud/controller/pojo/Cartridge.java | 52 +-
.../cloud/controller/pojo/CartridgeInfo.java | 10 +
.../cloud/controller/pojo/MemberContext.java | 10 +
.../CartridgeInstanceDataPublisher.java | 123 ++-
.../controller/topology/TopologyBuilder.java | 98 +-
.../topology/TopologyEventPublisher.java | 27 +-
.../util/CloudControllerConstants.java | 1 +
.../controller/util/CloudControllerUtil.java | 1 +
.../validate/AWSEC2PartitionValidator.java | 30 +-
.../stratos/common/util/CommandUtils.java | 30 +
.../extension/api/LoadBalancerExtension.java | 13 +-
.../LoadBalancerTenantEventReceiver.java | 199 ++--
.../LoadBalancerTopologyEventReceiver.java | 37 +-
.../conf/LoadBalancerConfiguration.java | 29 +-
.../balancer/context/LoadBalancerContext.java | 11 +-
.../context/LoadBalancerContextUtil.java | 417 +++++++-
.../context/map/HostNameAppContextMap.java | 51 +
.../context/map/HostNameClusterMap.java | 2 +-
.../context/map/MultiTenantClusterMap.java | 13 +-
.../TenantAwareLoadBalanceEndpoint.java | 398 ++++++--
.../stratos/load/balancer/util/Constants.java | 9 +-
.../test/LoadBalancerConfigurationTest.java | 26 +-
.../console/cartridge_info.jag | 10 +
.../console/cartridge_info_sg.jag | 69 ++
.../console/cartridges.jag | 3 +
.../console/config/acl.json | 4 +-
.../console/configure_stratos_wizard.jag | 3 +
.../controllers/cartridgeSubscribeSubmit.jag | 60 +-
.../controllers/cartridgeUnsubscribeSubmit.jag | 29 +-
.../console/controllers/loginSubmit.jag | 1 +
.../console/controllers/mycartridges.jag | 2 +-
.../console/index.jag | 5 +
.../console/subscribe_cartridge.jag | 14 +-
.../console/tenant_management.jag | 3 +
.../console/themes/theme1/pages/index.hbs | 2 +-
.../themes/theme1/partials/cartridge_info.hbs | 8 +-
.../theme1/partials/cartridge_info_sg.hbs | 125 +++
.../themes/theme1/partials/cartridges.hbs | 56 +-
.../partials/configure_stratos_wizard.hbs | 29 +-
.../console/themes/theme1/partials/header.hbs | 1 +
.../themes/theme1/partials/mycartridges.hbs | 52 +-
.../theme1/partials/subscribe_cartridge.hbs | 63 +-
.../themes/theme1/renderers/cartridge_info.js | 3 +-
.../theme1/renderers/cartridge_info_sg.js | 99 ++
.../themes/theme1/renderers/cartridges.js | 7 +-
.../theme1/renderers/configure_stratos.js | 1 +
.../renderers/configure_stratos_wizard.js | 1 +
.../themes/theme1/renderers/dashboard.js | 4 +-
.../console/themes/theme1/renderers/index.js | 5 +-
.../theme1/renderers/subscribe_cartridge.js | 6 +-
.../theme1/renderers/tenant_management.js | 4 +-
.../themes/theme1/renderers/tenant_new.js | 3 +-
.../console/themes/theme1/theme.js | 13 +
.../console/themes/theme1/ui/css/main.css | 9 +-
.../console/themes/theme1/ui/img/egg-logo.png | Bin 0 -> 8299 bytes
.../console/themes/theme1/ui/js/mycartridges.js | 3 +-
.../console/util/utility.jag | 7 +
.../src/main/resources/META-INF/product.xml | 6 +-
.../behaviour/CartridgeMgtBehaviour.java | 13 +-
.../org/apache/stratos/manager/dao/Cluster.java | 6 +-
.../stratos/manager/deploy/service/Service.java | 9 +-
.../service/ServiceDeploymentManager.java | 49 +-
.../multitenant/lb/DefaultLBService.java | 110 ++
.../multitenant/lb/ExistingLBService.java | 52 +
.../service/multitenant/lb/LBService.java | 69 ++
.../multitenant/lb/ServiceAwareLBService.java | 137 +++
.../category/DefaultLoadBalancerCategory.java | 13 +-
.../ServiceLevelLoadBalancerCategory.java | 6 +-
.../manager/CartridgeSubscriptionManager.java | 224 ++++-
.../manager/payload/BasicPayloadData.java | 15 +-
.../InstanceNotificationPublisher.java | 5 +-
.../publisher/TenantSynzhronizerTask.java | 19 +-
.../stratos/manager/repository/Repository.java | 9 +
.../repository/RepositoryNotification.java | 2 +-
.../DataInsertionAndRetrievalManager.java | 25 +
.../subscription/CartridgeSubscription.java | 34 +-
.../InternalRepoBasedCartridgeSubscription.java | 14 +-
.../subscription/LBCartridgeSubscription.java | 26 +-
.../manager/subscription/SubscriptionData.java | 34 +
.../subscription/SubscriptionDomain.java | 48 +
.../factory/CartridgeSubscriptionFactory.java | 9 +-
.../utils/CartridgeSubscriptionUtils.java | 29 +-
.../model/TopologyClusterInformationModel.java | 19 +
.../manager/utils/RepositoryCreator.java | 7 +-
components/org.apache.stratos.messaging/pom.xml | 5 +
.../messaging/domain/tenant/Subscription.java | 77 ++
.../domain/tenant/SubscriptionDomain.java | 41 +
.../stratos/messaging/domain/tenant/Tenant.java | 29 +-
.../messaging/domain/topology/Cluster.java | 10 +
.../domain/topology/ClusterStatus.java | 36 +
.../messaging/domain/topology/Member.java | 68 +-
.../messaging/domain/topology/Service.java | 30 +-
.../instance/notifier/ArtifactUpdatedEvent.java | 9 +
.../tenant/SubscriptionDomainAddedEvent.java | 67 ++
.../tenant/SubscriptionDomainRemovedEvent.java | 60 ++
.../tenant/SubscriptionDomainsAddedEvent.java | 60 ++
.../tenant/SubscriptionDomainsRemovedEvent.java | 60 ++
.../event/tenant/TenantSubscribedEvent.java | 9 +-
.../event/tenant/TenantUnSubscribedEvent.java | 10 +-
.../topology/ClusterMaintenanceModeEvent.java | 58 ++
.../event/topology/InstanceSpawnedEvent.java | 12 +-
.../event/topology/MemberActivatedEvent.java | 40 +-
.../event/topology/MemberTerminatedEvent.java | 11 +
.../event/topology/ServiceCreatedEvent.java | 37 +-
.../SubscriptionDomainsAddedEventListener.java | 28 +
...SubscriptionDomainsRemovedEventListener.java | 28 +
.../ClusterMaintenanceModeEventListener.java | 25 +
...SubscriptionDomainAddedMessageProcessor.java | 95 ++
...bscriptionDomainRemovedMessageProcessor.java | 94 ++
.../tenant/TenantMessageProcessorChain.java | 12 +
.../TenantSubscribedMessageProcessor.java | 5 +-
.../TenantUnSubscribedMessageProcessor.java | 2 +-
.../ClusterMaintenanceModeMessageProcessor.java | 115 +++
.../InstanceSpawnedMessageProcessor.java | 1 +
.../topology/TopologyMessageProcessorChain.java | 6 +
.../message/receiver/tenant/TenantManager.java | 5 +
.../stratos/messaging/util/Constants.java | 2 +
.../messaging/test/TenantDomainTest.java | 45 +
.../rest/endpoint/bean/CartridgeInfoBean.java | 11 +
.../bean/SubscriptionDomainRequest.java | 35 +
.../domain/SubscriptionDomainBean.java | 29 +
.../bean/util/converter/PojoConverter.java | 30 +
.../CustomThrowableExceptionMapper.java | 39 +
.../handlers/GenericExceptionMapper.java | 46 +
.../handlers/StratosAuthenticationHandler.java | 43 +-
.../stratos/rest/endpoint/mock/MockContext.java | 88 ++
.../rest/endpoint/mock/StratosTestAdmin.java | 46 +-
.../rest/endpoint/services/ServiceUtils.java | 130 ++-
.../rest/endpoint/services/StratosAdmin.java | 106 +-
.../webapp/stratos-test/WEB-INF/cxf-servlet.xml | 2 +
.../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 4 +
.../mgt/ui/servlets/ThemeResourceServlet.java | 125 +++
.../mgt/ui/servlets/ThemeResourceSevelet.java | 125 ---
.../src/main/resources/META-INF/component.xml | 2 +-
.../stratos/haproxy/extension/HAProxy.java | 3 +
.../haproxy/extension/HAProxyConfigWriter.java | 84 +-
.../extension/HAProxyStatisticsReader.java | 38 +-
.../src/main/templates/haproxy.cfg.template | 9 +-
pom.xml | 26 +-
.../distribution/src/main/assembly/bin.xml | 12 +-
.../distribution/src/main/bin/stratos.sh | 31 +-
.../distribution/src/main/conf/log4j.properties | 4 +-
.../conf/templates/jndi.properties.template | 6 +-
.../src/main/extensions/artifacts-copy.sh | 29 +
.../src/main/extensions/artifacts-updated.sh | 2 +-
.../distribution/src/main/extensions/clean.sh | 2 +-
.../src/main/extensions/complete-tenant.sh | 30 +
.../src/main/extensions/complete-topology.sh | 34 +
.../src/main/extensions/instance-activated.sh | 2 +-
.../src/main/extensions/instance-started.sh | 2 +-
.../src/main/extensions/member-activated.sh | 43 +
.../src/main/extensions/member-started.sh | 43 +
.../src/main/extensions/member-suspended.sh | 43 +
.../src/main/extensions/member-terminated.sh | 43 +
.../src/main/extensions/mount-volumes.sh | 87 ++
.../src/main/extensions/start-servers.sh | 14 +-
.../extensions/subscription-domain-added.sh | 37 +
.../extensions/subscription-domain-removed.sh | 36 +
.../modules/distribution/README.txt | 2 +-
products/stratos-cli/distribution/README.txt | 2 +-
products/stratos/conf/tenant-mgt.xml | 42 +
.../modules/distribution/src/assembly/bin.xml | 17 +-
.../distribution/src/main/conf/autoscaler.xml | 2 +
.../distribution/src/main/conf/log4j.properties | 4 +-
.../distribution/src/main/conf/mincheck.drl | 13 +-
.../distribution/src/main/conf/scaling.drl | 17 +-
.../src/main/conf/siddhi/siddhi.extension | 1 +
.../main/resources/CloudControllerService.wsdl | 769 +++++++-------
.../modules/agent/files/activemq/README.txt | 1 +
tools/puppet3/modules/agent/manifests/init.pp | 25 +-
.../modules/agent/manifests/initialize.pp | 31 +-
tools/puppet3/modules/agent/manifests/start.pp | 1 +
.../modules/agent/templates/bin/stratos.sh.erb | 36 +-
.../agent/templates/conf/log4j.properties.erb | 40 +
.../templates/extensions/artifacts-copy.sh.erb | 29 +
.../extensions/artifacts-updated.sh.erb | 2 +-
.../agent/templates/extensions/clean.sh.erb | 2 +-
.../templates/extensions/complete-tenant.sh.erb | 30 +
.../extensions/complete-topology.sh.erb | 34 +
.../extensions/instance-activated.sh.erb | 2 +-
.../extensions/instance-started.sh.erb | 11 +-
.../extensions/member-activated.sh.erb | 303 ++++++
.../templates/extensions/member-started.sh.erb | 43 +
.../extensions/member-suspended.sh.erb | 43 +
.../extensions/member-terminated.sh.erb | 43 +
.../templates/extensions/mount-volumes.sh.erb | 87 ++
.../templates/extensions/start-servers.sh.erb | 285 +++++-
.../extensions/subscription-domain-added.sh.erb | 35 +
.../subscription-domain-removed.sh.erb | 34 +
tools/puppet3/modules/haproxy/files/README.txt | 12 +
tools/puppet3/modules/haproxy/manifests/init.pp | 70 ++
.../modules/haproxy/manifests/initialize.pp | 77 ++
.../modules/haproxy/manifests/push_templates.pp | 30 +
.../puppet3/modules/haproxy/manifests/start.pp | 25 +
.../templates/bin/haproxy-extension.sh.erb | 48 +
.../haproxy/templates/conf/jndi.properties.erb | 33 +
tools/stratos-installer/README.txt | 2 +-
235 files changed, 10669 insertions(+), 2147 deletions(-)
----------------------------------------------------------------------