You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/05/07 05:43:30 UTC
[1/2] git commit: Renamed application alias to application context in
subscription domain
Repository: incubator-stratos
Updated Branches:
refs/heads/master 5c335754a -> d6843ebec
Renamed application alias to application context in subscription domain
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b61c4fc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b61c4fc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b61c4fc3
Branch: refs/heads/master
Commit: b61c4fc3f1965eb67a25fabc58dca4b67bc8bca0
Parents: 5c33575
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed May 7 08:52:01 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed May 7 08:52:01 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/cartridge/agent/CartridgeAgent.java | 2 +-
.../stratos/cartridge/agent/util/ExtensionUtils.java | 6 +++---
.../manager/manager/CartridgeSubscriptionManager.java | 10 +++++-----
.../manager/publisher/TenantSynzhronizerTask.java | 2 +-
.../manager/subscription/SubscriptionDomain.java | 12 ++++++------
.../stratos/messaging/domain/tenant/Subscription.java | 4 ++--
.../messaging/domain/tenant/SubscriptionDomain.java | 10 +++++-----
.../event/tenant/SubscriptionDomainAddedEvent.java | 10 +++++-----
.../tenant/SubscriptionDomainAddedMessageProcessor.java | 6 +++---
.../rest/endpoint/bean/SubscriptionDomainRequest.java | 10 +++++-----
.../stratos/rest/endpoint/services/ServiceUtils.java | 4 ++--
.../stratos/rest/endpoint/services/StratosAdmin.java | 2 +-
12 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index cc1687e..bb8e71f 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -175,7 +175,7 @@ public class CartridgeAgent implements Runnable {
protected void onEvent(Event event) {
SubscriptionDomainAddedEvent subscriptionDomainAddedEvent = (SubscriptionDomainAddedEvent)event;
ExtensionUtils.executeSubscriptionDomainAddedExtension(subscriptionDomainAddedEvent.getDomainName(),
- subscriptionDomainAddedEvent.getApplicationAlias());
+ subscriptionDomainAddedEvent.getApplicationContext());
}
});
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
index 6eef1f0..5bd922d 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
@@ -133,12 +133,12 @@ public class ExtensionUtils {
}
}
- public static void executeSubscriptionDomainAddedExtension(String domain, String applicationAlias) {
+ public static void executeSubscriptionDomainAddedExtension(String domain, String applicationContext) {
try {
if(log.isDebugEnabled()) {
- log.debug("Executing subscription domain added extension: [domain] %s [application-alias] %s");
+ log.debug("Executing subscription domain added extension: [domain] %s [application-context] %s");
}
- String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_ADDED_SH + " " + domain + " " + applicationAlias);
+ String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_ADDED_SH + " " + domain + " " + applicationContext);
CommandUtils.executeCommand(command);
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index f591b82..7c35c1c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -387,7 +387,7 @@ public class CartridgeSubscriptionManager {
createSubscriptionResponse(cartridgeSubscriptionInfo, cartridgeSubscription.getRepository());
}
- public void addSubscriptionDomain(int tenantId, String subscriptionAlias, String domainName, String applicationAlias)
+ public void addSubscriptionDomain(int tenantId, String subscriptionAlias, String domainName, String applicationContext)
throws ADCException {
CartridgeSubscription cartridgeSubscription;
@@ -401,22 +401,22 @@ public class CartridgeSubscriptionManager {
throw new ADCException(String.format("Domain name %s already registered", domainName));
}
- cartridgeSubscription.addSubscriptionDomain(new SubscriptionDomain(domainName, applicationAlias));
+ cartridgeSubscription.addSubscriptionDomain(new SubscriptionDomain(domainName, applicationContext));
new DataInsertionAndRetrievalManager().cacheAndUpdateSubscription(cartridgeSubscription);
} catch (PersistenceManagerException e) {
String errorMsg = "Could not add domain to cartridge subscription: [tenant-id] " + tenantId + " [subscription-alias] " + subscriptionAlias +
- " [domain-name] " + domainName + " [application-alias] " + applicationAlias;
+ " [domain-name] " + domainName + " [application-context] " + applicationContext;
log.error(errorMsg);
throw new ADCException(errorMsg, e);
}
log.info("Successfully added domains to cartridge subscription: [tenant-id] " + tenantId + " [subscription-alias] " + subscriptionAlias +
- " [domain-name] " + domainName + " [application-alias] " +applicationAlias);
+ " [domain-name] " + domainName + " [application-context] " +applicationContext);
EventPublisher eventPublisher = EventPublisherPool.getPublisher(Constants.TENANT_TOPIC);
SubscriptionDomainAddedEvent event = new SubscriptionDomainAddedEvent(tenantId, cartridgeSubscription.getType(),
new HashSet<String>(cartridgeSubscription.getCluster().getId()),
- domainName, applicationAlias);
+ domainName, applicationContext);
eventPublisher.publish(event);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java
index 8b760fa..f2d954b 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java
@@ -78,7 +78,7 @@ public class TenantSynzhronizerTask implements Task {
Subscription subscription = new Subscription(cartridgeSubscription.getType(),
new HashSet<String>(cartridgeSubscription.getCluster().getId()));
for(SubscriptionDomain subscriptionDomain : cartridgeSubscription.getSubscriptionDomains()) {
- subscription.addSubscriptionDomain(subscriptionDomain.getDomainName(), subscriptionDomain.getApplicationAlias());
+ subscription.addSubscriptionDomain(subscriptionDomain.getDomainName(), subscriptionDomain.getApplicationContext());
}
tenant.addSubscription(subscription);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionDomain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionDomain.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionDomain.java
index c258e38..8c68f33 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionDomain.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionDomain.java
@@ -24,23 +24,23 @@ package org.apache.stratos.manager.subscription;
*/
public class SubscriptionDomain {
private final String domainName;
- private final String applicationAlias;
+ private final String applicationContext;
- public SubscriptionDomain(String domainName, String applicationAlias) {
+ public SubscriptionDomain(String domainName, String applicationContext) {
this.domainName = domainName;
- this.applicationAlias = applicationAlias;
+ this.applicationContext = applicationContext;
}
public String getDomainName() {
return domainName;
}
- public String getApplicationAlias() {
- return applicationAlias;
+ public String getApplicationContext() {
+ return applicationContext;
}
@Override
public String toString() {
- return String.format("[domain-name] %s [application-alias] %s", getDomainName(), getApplicationAlias());
+ return String.format("[domain-name] %s [application-context] %s", getDomainName(), getApplicationContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/Subscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/Subscription.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/Subscription.java
index 911692c..caab423 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/Subscription.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/Subscription.java
@@ -52,8 +52,8 @@ public class Subscription {
subscriptionDomainMap.put(subscriptionDomain.getDomainName(), subscriptionDomain);
}
- public void addSubscriptionDomain(String domainName, String applicationAlias) {
- addSubscriptionDomain(new SubscriptionDomain(domainName, applicationAlias));
+ public void addSubscriptionDomain(String domainName, String applicationContext) {
+ addSubscriptionDomain(new SubscriptionDomain(domainName, applicationContext));
}
public void removeSubscriptionDomain(String domainName) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/SubscriptionDomain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/SubscriptionDomain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/SubscriptionDomain.java
index 38448ae..84df4c8 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/SubscriptionDomain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/tenant/SubscriptionDomain.java
@@ -24,18 +24,18 @@ package org.apache.stratos.messaging.domain.tenant;
*/
public class SubscriptionDomain {
private final String domainName;
- private final String applicationAlias;
+ private final String applicationContext;
- public SubscriptionDomain(String domainName, String applicationAlias) {
+ public SubscriptionDomain(String domainName, String applicationContext) {
this.domainName = domainName;
- this.applicationAlias = applicationAlias;
+ this.applicationContext = applicationContext;
}
public String getDomainName() {
return domainName;
}
- public String getApplicationAlias() {
- return applicationAlias;
+ public String getApplicationContext() {
+ return applicationContext;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/SubscriptionDomainAddedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/SubscriptionDomainAddedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/SubscriptionDomainAddedEvent.java
index baebb82..e2b87d4 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/SubscriptionDomainAddedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/SubscriptionDomainAddedEvent.java
@@ -34,15 +34,15 @@ public class SubscriptionDomainAddedEvent extends Event implements Serializable
private final String serviceName;
private final Set<String> clusterIds;
private final String domainName;
- private final String applicationAlias;
+ private final String applicationContext;
public SubscriptionDomainAddedEvent(int tenantId, String serviceName, Set<String> clusterIds, String domainName,
- String applicationAlias) {
+ String applicationContext) {
this.tenantId = tenantId;
this.serviceName = serviceName;
this.clusterIds = clusterIds;
this.domainName = domainName;
- this.applicationAlias = applicationAlias;
+ this.applicationContext = applicationContext;
}
public int getTenantId() {
@@ -61,7 +61,7 @@ public class SubscriptionDomainAddedEvent extends Event implements Serializable
return domainName;
}
- public String getApplicationAlias() {
- return applicationAlias;
+ public String getApplicationContext() {
+ return applicationContext;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
index fa85e30..3c3269f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
@@ -71,11 +71,11 @@ public class SubscriptionDomainAddedMessageProcessor extends MessageProcessor {
}
return false;
}
- subscription.addSubscriptionDomain(new SubscriptionDomain(event.getDomainName(), event.getApplicationAlias()));
+ subscription.addSubscriptionDomain(new SubscriptionDomain(event.getDomainName(), event.getApplicationContext()));
if(log.isInfoEnabled()) {
log.info(String.format("Domain added to tenant subscription: [tenant-id] %d [tenant-domain] %s " +
- "[service] %s [domain-name] %s [application-alias] %s", tenant.getTenantId(),
- tenant.getTenantDomain(), event.getServiceName(), event.getDomainName(), event.getApplicationAlias()));
+ "[service] %s [domain-name] %s [application-context] %s", tenant.getTenantId(),
+ tenant.getTenantDomain(), event.getServiceName(), event.getDomainName(), event.getApplicationContext()));
}
// Notify event listeners
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/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 265cefa..3d3fb4c 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
@@ -28,21 +28,21 @@ import java.util.List;
@XmlRootElement(name = "subscriptionDomainRequest")
public class SubscriptionDomainRequest {
private String domainName;
- private String applicationAlias;
+ private String applicationContext;
public String getDomainName() {
return domainName;
}
- public String getApplicationAlias() {
- return applicationAlias;
+ public String getApplicationContext() {
+ return applicationContext;
}
public void setDomainName(String domainName) {
this.domainName = domainName;
}
- public void setApplicationAlias(String applicationAlias) {
- this.applicationAlias = applicationAlias;
+ public void setApplicationContext(String applicationContext) {
+ this.applicationContext = applicationContext;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b61c4fc3/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 640a751..6b7eb66 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
@@ -1186,10 +1186,10 @@ public class ServiceUtils {
}
public static StratosAdminResponse addSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType,
- String subscriptionAlias, String domainName, String applicationAlias) throws RestAPIException {
+ String subscriptionAlias, String domainName, String applicationContext) throws RestAPIException {
try {
int tenantId = ApplicationManagementUtil.getTenantId(configurationContext);
- cartridgeSubsciptionManager.addSubscriptionDomain(tenantId, subscriptionAlias, domainName, applicationAlias);
+ cartridgeSubsciptionManager.addSubscriptionDomain(tenantId, subscriptionAlias, domainName, applicationContext);
} 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/b61c4fc3/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 047da1e..a573225 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
@@ -1027,7 +1027,7 @@ public class StratosAdmin extends AbstractAdmin {
@PathParam("subscriptionAlias") String subscriptionAlias,
SubscriptionDomainRequest request) throws RestAPIException {
- return ServiceUtils.addSubscriptionDomain(getConfigContext(), cartridgeType, subscriptionAlias, request.getDomainName(), request.getApplicationAlias());
+ return ServiceUtils.addSubscriptionDomain(getConfigContext(), cartridgeType, subscriptionAlias, request.getDomainName(), request.getApplicationContext());
}
@GET
[2/2] git commit: Added subscription domain events extension scripts
and added tenant domain name as an argument
Posted by im...@apache.org.
Added subscription domain events extension scripts and added tenant domain name as an argument
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d6843ebe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d6843ebe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d6843ebe
Branch: refs/heads/master
Commit: d6843ebecd00d9fa8ea7fcec029c4d56aa7599d9
Parents: b61c4fc
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed May 7 09:13:12 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed May 7 09:13:12 2014 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 46 +++++++++++++++++---
.../cartridge/agent/util/ExtensionUtils.java | 14 +++---
.../extensions/subscription-domain-added.sh | 28 ++++++++++++
.../extensions/subscription-domain-removed.sh | 28 ++++++++++++
4 files changed, 105 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d6843ebe/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index bb8e71f..5537637 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -34,6 +34,7 @@ import org.apache.stratos.cartridge.agent.event.publisher.CartridgeAgentEventPub
import org.apache.stratos.cartridge.agent.util.CartridgeAgentConstants;
import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils;
import org.apache.stratos.cartridge.agent.util.ExtensionUtils;
+import org.apache.stratos.messaging.domain.tenant.Tenant;
import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent;
import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent;
@@ -47,6 +48,7 @@ import org.apache.stratos.messaging.listener.tenant.SubscriptionDomainsAddedEven
import org.apache.stratos.messaging.listener.tenant.SubscriptionDomainsRemovedEventListener;
import org.apache.stratos.messaging.message.receiver.instance.notifier.InstanceNotifierEventReceiver;
import org.apache.stratos.messaging.message.receiver.tenant.TenantEventReceiver;
+import org.apache.stratos.messaging.message.receiver.tenant.TenantManager;
import java.util.List;
import java.util.concurrent.Executors;
@@ -173,17 +175,37 @@ public class CartridgeAgent implements Runnable {
tenantEventReceiver.addEventListener(new SubscriptionDomainsAddedEventListener() {
@Override
protected void onEvent(Event event) {
- SubscriptionDomainAddedEvent subscriptionDomainAddedEvent = (SubscriptionDomainAddedEvent)event;
- ExtensionUtils.executeSubscriptionDomainAddedExtension(subscriptionDomainAddedEvent.getDomainName(),
- subscriptionDomainAddedEvent.getApplicationContext());
+ try {
+ SubscriptionDomainAddedEvent subscriptionDomainAddedEvent = (SubscriptionDomainAddedEvent) event;
+ ExtensionUtils.executeSubscriptionDomainAddedExtension(
+ subscriptionDomainAddedEvent.getTenantId(),
+ findTenantDomain(subscriptionDomainAddedEvent.getTenantId()),
+ subscriptionDomainAddedEvent.getDomainName(),
+ subscriptionDomainAddedEvent.getApplicationContext());
+ }
+ catch (Exception e) {
+ if(log.isErrorEnabled()) {
+ log.error("Could not process subscription domain added event", e);
+ }
+ }
}
});
tenantEventReceiver.addEventListener(new SubscriptionDomainsRemovedEventListener() {
@Override
protected void onEvent(Event event) {
- SubscriptionDomainRemovedEvent subscriptionDomainRemovedEvent = (SubscriptionDomainRemovedEvent)event;
- ExtensionUtils.executeSubscriptionDomainRemovedExtension(subscriptionDomainRemovedEvent.getDomainName());
+ try {
+ SubscriptionDomainRemovedEvent subscriptionDomainRemovedEvent = (SubscriptionDomainRemovedEvent) event;
+ ExtensionUtils.executeSubscriptionDomainRemovedExtension(
+ subscriptionDomainRemovedEvent.getTenantId(),
+ findTenantDomain(subscriptionDomainRemovedEvent.getTenantId()),
+ subscriptionDomainRemovedEvent.getDomainName());
+ }
+ catch (Exception e) {
+ if(log.isErrorEnabled()) {
+ log.error("Could not process subscription domain removed event", e);
+ }
+ }
}
});
@@ -203,6 +225,20 @@ public class CartridgeAgent implements Runnable {
}
}
+ private String findTenantDomain(int tenantId) {
+ try {
+ TenantManager.acquireReadLock();
+ Tenant tenant = TenantManager.getInstance().getTenant(tenantId);
+ if(tenant == null) {
+ throw new RuntimeException(String.format("Tenant could not be found: [tenant-id] %d", tenantId));
+ }
+ return tenant.getTenantDomain();
+ }
+ finally {
+ TenantManager.releaseReadLock();
+ }
+ }
+
protected void validateRequiredSystemProperties() {
String jndiPropertiesDir = System.getProperty(CartridgeAgentConstants.JNDI_PROPERTIES_DIR);
if(StringUtils.isBlank(jndiPropertiesDir)) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d6843ebe/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
index 5bd922d..a29cc8b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
@@ -133,12 +133,13 @@ public class ExtensionUtils {
}
}
- public static void executeSubscriptionDomainAddedExtension(String domain, String applicationContext) {
+ public static void executeSubscriptionDomainAddedExtension(int tenantId, String tenantDomain, String domainName, String applicationContext) {
try {
if(log.isDebugEnabled()) {
- log.debug("Executing subscription domain added extension: [domain] %s [application-context] %s");
+ log.debug(String.format("Executing subscription domain added extension: [tenant-id] %d [tenant-domain] %s " +
+ "[domain-name] %s [application-context] %s", tenantId, tenantDomain, domainName, applicationContext));
}
- String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_ADDED_SH + " " + domain + " " + applicationContext);
+ String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_ADDED_SH + " " + domainName + " " + applicationContext);
CommandUtils.executeCommand(command);
}
catch (Exception e) {
@@ -146,12 +147,13 @@ public class ExtensionUtils {
}
}
- public static void executeSubscriptionDomainRemovedExtension(String domain) {
+ public static void executeSubscriptionDomainRemovedExtension(int tenantId, String tenantDomain, String domainName) {
try {
if(log.isDebugEnabled()) {
- log.debug("Executing subscription domain removed extension: [domain] %s");
+ log.debug(String.format("Executing subscription domain removed extension: [tenant-id] %d [tenant-domain] %s " +
+ "[domain-name] %s [application-context] %s", tenantId, tenantDomain, domainName));
}
- String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_ADDED_SH + " " + domain);
+ String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_REMOVED_SH + " " + domainName);
CommandUtils.executeCommand(command);
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d6843ebe/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-added.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-added.sh b/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-added.sh
new file mode 100644
index 0000000..0ae36f5
--- /dev/null
+++ b/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-added.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# --------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# --------------------------------------------------------------
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
+# --------------------------------------------------------------
+#
+
+log=/var/log/apache-stratos/cartridge-agent-extensions.log
+echo "Subscription domain added: [tenant-id] $1 [tenant-domain] $2 [domain-name] $3 [application-context] $4" | tee -a $log
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d6843ebe/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-removed.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-removed.sh b/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-removed.sh
new file mode 100644
index 0000000..76480bc
--- /dev/null
+++ b/products/cartridge-agent/modules/distribution/src/main/extensions/subscription-domain-removed.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# --------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# --------------------------------------------------------------
+# This extension script will be executed when a subscription domain removed
+# event is received by the cartridge agent.
+# --------------------------------------------------------------
+#
+
+log=/var/log/apache-stratos/cartridge-agent-extensions.log
+echo "Subscription domain added: [tenant-id] $1 [tenant-domain] $2 [domain-name] $3" | tee -a $log
\ No newline at end of file