You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/05/07 00:57:05 UTC
[2/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/a9c959da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a9c959da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a9c959da
Branch: refs/heads/master
Commit: a9c959da65874765e0a7854027f1ee151f57c5ac
Parents: 3280f08 c6a4c3c
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed May 7 04:03:45 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed May 7 04:03:45 2014 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 36 +
.../agent/util/CartridgeAgentConstants.java | 2 +
.../agent/util/CartridgeAgentUtils.java | 5 +-
.../cartridge/agent/util/ExtensionUtils.java | 32 +-
components/org.apache.stratos.cli/pom.xml | 1 +
.../src/main/assembly/src.xml | 2 +-
.../stratos/cli/commands/SubscribeCommand.java | 30 +-
.../impl/CloudControllerServiceImpl.java | 54 +-
.../controller/util/CloudControllerUtil.java | 4 +-
.../LoadBalancerTenantEventReceiver.java | 188 +++---
.../LoadBalancerTopologyEventReceiver.java | 37 +-
.../conf/LoadBalancerConfiguration.java | 2 +-
.../balancer/context/LoadBalancerContext.java | 4 +-
.../context/LoadBalancerContextUtil.java | 364 ++++++++++-
.../context/map/MultiTenantClusterMap.java | 13 +-
.../TenantAwareLoadBalanceEndpoint.java | 295 ++++++---
.../stratos/load/balancer/util/Constants.java | 9 +-
.../test/LoadBalancerConfigurationTest.java | 10 +-
.../controllers/cartridgeSubscribeSubmit.jag | 4 +-
.../service/ServiceDeploymentManager.java | 8 +-
.../manager/CartridgeSubscriptionManager.java | 137 +++-
.../publisher/TenantSynzhronizerTask.java | 18 +-
.../DataInsertionAndRetrievalManager.java | 25 +
.../subscription/CartridgeSubscription.java | 30 +-
.../manager/subscription/SubscriptionData.java | 27 +-
.../subscription/SubscriptionDomain.java | 46 ++
.../utils/CartridgeSubscriptionUtils.java | 20 +-
.../broker/connect/TopicConnector.java | 1 -
.../broker/heartbeat/TopicHealthChecker.java | 23 +-
.../broker/publish/EventPublisher.java | 12 +-
.../broker/publish/TopicPublisher.java | 148 +++--
.../broker/subscribe/TopicSubscriber.java | 119 ++--
.../messaging/domain/tenant/Subscription.java | 77 +++
.../domain/tenant/SubscriptionDomain.java | 41 ++
.../stratos/messaging/domain/tenant/Tenant.java | 29 +-
.../messaging/domain/topology/Member.java | 68 +-
.../messaging/domain/topology/Service.java | 30 +-
.../stratos/messaging/event/ping/PingEvent.java | 30 +
.../tenant/SubscriptionDomainAddedEvent.java | 67 ++
.../tenant/SubscriptionDomainRemovedEvent.java | 60 ++
.../event/tenant/TenantSubscribedEvent.java | 9 +-
.../event/tenant/TenantUnSubscribedEvent.java | 10 +-
.../event/topology/MemberActivatedEvent.java | 40 +-
.../event/topology/ServiceCreatedEvent.java | 37 +-
.../SubscriptionDomainsAddedEventListener.java | 28 +
...SubscriptionDomainsRemovedEventListener.java | 28 +
...SubscriptionDomainAddedMessageProcessor.java | 98 +++
...bscriptionDomainRemovedMessageProcessor.java | 97 +++
.../tenant/TenantMessageProcessorChain.java | 12 +
.../TenantSubscribedMessageProcessor.java | 5 +-
.../TenantUnSubscribedMessageProcessor.java | 2 +-
.../messaging/publish/MessagePublisher.java | 4 +-
.../stratos/messaging/util/Constants.java | 1 +
.../messaging/test/TenantDomainTest.java | 45 ++
.../rest/endpoint/bean/CartridgeInfoBean.java | 6 +-
.../bean/SubscriptionDomainRequest.java | 48 ++
.../handlers/BadRequestExceptionMapper.java | 45 ++
.../handlers/CustomExceptionMapper.java | 13 +-
.../CustomThrowableExceptionMapper.java | 39 ++
.../handlers/GenericExceptionMapper.java | 46 ++
.../stratos/rest/endpoint/mock/MockContext.java | 4 +
.../rest/endpoint/mock/StratosTestAdmin.java | 9 +
.../rest/endpoint/services/ServiceUtils.java | 653 ++++++++++---------
.../rest/endpoint/services/StratosAdmin.java | 43 +-
.../webapp/stratos-test/WEB-INF/cxf-servlet.xml | 41 +-
.../stratos-test/WEB-INF/schemas/schema.xsd | 214 ++++++
.../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 18 +
.../webapp/stratos/WEB-INF/schemas/schema.xsd | 214 ++++++
.../load-balancer/haproxy-extension/pom.xml | 2 +-
.../haproxy-extension/src/main/assembly/bin.xml | 19 +-
.../haproxy-extension/src/main/license/LICENSE | 481 ++++++++++++++
.../haproxy-extension/src/main/notice/NOTICE | 395 +++++++++++
pom.xml | 46 +-
.../modules/distribution/pom.xml | 2 +-
.../distribution/src/main/bin/stratos.sh | 3 +-
.../conf/templates/jndi.properties.template | 6 +-
.../distribution/src/main/license/LICENSE | 5 +-
.../load-balancer/modules/distribution/pom.xml | 1 +
.../distribution/src/main/assembly/bin.xml | 1 +
.../src/main/conf/loadbalancer.conf | 2 +-
.../distribution/src/main/license/LICENSE | 1 -
products/stratos-cli/distribution/pom.xml | 1 +
.../distribution/src/main/assembly/bin.xml | 1 +
.../distribution/src/main/license/LICENSE | 1 -
products/stratos/modules/distribution/pom.xml | 2 +
.../modules/distribution/src/assembly/bin.xml | 2 +-
.../distribution/src/main/license/LICENSE | 6 +-
tools/puppet3/manifests/base.pp | 44 ++
tools/puppet3/manifests/default.pp | 24 +
tools/puppet3/manifests/haproxy.pp | 25 +
tools/puppet3/manifests/lb.pp | 25 +
tools/puppet3/manifests/mysql.pp | 27 +
tools/puppet3/manifests/nodejs.pp | 27 +
tools/puppet3/manifests/nodes.pp | 129 ----
tools/puppet3/manifests/php.pp | 32 +
tools/puppet3/manifests/ruby.pp | 26 +
tools/puppet3/manifests/site.pp | 18 -
tools/puppet3/manifests/tomcat.pp | 28 +
tools/puppet3/manifests/wordpress.pp | 26 +
tools/puppet3/modules/php/manifests/init.pp | 8 +-
.../modules/stratos_base/manifests/init.pp | 63 ++
tools/puppet3/puppet.conf | 1 +
102 files changed, 4432 insertions(+), 965 deletions(-)
----------------------------------------------------------------------