Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 2ce45977d -> 7578e2623
merging CartridgeSubscriptionManager Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/73830e22 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/73830e22 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/73830e22 Branch: refs/heads/4.0.0-grouping Commit: 73830e226c731bd718ced9f8ebd747787c4772e4 Parents: 33314ee Author: Isuru Haththotuwa <[email protected]> Authored: Thu Aug 28 18:52:20 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Aug 28 18:52:20 2014 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/73830e22/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 86206fe..bdf5b37 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 @@ -21,6 +21,12 @@ package org.apache.stratos.manager.manager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; +import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; +import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.deploy.service.Service; @@ -57,6 +63,7 @@ import org.apache.stratos.manager.publisher.CartridgeSubscriptionDataPublisher; import java.util.*; + /** * Manager class for the purpose of managing CartridgeSubscriptionInfo subscriptions, groupings, etc. */ @@ -562,11 +569,8 @@ public class CartridgeSubscriptionManager { } cartridgeSubscription.addSubscriptionDomain(new SubscriptionDomain(domainName, applicationContext)); -<<<<<<< HEAD new DataInsertionAndRetrievalManager().cacheAndPersistSubcription(cartridgeSubscription); -======= - new DataInsertionAndRetrievalManager().cacheAndUpdateSubscription(cartridgeSubscription); ->>>>>>> master + } catch (PersistenceManagerException e) { String errorMsg = "Could not add domain to cartridge subscription: [tenant-id] " + tenantId + " [subscription-alias] " + subscriptionAlias + " [domain-name] " + domainName + " [application-context] " + applicationContext; @@ -596,11 +600,8 @@ public class CartridgeSubscriptionManager { throw new DomainSubscriptionDoesNotExist("Cartridge subscription not found", domainName); } cartridgeSubscription.removeSubscriptionDomain(domainName); -<<<<<<< HEAD new DataInsertionAndRetrievalManager().cacheAndPersistSubcription(cartridgeSubscription); -======= - new DataInsertionAndRetrievalManager().cacheAndUpdateSubscription(cartridgeSubscription); ->>>>>>> master + } catch (PersistenceManagerException e) { String errorMsg = "Could not remove domain from cartridge subscription: [tenant-id] " + tenantId + " [subscription-alias] " + subscriptionAlias + " [domain-name] " + domainName;
