Repository: incubator-stratos Updated Branches: refs/heads/master e0da580a2 -> 70ed85714
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java index 725ad0f..b5edfc1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java @@ -37,8 +37,8 @@ public class TenantMessageProcessorChain extends MessageProcessorChain { private TenantRemovedMessageProcessor tenantRemovedMessageProcessor; private TenantSubscribedMessageProcessor tenantSubscribedMessageProcessor; private TenantUnSubscribedMessageProcessor tenantUnSubscribedMessageProcessor; - private SubscriptionDomainsAddedMessageProcessor subscriptionDomainsAddedMessageProcessor; - private SubscriptionDomainsRemovedMessageProcessor subscriptionDomainsRemovedMessageProcessor; + private SubscriptionDomainAddedMessageProcessor subscriptionDomainAddedMessageProcessor; + private SubscriptionDomainRemovedMessageProcessor subscriptionDomainRemovedMessageProcessor; public void initialize() { // Add tenant event processors @@ -60,11 +60,11 @@ public class TenantMessageProcessorChain extends MessageProcessorChain { tenantUnSubscribedMessageProcessor = new TenantUnSubscribedMessageProcessor(); add(tenantUnSubscribedMessageProcessor); - subscriptionDomainsAddedMessageProcessor = new SubscriptionDomainsAddedMessageProcessor(); - add(subscriptionDomainsAddedMessageProcessor); + subscriptionDomainAddedMessageProcessor = new SubscriptionDomainAddedMessageProcessor(); + add(subscriptionDomainAddedMessageProcessor); - subscriptionDomainsRemovedMessageProcessor = new SubscriptionDomainsRemovedMessageProcessor(); - add(subscriptionDomainsRemovedMessageProcessor); + subscriptionDomainRemovedMessageProcessor = new SubscriptionDomainRemovedMessageProcessor(); + add(subscriptionDomainRemovedMessageProcessor); if (log.isDebugEnabled()) { log.debug("Tenant message processor chain initialized"); @@ -85,9 +85,9 @@ public class TenantMessageProcessorChain extends MessageProcessorChain { } else if (eventListener instanceof TenantUnSubscribedEventListener) { tenantUnSubscribedMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof SubscriptionDomainsAddedEventListener) { - subscriptionDomainsAddedMessageProcessor.addEventListener(eventListener); + subscriptionDomainAddedMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof SubscriptionDomainsRemovedEventListener) { - subscriptionDomainsRemovedMessageProcessor.addEventListener(eventListener); + subscriptionDomainRemovedMessageProcessor.addEventListener(eventListener); } else { throw new RuntimeException("Unknown event listener"); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantSubscribedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantSubscribedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantSubscribedMessageProcessor.java index 147ebde..196bc22 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantSubscribedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantSubscribedMessageProcessor.java @@ -22,6 +22,7 @@ package org.apache.stratos.messaging.message.processor.tenant; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.domain.tenant.Subscription; +import org.apache.stratos.messaging.domain.tenant.SubscriptionDomain; import org.apache.stratos.messaging.domain.tenant.Tenant; import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent; import org.apache.stratos.messaging.message.processor.MessageProcessor; @@ -63,11 +64,11 @@ public class TenantSubscribedMessageProcessor extends MessageProcessor { } return false; } - Subscription subscription = new Subscription(event.getServiceName(), event.getClusterIds(), event.getDomains()); + Subscription subscription = new Subscription(event.getServiceName(), event.getClusterIds()); tenant.addSubscription(subscription); if(log.isInfoEnabled()) { - log.info(String.format("Tenant subscribed to service: [tenant-id] %d [tenant-domain] %s [service] %s [domains] %s", - tenant.getTenantId(), tenant.getTenantDomain(), event.getServiceName(), event.getDomains())); + log.info(String.format("Tenant subscribed to service: [tenant-id] %d [tenant-domain] %s [service] %s", + tenant.getTenantId(), tenant.getTenantDomain(), event.getServiceName())); } // Notify event listeners http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/test/TenantDomainTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/test/TenantDomainTest.java b/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/test/TenantDomainTest.java index adb11e1..fae8b79 100644 --- a/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/test/TenantDomainTest.java +++ b/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/test/TenantDomainTest.java @@ -36,7 +36,7 @@ public class TenantDomainTest { @Test public void testSubscriptionModel() { Tenant tenant = new Tenant(1, "domain.org"); - Subscription subscription = new Subscription("subscription1", new HashSet<String>(), new HashSet<String>()); + Subscription subscription = new Subscription("subscription1", new HashSet<String>()); tenant.addSubscription(subscription); Assert.assertTrue("Subscription not added", tenant.isSubscribed("subscription1")); tenant.removeSubscription("subscription1"); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java index 48fd5ce..7452a58 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java @@ -40,10 +40,8 @@ public class CartridgeInfoBean { private String size; private boolean removeOnTermination; private String serviceGroup; - private List<String> domains; public CartridgeInfoBean() { - this.domains = new ArrayList<String>(); } public String getCartridgeType() { @@ -165,8 +163,4 @@ public class CartridgeInfoBean { public void setServiceGroup(String serviceGroup) { this.serviceGroup = serviceGroup; } - - public List<String> getDomains() { return domains; } - - public void setDomains(List<String> domains) { this.domains = domains; } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/SubscriptionDomainRequest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/SubscriptionDomainRequest.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/SubscriptionDomainRequest.java index 9b066cb..265cefa 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/SubscriptionDomainRequest.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/SubscriptionDomainRequest.java @@ -27,13 +27,22 @@ import java.util.List; */ @XmlRootElement(name = "subscriptionDomainRequest") public class SubscriptionDomainRequest { - private List<String> domains; + private String domainName; + private String applicationAlias; - public List<String> getDomains() { - return domains; + public String getDomainName() { + return domainName; } - public void setDomains(List<String> domains) { - this.domains = domains; + public String getApplicationAlias() { + return applicationAlias; + } + + public void setDomainName(String domainName) { + this.domainName = domainName; + } + + public void setApplicationAlias(String applicationAlias) { + this.applicationAlias = applicationAlias; } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index d258e41..217ea48 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -991,7 +991,6 @@ public class ServiceUtils { subscriptionData.setRepositoryPassword(cartridgeInfoBean.getRepoPassword()); subscriptionData.setCommitsEnabled(cartridgeInfoBean.isCommitsEnabled()); subscriptionData.setServiceGroup(cartridgeInfoBean.getServiceGroup()); - subscriptionData.addDomains(new HashSet<String>(cartridgeInfoBean.getDomains())); if (cartridgeInfoBean.isPersistanceRequired()) { // Add persistence related properties to PersistenceContext @@ -1187,11 +1186,11 @@ public class ServiceUtils { return stratosAdminResponse; } - public static StratosAdminResponse addSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType, - String subscriptionAlias, List<String> domains) throws RestAPIException { + public static StratosAdminResponse addSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType, + String subscriptionAlias, String domainName, String applicationAlias) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); - cartridgeSubsciptionManager.addSubscriptionDomains(tenantId, subscriptionAlias, domains); + cartridgeSubsciptionManager.addSubscriptionDomain(tenantId, subscriptionAlias, domainName, applicationAlias); } catch (Exception e) { log.error(e.getMessage(), e); throw new RestAPIException(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70ed8571/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java index 43c890a..047da1e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java @@ -1023,11 +1023,11 @@ public class StratosAdmin extends AbstractAdmin { @Path("/cartridge/{cartridgeType}/subscription/{subscriptionAlias}/domain/") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public StratosAdminResponse addSubscriptionDomains(@PathParam("cartridgeType") String cartridgeType, - @PathParam("subscriptionAlias") String subscriptionAlias, - SubscriptionDomainRequest request) throws RestAPIException { + public StratosAdminResponse addSubscriptionDomain(@PathParam("cartridgeType") String cartridgeType, + @PathParam("subscriptionAlias") String subscriptionAlias, + SubscriptionDomainRequest request) throws RestAPIException { - return ServiceUtils.addSubscriptionDomains(getConfigContext(), cartridgeType, subscriptionAlias, request.getDomains()); + return ServiceUtils.addSubscriptionDomain(getConfigContext(), cartridgeType, subscriptionAlias, request.getDomainName(), request.getApplicationAlias()); } @GET @@ -1035,7 +1035,7 @@ public class StratosAdmin extends AbstractAdmin { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") public String[] getSubscriptionDomains(@PathParam("cartridgeType") String cartridgeType, - @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { + @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { return (String[]) ServiceUtils.getSubscriptionDomains(getConfigContext(), cartridgeType, subscriptionAlias).toArray(); } @@ -1053,9 +1053,9 @@ public class StratosAdmin extends AbstractAdmin { @Path("/cartridge/{cartridgeType}/subscription/{subscriptionAlias}/domain/{domainName}") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public StratosAdminResponse removeSubscriptionDomains(@PathParam("cartridgeType") String cartridgeType, - @PathParam("subscriptionAlias") String subscriptionAlias, - @PathParam("domainName") String domainName) throws RestAPIException { + public StratosAdminResponse removeSubscriptionDomain(@PathParam("cartridgeType") String cartridgeType, + @PathParam("subscriptionAlias") String subscriptionAlias, + @PathParam("domainName") String domainName) throws RestAPIException { return ServiceUtils.removeSubscriptionDomain(getConfigContext(), cartridgeType, subscriptionAlias, domainName); }
