Resolving merge issues and committing patch given by Vimuth for data publishing. STRATOS-517
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6932793f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6932793f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6932793f Branch: refs/heads/master Commit: 6932793f62428750630e8c014c41c1326171d005 Parents: 8c63858 Author: Sajith Kariyawasam <[email protected]> Authored: Sat Mar 22 02:30:05 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Sat Mar 22 02:30:05 2014 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 13 +++++++++++ .../manager/utils/CartridgeConstants.java | 23 +++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6932793f/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 0b63076..18df8c7 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 @@ -48,6 +48,7 @@ import org.apache.stratos.manager.utils.CartridgeConstants; import org.apache.stratos.manager.utils.RepoPasswordMgtUtil; import org.apache.stratos.messaging.util.Constants; import org.wso2.carbon.context.CarbonContext; +import org.apache.stratos.manager.publisher.CartridgeSubscriptionDataPublisher; import java.util.Collection; import java.util.Random; @@ -216,6 +217,18 @@ public class CartridgeSubscriptionManager { lbDataContext.getDeploymentPolicy(), repository); + // publishing to bam + CartridgeSubscriptionDataPublisher.publish(subscriptionData.getTenantId(), + subscriptionData.getTenantAdminUsername(), lbAlias, + lbDataContext.getLbCartridgeInfo().getType(), + subscriptionData.getRepositoryURL(), + serviceCartridgeInfo.getMultiTenant(), + lbDataContext.getDeploymentPolicy(), + lbDataContext.getAutoscalePolicy(), + cartridgeSubscription.getCluster().getClusterDomain(), + cartridgeSubscription.getHostName(), + cartridgeSubscription.getMappedDomain(), "Subscribed"); + log.info("Tenant [" + subscriptionData.getTenantId() + "] with username [" + subscriptionData.getTenantAdminUsername() + " subscribed to " + "] Cartridge with Alias " + lbAlias + ", Cartridge Type: " + lbDataContext.getLbCartridgeInfo().getType() + ", Autoscale Policy: " + lbDataContext.getAutoscalePolicy() + ", Deployment Policy: " + lbDataContext.getDeploymentPolicy()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6932793f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java index ab98b69..95a1c6d 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java @@ -67,7 +67,28 @@ public class CartridgeConstants { public static final String AUTOSCALER_SOCKET_TIMEOUT = "autoscaler.socket.timeout"; public static final String AUTOSCALER_CONNECTION_TIMEOUT = "autoscaler.connection.timeout"; - public static final String COMMIT_ENABLED = "COMMIT_ENABLED"; + public static final String COMMIT_ENABLED = "COMMIT_ENABLED"; + + // BAM publisher related values + public static final String BAM_PUBLISHER_ENABLED = "bam.publisher.enabled"; + public static final String BAM_ADMIN_USERNAME = "bam.admin.username"; + public static final String BAM_ADMIN_PASSWORD = "bam.admin.password"; + public static final String DATA_PUB_TASK_NAME = "CartridgeSubscriptionDataPublisher"; + public static final String STRATOS_MANAGER_EVENT_STREAM = "org_apache_stratos_manager"; + + // BAM stream definition relate values + public static final String TENANT_ID_COL = "tenantID"; + public static final String ADMIN_USER_COL = "adminUser"; + public static final String CARTRIDGE_ALIAS_COL = "cartridgeAlias"; + public static final String CARTRIDGE_TYPE_COL = "cartridgeType"; + public static final String REPOSITORY_URL_COL = "repositoryUrl"; + public static final String MULTI_TENANT_BEHAVIOR_COL = "isMultiTenant"; + public static final String AUTO_SCALE_POLICY_COL = "autoScalePolicy"; + public static final String DEPLOYMENT_POLICY_COL = "deploymentPolicy"; + public static final String CLUSTER_ID_COL = "clusterId"; + public static final String HOST_NAME_COL = "hostname"; + public static final String MAPPED_DOMAIN_COL = "mappedDomain"; + public static final String ACTION_COL = "action"; public static final class DomainMappingInfo { public static final String ACTUAL_HOST = "actual.host";
