You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/02/09 14:05:23 UTC
[4/4] git commit: doing code cleanup
doing code cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b746b90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b746b90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b746b90e
Branch: refs/heads/master
Commit: b746b90e48aa54c958b7572817d2a1907760d8a0
Parents: ade7fa9
Author: Isuru <is...@wso2.com>
Authored: Sun Feb 9 18:33:54 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sun Feb 9 18:33:54 2014 +0530
----------------------------------------------------------------------
.../stratos/manager/internal/DataHolder.java | 8 -
.../manager/lookup/ClusterIdToSubscription.java | 5 -
.../manager/lookup/LookupDataHolder.java | 6 -
.../manager/CartridgeSubscriptionManager.java | 333 -------------------
.../manager/payload/BasicPayloadData.java | 28 --
.../stratos/manager/payload/PayloadData.java | 16 +-
.../manager/persistence/PersistenceManager.java | 44 ---
.../RegistryBasedPersistenceManager.java | 216 ------------
.../manager/registry/RegistryManager.java | 130 --------
.../DataInsertionAndRetrievalManager.java | 117 +------
.../SubscriptionMultiTenantBehaviour.java | 5 +-
11 files changed, 6 insertions(+), 902 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/DataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/DataHolder.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/DataHolder.java
index 9de2327..496a54c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/DataHolder.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/DataHolder.java
@@ -71,14 +71,6 @@ public class DataHolder {
DataHolder.registryService = registryService;
}
- /*public static TopologyManagementService getTopologyMgtService() {
- return topologyMgtService;
- }
-
- public static void setTopologyMgtService(TopologyManagementService topologyMgtService) {
- DataHolder.topologyMgtService = topologyMgtService;
- }*/
-
public static EventPublisher getEventPublisher() {
return eventPublisher;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java
index 1dffdd0..a994a73 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java
@@ -73,11 +73,6 @@ public class ClusterIdToSubscription implements Serializable {
public void removeSubscription (String clusterId, String subscriptionAlias) {
- /*if (clusterIdToCartridgeSubscription.remove(clusterId) != null) {
- if (log.isDebugEnabled()) {
- log.debug("Deleted the subscription for cluster " + clusterId + " from [Cluster Id -> CartridgeSubscription] map");
- }
- }*/
// remove Subscription from clusterIdToCartridgeSubscription map
Set<CartridgeSubscription> existingSubscriptions = clusterIdToCartridgeSubscription.get(clusterId);
if (existingSubscriptions != null && !existingSubscriptions.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java
index 845946c..260feb2 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java
@@ -61,12 +61,6 @@ public class LookupDataHolder implements Serializable {
public void putSubscription (CartridgeSubscription cartridgeSubscription) {
- /*if (clusterIdToSubscription.getSubscription(cartridgeSubscription.getClusterDomain()) != null) {
- if(log.isDebugEnabled()) {
- log.debug("Overwriting the existing CartridgeSubscription for cluster " + cartridgeSubscription.getClusterDomain() +
- " in [Cluster Id -> CartridgeSubscription] map");
- }
- }*/
// add or update
clusterIdToSubscription.addSubscription(cartridgeSubscription);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/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 318b5f7..2ceaffd 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
@@ -19,7 +19,6 @@
package org.apache.stratos.manager.manager;
-import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
@@ -189,132 +188,15 @@ public class CartridgeSubscriptionManager {
cartridgeType + ", Repo URL: " + repositoryURL + ", Policy: " +
autoscalingPolicyName);
- //moved to SubscriptionSingleTenantBehaviour#createSubscription method
-
- //Create the payload
- /*BasicPayloadData basicPayloadData = CartridgeSubscriptionUtils.createBasicPayload(cartridgeSubscription);
- //Populate the basic payload details
- basicPayloadData.populatePayload();
-
- PayloadData payloadData = PayloadFactory.getPayloadDataInstance(cartridgeInfo.getProvider(),
- cartridgeInfo.getType(), basicPayloadData);
-
- // get the payload parameters defined in the cartridge definition file for this cartridge type
- if (cartridgeInfo.getProperties() != null && cartridgeInfo.getProperties().length != 0) {
-
- for (Property property : cartridgeInfo.getProperties()) {
- // check if a property is related to the payload. Currently this is done by checking if the
- // property name starts with 'payload_parameter.' suffix. If so the payload param name will
- // be taken as the substring from the index of '.' to the end of the property name.
- if (property.getName()
- .startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
- String payloadParamName = property.getName();
- payloadData.add(payloadParamName.substring(payloadParamName.indexOf(".") + 1), property.getValue());
- }
- }
- }
-
- //check if there are any custom payload entries defined
- if (cartridgeSubscription.getCustomPayloadEntries() != null) {
- //add them to the payload
- Map<String, String> customPayloadEntries = cartridgeSubscription.getCustomPayloadEntries();
- Set<Map.Entry<String,String>> entrySet = customPayloadEntries.entrySet();
- for (Map.Entry<String, String> entry : entrySet) {
- payloadData.add(entry.getKey(), entry.getValue());
- }
- }
-
- cartridgeSubscription.setPayloadData(payloadData);
- */
// Publish tenant subscribed event to message broker
CartridgeSubscriptionUtils.publishTenantSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(),
cartridgeSubscription.getCartridgeInfo().getType());
- //moved to SubscriptionMultiTenantBehaviour#createSubscription method
-
- /*if(cartridgeInfo.getMultiTenant()) {
- log.info(" Multitenant --> Publishing Artifact update event -- ");
- log.info(" Values : cluster id - " + cartridgeSubscription.getClusterDomain() + " tenant - " +
- cartridgeSubscription.getSubscriber().getTenantId());
- InstanceNotificationPublisher publisher = new InstanceNotificationPublisher(cartridgeSubscription.getRepository(),
- cartridgeSubscription.getClusterDomain(), // clusterId
- String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
- publisher.publish();
- }*/
-
return cartridgeSubscription;
}
/**
- * Connects / groups cartridges
- *
- * @param tenantDomain Tenant's domain
- * @param cartridgeSubscription CartridgeSubscription instance to which the CartridgeSubscription denoted by
- * connectingSubscriptionAlias will be connected to
- * @param connectingSubscriptionAlias Alias of the connecting cartridge
- *
- * @throws ADCException
- * @throws NotSubscribedException
- * @throws AxisFault
- */
-// public void connectCartridges (String tenantDomain, CartridgeSubscription cartridgeSubscription,
-// String connectingSubscriptionAlias)
-// throws ADCException, NotSubscribedException, AxisFault {
-//
-// //TODO: retrieve from the cache and connect. For now, new objects are created
-//
-// CartridgeSubscription connectingCartridgeSubscription = getCartridgeSubscriptionForCluster(tenantDomain,
-// connectingSubscriptionAlias);
-//
-// if(cartridgeSubscription == null) {
-// String errorMsg = "No cartridge subscription found in cache for tenant " + tenantDomain + " connecting aborted";
-// log.error(errorMsg);
-// return;
-// }
-//
-// if(connectingCartridgeSubscription == null) {
-// String errorMsg = "No cartridge subscription found in cache for tenant " + tenantDomain + ", alias " +
-// connectingSubscriptionAlias + ", connecting aborted";
-// log.error(errorMsg);
-// return;
-// }
-//
-// CartridgeSubscriptionConnector cartridgeSubscriptionConnector = CartridgeSubscriptionConnectorFactory.
-// getCartridgeInstanceConnector(connectingCartridgeSubscription.getType());
-//
-// cartridgeSubscription.connect(connectingSubscriptionAlias);
-//
-// //PayloadArg payloadArg = cartridgeSubscription.createPayloadParameters();
-//
-// //get additional payload params for connecting cartridges
-// Properties payloadProperties = cartridgeSubscriptionConnector.createConnection(cartridgeSubscription,
-// connectingCartridgeSubscription);
-// StringBuilder connectionParamsBuilder = new StringBuilder();
-// Set<Map.Entry<Object,Object>> payloadParamEntries = payloadProperties.entrySet();
-//
-// for (Map.Entry<Object, Object> payloadParamEntry : payloadParamEntries) {
-// connectionParamsBuilder.append(",");
-// connectionParamsBuilder.append(payloadParamEntry.getKey().toString());
-// connectionParamsBuilder.append("=");
-// connectionParamsBuilder.append(payloadParamEntry.getValue().toString());
-// }
-//
-// //add connection relates parameters to the payload
-// if(cartridgeSubscription.getPayloadData() != null) {
-// //cartridgeSubscription.getPayloadData().populatePayload(connectionParamsBuilder.toString());
-// } else {
-// //no existing payload
-// /*Payload payload = PayloadFactory.getPayloadDataInstance(cartridgeSubscription.getCartridgeInfo().getProvider(),
-// cartridgeSubscription.getType(), "/tmp/" + tenantDomain + "-" + cartridgeSubscription.getAlias() +
-// ".zip");
-// payload.populatePayload(connectionParamsBuilder.toString());
-// cartridgeSubscription.setPayloadData(payload);*/
-// }
-//
-// }
-
- /**
* Registers the cartridge subscription for the given CartridgeSubscriptionInfo object
*
* @param cartridgeSubscription CartridgeSubscription subscription
@@ -331,21 +213,6 @@ public class CartridgeSubscriptionManager {
//set status as 'SUBSCRIBED'
cartridgeSubscription.setSubscriptionStatus(CartridgeConstants.SUBSCRIBED);
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /*int subscriptionId;
- try {
- subscriptionId = PersistenceManager.persistSubscription(cartridgeSubscriptionInfo);
-
- } catch (Exception e) {
- String errorMsg = "Error saving subscription for tenant " +
- cartridgeSubscription.getSubscriber().getTenantDomain() + ", alias " + cartridgeSubscription.getType();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }*/
-
- //cartridgeSubscription.setSubscriptionId(subscriptionId);
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
try {
new DataInsertionAndRetrievalManager().cacheAndPersistSubcription(cartridgeSubscription);
@@ -356,8 +223,6 @@ public class CartridgeSubscriptionManager {
throw new ADCException(errorMsg, e);
}
- ApplicationManagementUtil.addDNSEntry(cartridgeSubscriptionInfo.getAlias(), cartridgeSubscription.getType());
-
log.info("Successful Subscription: " + cartridgeSubscription.toString());
return ApplicationManagementUtil.
createSubscriptionResponse(cartridgeSubscriptionInfo, cartridgeSubscription.getRepository());
@@ -419,202 +284,4 @@ public class CartridgeSubscriptionManager {
throw new NotSubscribedException(errorMsg, alias);
}
}
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /*
- /**
- * Creates and returns a CartridgeSubscription object
- *
- * @param tenantDomain Tenant's domain
- * @param alias alias given at subscription
- *
- * @return CartridgeSubscription object populated with relevant information
- * @throws ADCException
- * @throws NotSubscribedException
- */
- /*public CartridgeSubscription getCartridgeSubscriptionForCluster(String tenantDomain, String alias)
- throws ADCException, NotSubscribedException {
-
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(tenantDomain, alias);
-
- CartridgeInfo cartridgeInfo;
- try {
- cartridgeInfo = CloudControllerServiceClient.getServiceClient().
- getCartridgeInfo(cartridgeSubscriptionInfo.getCartridge());
- } catch (Exception e) {
- throw new ADCException(e.getMessage(), e);
- }
-
- return populateCartridgeSubscriptionInformation(cartridgeInfo, cartridgeSubscriptionInfo);
- }*/
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- //TODO: remove
- /*public CartridgeSubscription deployMultitenantService(String cartridgeType, String cartridgeAlias,
- String autoscalingPolicyName, String deploymentPolicyName,
- String tenantDomain, int tenantId,
- String tenantAdminUsername,
- String clusterDomain, String clusterSubdomain,
- String repositoryURL, boolean isPrivateRepository,
- String repositoryUsername, String repositoryPassword, String tenantRange) throws ADCException, InvalidCartridgeAliasException, DuplicateCartridgeAliasException, PolicyException,
- UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException,
- RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException {
-
- log.info(" ---- in deploy multitenant service ---- ");
- //validate cartridge alias
- ApplicationManagementUtil.validateCartridgeAlias(cartridgeAlias, cartridgeType);
-
- CartridgeInfo cartridgeInfo;
- try {
- cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
-
- } catch (UnregisteredCartridgeException e) {
- String message = cartridgeType
- + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
- log.error(message);
- throw e;
-
- } catch (Exception e) {
- String message = "Error getting info for " + cartridgeType;
- log.error(message, e);
- throw new ADCException(message, e);
- }
-
- Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain);
-
- CartridgeSubscription cartridgeSubscription = new FrameworkCartridgeSubscription(cartridgeInfo,true);
- log.info("-- Cartridge subscription is created --- ");
- Repository repository = cartridgeSubscription.manageRepository(repositoryURL, repositoryUsername,
- repositoryPassword, isPrivateRepository, cartridgeAlias, cartridgeInfo, tenantDomain);
- log.info("-- Repository creation is done --- ");
- cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName, deploymentPolicyName, repository);
- cartridgeSubscription.setSubscriptionKey(generateSubscriptionKey());
-
- //cartridgeSubscription.setClusterDomain(clusterDomain);
- //cartridgeSubscription.setClusterSubDomain(clusterDomain);
-
- log.info("-- subscription key is generated --- ");
- log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername +
- " subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " + cartridgeType +
- ", Repo URL: " + repositoryURL + ", Policy: " + autoscalingPolicyName);
-
- // TODO -- payload would need some additional params - like Puppet master IP .. etc
-
- Payload payload = PayloadFactory.getPayloadDataInstance(cartridgeInfo.getProvider(), cartridgeType,
- "/tmp/" + tenantDomain + "-" + cartridgeAlias + ".zip");
- PayloadArg payloadArg = cartridgeSubscription.createPayloadParameters();
-
- if (payloadArg != null) {
- //populate the payload
- payload.populatePayload(payloadArg);
-
- // populate payload from UI here
- payloadArg.setTenantRange(tenantRange);
- //payloadArg.setDeployment("default");
- payloadArg.setServiceDomain(cartridgeAlias+"."+cartridgeInfo.getHostName()+".domain"); // This is cluster id
- cartridgeSubscription.setPayloadData(payload);
- }
-
- //get the payload parameters defined in the cartridge definition file for this cartridge type
- if (cartridgeInfo.getProperties() != null && cartridgeInfo.getProperties().length != 0) {
-
- StringBuilder customPayloadParamsBuilder = new StringBuilder();
- for(Property property : cartridgeInfo.getProperties()) {
- //check if a property is related to the payload. Currently this is done by checking if the
- //property name starts with 'payload_parameter.' suffix. If so the payload param name will
- //be taken as the substring from the index of '.' to the end of the property name.
- if(property.getName().startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
- String payloadParamName = property.getName();
- customPayloadParamsBuilder.append(",");
- customPayloadParamsBuilder.append(payloadParamName.
- substring(payloadParamName.indexOf(".") + 1));
- customPayloadParamsBuilder.append("=");
- customPayloadParamsBuilder.append(property.getValue());
- }
- }
- //if valid payload related parameters are found in the cartridge definition file, add them to the payload
- String customPayloadParamString = customPayloadParamsBuilder.toString();
- if(!customPayloadParamString.isEmpty()) {
- payload.populatePayload(customPayloadParamString);
- cartridgeSubscription.setPayloadData(payload);
- }
- }
-
- return cartridgeSubscription;
-
- }*/
-
- /*private CartridgeSubscriptionInfo getCartridgeSubscriptionInfo (String tenantDomain, String alias)
- throws ADCException, NotSubscribedException {
-
- CartridgeSubscriptionInfo subscription;
- try {
- subscription = PersistenceManager.getSubscription(tenantDomain, alias);
-
- } catch (Exception e) {
- String msg = "Failed to get subscriptions for " + tenantDomain;
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- if (subscription == null) {
- String msg = "Tenant " + tenantDomain + " has not subscribed for cartridges";
- log.error(msg);
- throw new NotSubscribedException(msg, msg);
- }
-
- return subscription;
-
- }*/
-
- /*private List<CartridgeSubscriptionInfo> getCartridgeSubscriptions (int tenantId) throws ADCException, NotSubscribedException {
-
- List<CartridgeSubscriptionInfo> subscriptions;
- try {
- subscriptions = PersistenceManager.getSubscriptionsForTenant(tenantId);
-
- } catch (Exception e) {
- String msg = "Failed to get subscriptions for " + tenantId;
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- if (subscriptions == null) {
- String msg = "Tenant " + tenantId + " has not subscribed for cartridges";
- log.error(msg);
- throw new NotSubscribedException(msg, msg);
- }
-
- return subscriptions;
- }*/
-
- /*private CartridgeSubscription populateCartridgeSubscriptionInformation(CartridgeInfo cartridgeInfo,
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo)
- throws ADCException {
-
- SubscriptionTenancyBehaviour tenancyBehaviour;
- if(cartridgeInfo.getMultiTenant()) {
- tenancyBehaviour = new SubscriptionMultiTenantBehaviour();
- } else {
- tenancyBehaviour = new SubscriptionSingleTenantBehaviour();
- }
-
- CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory.
- getCartridgeSubscriptionInstance(cartridgeInfo, tenancyBehaviour);
-
- cartridgeSubscription.setSubscriptionId(cartridgeSubscriptionInfo.getSubscriptionId());
- cartridgeSubscription.setAlias(cartridgeSubscriptionInfo.getAlias());
- cartridgeSubscription.setHostName(cartridgeSubscriptionInfo.getHostName());
- cartridgeSubscription.setClusterDomain(cartridgeSubscriptionInfo.getClusterDomain());
- cartridgeSubscription.setClusterSubDomain(cartridgeSubscriptionInfo.getClusterSubdomain());
- cartridgeSubscription.setMgtClusterDomain(cartridgeSubscriptionInfo.getMgtClusterDomain());
- cartridgeSubscription.setMgtClusterSubDomain(cartridgeSubscriptionInfo.getMgtClusterSubDomain());
- cartridgeSubscription.setAutoscalingPolicyName(cartridgeSubscriptionInfo.getPolicy());
- Subscriber subscriber = new Subscriber(CarbonContext.getThreadLocalCarbonContext().getUsername(),
- cartridgeSubscriptionInfo.getTenantId(), cartridgeSubscriptionInfo.getTenantDomain());
- cartridgeSubscription.setSubscriber(subscriber);
- cartridgeSubscription.setRepository(cartridgeSubscriptionInfo.getRepository());
-
- return cartridgeSubscription;
- }*/
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java
index 916fa9e..3c14a97 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java
@@ -159,34 +159,6 @@ public class BasicPayloadData implements Serializable {
public StringBuilder getPayloadData () {
- /*payloadBuilder.append("SERVICE_NAME=" + getServiceName());
- payloadBuilder.append(",");
- payloadBuilder.append("HOST_NAME=" + getHostName());
- payloadBuilder.append(",");
- payloadBuilder.append("MULTITENANT=" + getMultitenant());
- payloadBuilder.append(",");
- payloadBuilder.append("TENANT_ID=" + getTenantId());
- payloadBuilder.append(",");
- payloadBuilder.append("TENANT_RANGE=" + getTenantRange());
- payloadBuilder.append(",");
- payloadBuilder.append("CARTRIDGE_ALIAS=" + getSubscriptionAlias());
- payloadBuilder.append(",");
- payloadBuilder.append("CLUSTER_ID=" + getClusterId());
- payloadBuilder.append(",");
- payloadBuilder.append("CARTRIDGE_KEY=" + getSubscriptionKey());
- payloadBuilder.append(",");
- payloadBuilder.append("DEPLOYMENT=" + getDeployment());
- payloadBuilder.append(",");
- payloadBuilder.append("APP_PATH=" + getApplicationPath());
- payloadBuilder.append(",");
- payloadBuilder.append("GIT_REPO=" + getGitRepositoryUrl());
- payloadBuilder.append(",");
- payloadBuilder.append("PORTS=" + getPortMappings());
-
- //Payload Data exposed as system variables
- payloadBuilder.append(",");
- payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));*/
-
return payloadBuilder;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
index 168e656..59bf664 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
@@ -23,16 +23,13 @@ import java.io.Serializable;
public abstract class PayloadData implements Serializable {
- //protected StringBuilder additionalPayloadDataBuilder;
- //private Map<String, String> payloadDataMap;
private BasicPayloadData basicPayloadData;
private StringBuilder completePayloadDataBuilder;
public PayloadData(BasicPayloadData basicPayloadData) {
+
this.setBasicPayloadData(basicPayloadData);
- //additionalPayloadDataBuilder = new StringBuilder();
completePayloadDataBuilder = new StringBuilder(basicPayloadData.getPayloadData());
- //payloadDataMap = new HashMap<String, String>();
}
public void add (String payloadDataName, String payloadDataValue) {
@@ -41,22 +38,11 @@ public abstract class PayloadData implements Serializable {
completePayloadDataBuilder.append(",");
}
- //payloadDataMap.putSubscription(payloadDataName, payloadDataValue);
completePayloadDataBuilder.append(payloadDataName + "=" + payloadDataValue);
}
- /*public String getPayloadDataValue (String payloadDataName) {
- return payloadDataMap.get(payloadDataName);
- }*/
-
public StringBuilder getCompletePayloadData () {
- /*if(additionalPayloadDataBuilder.length() > 0) {
- return getBasicPayloadData().getPayloadData().append(",").append(additionalPayloadDataBuilder);
- } else {
- return getBasicPayloadData().getPayloadData();
- }*/
-
return completePayloadDataBuilder;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
index 8822928..61aa70d 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
@@ -33,9 +33,6 @@ public abstract class PersistenceManager {
public abstract void removeCartridgeSubscription (int tenantId, String type, String alias)
throws PersistenceManagerException;
- //public abstract CartridgeSubscription getCartridgeSubscriptionForCluster(int tenantId, String alias)
- // throws PersistenceManagerException;
-
public abstract Collection<CartridgeSubscription> getCartridgeSubscriptions()
throws PersistenceManagerException;
@@ -48,45 +45,4 @@ public abstract class PersistenceManager {
public abstract void removeService (String cartridgeType) throws PersistenceManagerException;
- //public abstract Collection<CartridgeSubscription> getCartridgeSubscriptions(int tenantId)
- // throws PersistenceManagerException;
-
- //public abstract CartridgeSubscription getCartridgeSubscriptionForCluster (String clusterDomain)
- // throws PersistenceManagerException;
-
- //public abstract Collection<CartridgeSubscription> getCartridgeSubscriptions(int tenantId, String cartridgeType)
- // throws PersistenceManagerException;
-
- /*public abstract Repository getRepository (int tenantId, String alias)
- throws PersistenceManagerException;
-
- public abstract Repository getRepository (String clusterDomain)
- throws PersistenceManagerException;
-
- public abstract DataCartridge getDataCartridgeSubscriptionInfo (int tenantId, String alias)
- throws PersistenceManagerException;
-
- public abstract boolean isAliasTaken (int tenantId, String alias)
- throws PersistenceManagerException;
-
- public abstract boolean hasSubscribed (int tenantId, String cartridgeType)
- throws PersistenceManagerException;
-
- public abstract void removeDomainMapping (int tenantId, String cartridgeAlias)
- throws PersistenceManagerException;
-
- public abstract void updateDomianMapping (int tenantId, String cartridgeAlias, String newDomain)
- throws PersistenceManagerException;
-
- public abstract String getMappedDomain (int tenantId, String cartridgeAlias)
- throws PersistenceManagerException;
-
- public abstract Cluster getCluster (int tenantId, String cartridgeAlias)
- throws PersistenceManagerException;
-
- public abstract void updateSubscriptionStatus (int tenantId, String cartridgeAlias, String newStatus)
- throws PersistenceManagerException;
-
- public abstract void updateServiceStatus (int tenantId, String cartridgeAlias, String newStatus)
- throws PersistenceManagerException; */
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
index 0b18a7f..f3e6f3e 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
@@ -115,18 +115,6 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
private void removeSubscription (int tenantId, String type, String alias) throws PersistenceManagerException {
- /*String resourcePath = STRATOS_MANAGER_REOSURCE + ACTIVE_SUBSCRIPTIONS + "/" + Integer.toString(tenantId) + "/" + type + "/" + alias;
-
- try {
- RegistryManager.getInstance().delete(resourcePath);
- if (log.isDebugEnabled()) {
- log.debug("Deleted CartridgeSubscription on path " + resourcePath + " successfully");
- }
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }*/
-
// move the subscription from active set to inactive set
String sourcePath = STRATOS_MANAGER_REOSURCE + ACTIVE_SUBSCRIPTIONS + "/" + Integer.toString(tenantId) + "/" + type + "/" + alias;
String targetPath = STRATOS_MANAGER_REOSURCE + INACTIVE_SUBSCRIPTIONS + "/" + Integer.toString(tenantId) + "/" + type + "/" + alias;
@@ -142,94 +130,6 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
}
}
- /*@Override
- public CartridgeSubscription getCartridgeSubscriptionForCluster (int tenantId, String alias) throws PersistenceManagerException {
-
- Object byteObj;
-
- try {
- byteObj = RegistryManager.getInstance().retrieve(STRATOS_MANAGER_REOSURCE + SUBSCRIPTION_CONTEXT + "/" +
- Integer.toString(tenantId));
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }
-
- if (byteObj == null) {
- return null;
- }
-
- Object subscriptionContextObj;
-
- try {
- subscriptionContextObj = Deserializer.deserializeFromByteArray((byte[]) byteObj);
-
- } catch (Exception e) {
- throw new PersistenceManagerException(e);
- }
-
- SubscriptionContext subscriptionContext;
- if (subscriptionContextObj instanceof SubscriptionContext) {
- subscriptionContext = (SubscriptionContext) subscriptionContextObj;
- return subscriptionContext.getSubscriptionForAlias(alias);
- }
-
- return null;
- }*/
-
- /*@Override
- public Collection<CartridgeSubscription> getCartridgeSubscriptions () throws PersistenceManagerException {
-
- Object resourceObj;
-
- try {
- resourceObj = RegistryManager.getInstance().retrieve(STRATOS_MANAGER_REOSURCE + SUBSCRIPTION_CONTEXT);
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }
-
- if ((resourceObj == null) || !(resourceObj instanceof String[])) {
- return null;
- }
-
- // get the paths for all SubscriptionContext instances
- String[] subscriptionCtxtResourcePaths = (String[]) resourceObj;
-
- Collection<CartridgeSubscription> cartridgeSubscriptions = new ArrayList<CartridgeSubscription>();
- //for each path, get the SubscriptionContext instance
- for (String subscriptionCtxResourcePath : subscriptionCtxtResourcePaths) {
-
- Object serializedSubscriptionCtxObj = null;
- try {
- serializedSubscriptionCtxObj = RegistryManager.getInstance().retrieve(subscriptionCtxResourcePath);
-
- } catch (RegistryException e) {
- // issue might be at only this path, therefore log and continue
- log.error("Error while retrieving Resource at " + subscriptionCtxResourcePath, e);
- continue;
- }
-
- //De-serialize
- Object subscriptionCtxObj = null;
- try {
- subscriptionCtxObj = Deserializer.deserializeFromByteArray((byte[]) serializedSubscriptionCtxObj);
-
- } catch (Exception e) {
- // issue might be de-serializing only this object, therefore log and continue
- log.error("Error while de-serializing the object retrieved from " + subscriptionCtxResourcePath, e);
- continue;
- }
-
- if (subscriptionCtxObj != null && subscriptionCtxObj instanceof SubscriptionContext) {
- SubscriptionContext subscriptionContext = (SubscriptionContext) subscriptionCtxObj;
- cartridgeSubscriptions.addAll(subscriptionContext.getSubscriptions());
- }
- }
-
- return cartridgeSubscriptions;
- }*/
-
@Override
public Collection<CartridgeSubscription> getCartridgeSubscriptions () throws PersistenceManagerException {
@@ -308,35 +208,6 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
return cartridgeSubscriptions;
}
- /*@Override
- public Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId) throws PersistenceManagerException {
-
- Object byteObj;
-
- try {
- byteObj = RegistryManager.getInstance().retrieve(STRATOS_MANAGER_REOSURCE + SUBSCRIPTION_CONTEXT + "/" + Integer.toString(tenantId));
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }
-
- Object subscriptionContextObj;
-
- try {
- subscriptionContextObj = Deserializer.deserializeFromByteArray((byte[]) byteObj);
-
- } catch (Exception e) {
- throw new PersistenceManagerException(e);
- }
-
- if (subscriptionContextObj instanceof SubscriptionContext) {
- //get all Subscriptions for this tenant
- return ((SubscriptionContext) subscriptionContextObj).getSubscriptions();
- }
-
- return null;
- }*/
-
@Override
public Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId) throws PersistenceManagerException {
@@ -477,91 +348,4 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
}
}
- /*@Override
- public Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId) throws PersistenceManagerException {
-
- Object byteObj;
-
- try {
- byteObj = RegistryManager.getInstance().retrieve(STRATOS_MANAGER_REOSURCE + SUBSCRIPTION_CONTEXT + "/" + Integer.toString(tenantId));
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }
-
- Object subscriptionContextObj;
-
- try {
- subscriptionContextObj = Deserializer.deserializeFromByteArray((byte[]) byteObj);
-
- } catch (Exception e) {
- throw new PersistenceManagerException(e);
- }
-
- if (subscriptionContextObj instanceof SubscriptionContext) {
- //get all Subscriptions for this tenant
- return ((SubscriptionContext) subscriptionContextObj).getSubscriptions();
- }
-
- return null;
- }*/
-
- /*@Override
- public CartridgeSubscription getCartridgeSubscriptionForCluster (String clusterDomain) throws PersistenceManagerException {
-
- Object byteObj;
-
- try {
- byteObj = RegistryManager.getInstance().retrieve(STRATOS_MANAGER_REOSURCE + CLUSTER_ID_TO_SUBSCRIPTION + "/" + clusterDomain);
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }
-
- Object clusterIdToSubscriptionObj;
-
- try {
- clusterIdToSubscriptionObj = Deserializer.deserializeFromByteArray((byte[]) byteObj);
-
- } catch (Exception e) {
- throw new PersistenceManagerException(e);
- }
-
- if (clusterIdToSubscriptionObj instanceof ClusterIdToSubscription) {
- ((ClusterIdToSubscription) clusterIdToSubscriptionObj).getSubscription(clusterDomain);
- }
-
- return null;
- }*/
-
- /*@Override
- public Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId, String cartridgeType) throws PersistenceManagerException {
-
- Object byteObj;
-
- try {
- byteObj = RegistryManager.getInstance().retrieve(STRATOS_MANAGER_REOSURCE + SUBSCRIPTION_CONTEXT + "/" + Integer.toString(tenantId));
-
- } catch (RegistryException e) {
- throw new PersistenceManagerException(e);
- }
-
- Object subscriptionContextObj;
-
- try {
- subscriptionContextObj = Deserializer.deserializeFromByteArray((byte[]) byteObj);
-
- } catch (Exception e) {
- throw new PersistenceManagerException(e);
- }
-
-
- if (subscriptionContextObj instanceof SubscriptionContext) {
- //get all Subscriptions for this tenant and the type
- return ((SubscriptionContext) subscriptionContextObj).getSubscriptionsOfType(cartridgeType);
- }
-
- return null;
- }*/
-
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
index 5e92400..c2ff327 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
@@ -56,11 +56,6 @@ public class RegistryManager {
private UserRegistry initRegistry (int tenantId) throws RegistryException {
UserRegistry tenantGovRegistry = registryService.getGovernanceSystemRegistry(tenantId);
- /*if (tenantGovRegistry == null) {
- String errorMsg = "Tenant " + tenantId + "'s governance registry is not initialized";
- log.error(errorMsg);
- throw new ADCException(errorMsg);
- }*/
// check if the resource is available, else create it
if (!tenantGovRegistry.resourceExists(STRATOS_MANAGER_REOSURCE)) {
@@ -83,11 +78,6 @@ public class RegistryManager {
private UserRegistry initRegistry () throws RegistryException {
UserRegistry govRegistry = registryService.getGovernanceSystemRegistry();
- /*if (govRegistry == null) {
- String errorMsg = "Governance registry is not initialized";
- log.error(errorMsg);
- throw new ADCException(errorMsg);
- }*/
// check if the resource is available, else create it
if (!govRegistry.resourceExists(STRATOS_MANAGER_REOSURCE)) {
@@ -107,126 +97,6 @@ public class RegistryManager {
return govRegistry;
}
- /*public void persistSubscriptionContext (int tenantId, SubscriptionContext subscriptionContext)
- throws RegistryException, ADCException {
-
- //TODO: uncomment
- //UserRegistry tenantGovRegistry = initRegistry(tenantId);
- //temporary
- UserRegistry tenantGovRegistry = initRegistry();
-
- try {
- tenantGovRegistry.beginTransaction();
- Resource nodeResource = tenantGovRegistry.newResource();
- nodeResource.setContent(Serializer.serializeSubscriptionSontextToByteArray(subscriptionContext));
- tenantGovRegistry.putSubscription(STRATOS_MANAGER_REOSURCE + TENANT_ID_TO_SUBSCRIPTION_CONTEXT, nodeResource);
- tenantGovRegistry.commitTransaction();
-
- } catch (Exception e) {
- String errorMsg = "Failed to persist SubscriptionContext in registry.";
- tenantGovRegistry.rollbackTransaction();
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
- }
-
- //TODO: retun the de-serialized object
- public Object getSubscriptionContext(int tenantId) throws ADCException, RegistryException {
-
- //TODO: uncomment
- //UserRegistry tenantGovRegistry = registryService.getGovernanceSystemRegistry(tenantId);
- //temporary
- UserRegistry tenantGovRegistry = registryService.getGovernanceSystemRegistry();
-
- if (tenantGovRegistry == null) {
- String errorMsg = "Tenant " + tenantId + "'s governance registry is not initialized";
- log.error(errorMsg);
- throw new ADCException(errorMsg);
- }
-
- try {
- Resource resource = tenantGovRegistry.get(STRATOS_MANAGER_REOSURCE + TENANT_ID_TO_SUBSCRIPTION_CONTEXT);
- return resource.getContent();
-
- } catch (ResourceNotFoundException ignore) {
- log.error("Sepcified resource not found at " + STRATOS_MANAGER_REOSURCE + TENANT_ID_TO_SUBSCRIPTION_CONTEXT);
- return null;
-
- } catch (RegistryException e) {
- String errorMsg = "Failed to retrieve SubscriptionContext from registry.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
- }*/
-
- /*public Object getSubscriptionContexts() throws RegistryException {
-
- UserRegistry registry = registryService.getGovernanceSystemRegistry();
- return retrieve(registry, STRATOS_MANAGER_REOSURCE + TENANT_ID_TO_SUBSCRIPTION_CONTEXT);
-
-
- if ((resourceObj == null) || !(resourceObj instanceof String[])) {
- return null;
- }
-
- // get the paths for all SubscriptionContext instnaces
- String[] subscriptionCtxtResourcePaths = (String[]) resourceObj;
-
- Collection<SubscriptionContext> cartridgeSubscriptionCtxts;
- //for each path, get the SubscriptionContext instance
- for (String subscriptionCtxResourcePath : subscriptionCtxtResourcePaths) {
- Object subscriptionCtxObj = retrieve(registry, subscriptionCtxResourcePath);
- if (subscriptionCtxObj != null && subscriptionCtxObj instanceof SubscriptionContext) {
-
- }
- }
-
- }*/
-
- /*public void persistClusterIdToSubscription (ClusterIdToSubscription clusterIdToSubscription)
- throws RegistryException, ADCException {
-
- UserRegistry govRegistry = initRegistry();
-
- try {
- govRegistry.beginTransaction();
- Resource nodeResource = govRegistry.newResource();
- nodeResource.setContent(Serializer.serializeClusterIdToSubscriptionToByteArray(clusterIdToSubscription));
- govRegistry.putSubscription(STRATOS_MANAGER_REOSURCE + CLUSTER_ID_TO_SUBSCRIPTION, nodeResource);
- govRegistry.commitTransaction();
-
- } catch (Exception e) {
- String errorMsg = "Failed to persist ClusterIdToSubscription in registry.";
- govRegistry.rollbackTransaction();
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
- }
-
- //TODO: retun the de-serialized object
- public Object getClusterIdToSubscription () throws ADCException, RegistryException {
-
- UserRegistry govRegistry = registryService.getGovernanceSystemRegistry();
- if (govRegistry == null) {
- String errorMsg = "Governance registry is not initialized";
- log.error(errorMsg);
- throw new ADCException(errorMsg);
- }
-
- try {
- Resource resource = govRegistry.get(STRATOS_MANAGER_REOSURCE + CLUSTER_ID_TO_SUBSCRIPTION);
- return resource.getContent();
-
- } catch (ResourceNotFoundException ignore) {
- return null;
-
- } catch (RegistryException e) {
- String errorMsg = "Failed to retrieve ClusterIdToSubscription from registry.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
- }*/
-
public void persist (String path, byte [] resourceBytes, String tag) throws RegistryException {
UserRegistry registry = initRegistry();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
index 5a91088..ab656aa 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
@@ -228,27 +228,6 @@ public class DataInsertionAndRetrievalManager {
persistenceManager.removeService(cartridgeType);
}
- /*public void persistAll (int tenantId) {
-
- Collection<CartridgeSubscription> cartridgeSubscriptions = LookupDataHolder.getInstance().getSubscriptions(tenantId);
-
- writeLock.lock();
-
- try {
- for(CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) {
- try {
- // store in Persistence Manager
- persistenceManager.persistCartridgeSubscription(cartridgeSubscription);
-
- } catch (PersistenceManagerException e) {
- log.error("Error in persisting CartridgeSubscription in Persistence Manager", e);
- }
- }
- } finally {
- writeLock.unlock();
- }
- }*/
-
public Collection<CartridgeSubscription> getCartridgeSubscriptions(String cartridgeType) {
// acquire read lock
@@ -269,28 +248,7 @@ public class DataInsertionAndRetrievalManager {
LookupDataHolder.getInstance().acquireReadLock();
try {
- CartridgeSubscription cartridgeSubscription = LookupDataHolder.getInstance().getSubscriptionForAlias(tenantId, subscriptionAlias);
-
- /*if (cartridgeSubscription == null) {
- // not available in the cache, look in the registry
- if (log.isDebugEnabled()) {
- log.debug("CartridgeSubscription for tenant " + tenantId + ", alias " + subscriptionAlias + " not available in memory");
- }
-
- try {
- cartridgeSubscription = persistenceManager.getCartridgeSubscriptionForCluster(tenantId, subscriptionAlias);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error in accessing Persistence Manager";
- log.error(errorMsg, e);
- return null;
- }
-
- // add to the LookupDataHolder
- // LookupDataHolder.getInstance().putSubscription(cartridgeSubscription);
- }*/
-
- return cartridgeSubscription;
+ return LookupDataHolder.getInstance().getSubscriptionForAlias(tenantId, subscriptionAlias);
} finally {
// release read lock
@@ -304,27 +262,7 @@ public class DataInsertionAndRetrievalManager {
LookupDataHolder.getInstance().acquireReadLock();
try {
- Set<CartridgeSubscription> cartridgeSubscriptions = LookupDataHolder.getInstance().getSubscription(clusterId);
- /*if (cartridgeSubscription == null) {
- // not available in the cache, look in the registry
- if (log.isDebugEnabled()) {
- log.debug("CartridgeSubscription for cluster " + clusterId + " not available in memory");
- }
-
- try {
- cartridgeSubscription = persistenceManager.getCartridgeSubscriptionForCluster(clusterId);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error in accessing Persistence Manager";
- log.error(errorMsg, e);
- return null;
- }
-
- // add to the LookupDataHolder
- // LookupDataHolder.getInstance().putSubscription(cartridgeSubscription);
- }*/
-
- return cartridgeSubscriptions;
+ return LookupDataHolder.getInstance().getSubscription(clusterId);
} finally {
// release read lock
@@ -338,30 +276,7 @@ public class DataInsertionAndRetrievalManager {
LookupDataHolder.getInstance().acquireReadLock();
try {
- Collection<CartridgeSubscription> cartridgeSubscriptions = LookupDataHolder.getInstance().getSubscriptions(tenantId);
- /*if (cartridgeSubscriptions == null) {
- // not available in the cache, look in the registry
- if (log.isDebugEnabled()) {
- log.debug("CartridgeSubscriptions for tenant " + tenantId + " not available in memory");
- }
-
- try {
- cartridgeSubscriptions = persistenceManager.getCartridgeSubscriptions(tenantId);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error in accessing Persistence Manager";
- log.error(errorMsg, e);
- return null;
- }
-
- // add to the LookupDataHolder
- //Iterator<CartridgeSubscription> iterator = cartridgeSubscriptions.iterator();
- //while (iterator.hasNext()) {
- // LookupDataHolder.getInstance().putSubscription(iterator.next());
- //}
- }*/
-
- return cartridgeSubscriptions;
+ return LookupDataHolder.getInstance().getSubscriptions(tenantId);
} finally {
// release read lock
@@ -375,31 +290,7 @@ public class DataInsertionAndRetrievalManager {
LookupDataHolder.getInstance().acquireReadLock();
try {
-
- Collection<CartridgeSubscription> cartridgeSubscriptions = LookupDataHolder.getInstance().getSubscriptionForType(tenantId, cartridgeType);
- /*if (cartridgeSubscriptions == null) {
- // not available in the cache, look in the registry
- if (log.isDebugEnabled()) {
- log.debug("CartridgeSubscriptions for tenant " + tenantId + ", type " + cartridgeType + " not available in memory");
- }
-
- try {
- cartridgeSubscriptions = persistenceManager.getCartridgeSubscriptions(tenantId, cartridgeType);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error in accessing Persistence Manager";
- log.error(errorMsg, e);
- return null;
- }
-
- // add to the LookupDataHolder
- // Iterator<CartridgeSubscription> iterator = cartridgeSubscriptions.iterator();
- // while (iterator.hasNext()) {
- // LookupDataHolder.getInstance().putSubscription(iterator.next());
- //}
- }*/
-
- return cartridgeSubscriptions;
+ return LookupDataHolder.getInstance().getSubscriptionForType(tenantId, cartridgeType);
} finally {
// release read lock
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b746b90e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
index 1ad7992..7b63701 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
@@ -43,11 +43,8 @@ public class SubscriptionMultiTenantBehaviour extends SubscriptionTenancyBehavio
if (!allowMultipleSubscription) {
// If the cartridge is multi-tenant. We should not let users createSubscription twice.
boolean subscribed;
+
try {
- /////////////////////////////////////////////////////////////////////////////////////////////////////////
- //subscribed = PersistenceManager.isAlreadySubscribed(cartridgeSubscription.getType(),
- // cartridgeSubscription.getSubscriber().getTenantId());
- /////////////////////////////////////////////////////////////////////////////////////////////////////////
subscribed = hasAlreadySubscribed(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType());
} catch (Exception e) {