Repository: stratos Updated Branches: refs/heads/4.0.0-grouping ef2aafa1b -> 1788f1b54
rename CompositeAppSubscription to ApplicationSubscription Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1788f1b5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1788f1b5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1788f1b5 Branch: refs/heads/4.0.0-grouping Commit: 1788f1b54546070bfcba8d99d7635febb2a22208 Parents: ef2aafa Author: Martin Eppel <[email protected]> Authored: Thu Sep 18 15:49:13 2014 -0700 Committer: Martin Eppel <[email protected]> Committed: Thu Sep 18 15:49:13 2014 -0700 ---------------------------------------------------------------------- .../CompositeApplicationManager.java | 12 +-- .../ApplicationSubscriptionException.java | 51 +++++++++++++ .../CompositeAppSubscriptionException.java | 47 ------------ .../manager/CartridgeSubscriptionManager.java | 16 ++-- .../manager/persistence/PersistenceManager.java | 6 +- .../RegistryBasedPersistenceManager.java | 14 ++-- .../DataInsertionAndRetrievalManager.java | 6 +- .../subscription/ApplicationSubscription.java | 78 ++++++++++++++++++++ .../subscription/CompositeAppSubscription.java | 73 ------------------ .../StratosManagerTopologyEventReceiver.java | 18 +++-- .../stratos/manager/utils/Serializer.java | 4 +- 11 files changed, 169 insertions(+), 156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java index c8bfd30..4c115da 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java @@ -13,7 +13,7 @@ import org.apache.stratos.manager.composite.application.structure.SubscribableCo import org.apache.stratos.manager.exception.*; import org.apache.stratos.manager.manager.CartridgeSubscriptionManager; import org.apache.stratos.manager.subscription.CartridgeSubscription; -import org.apache.stratos.manager.subscription.CompositeAppSubscription; +import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; import org.apache.stratos.manager.subscription.SubscriptionData; @@ -39,11 +39,11 @@ public class CompositeApplicationManager { + compositeAppDefinition.getAlias() + " ] parsed successfully"); // create the CompositeAppSubscription - CompositeAppSubscription compositeAppSubscription; + ApplicationSubscription compositeAppSubscription; try { - compositeAppSubscription = cartridgeSubscriptionManager.createCompositeAppSubscription(compositeAppContext.getAppId(), tenantId); + compositeAppSubscription = cartridgeSubscriptionManager.createApplicationSubscription(compositeAppContext.getAppId(), tenantId); - } catch (CompositeAppSubscriptionException e) { + } catch (ApplicationSubscriptionException e) { throw new CompositeApplicationDefinitionException(e); } @@ -257,7 +257,7 @@ public class CompositeApplicationManager { private synchronized void persistSubscriptions(Collection<CartridgeSubscription> cartridgeSubscriptions, Collection<GroupSubscription> groupSubscriptions, - CompositeAppSubscription compositeAppSubscription) + ApplicationSubscription compositeAppSubscription) throws CompositeApplicationException { persistCartridgeSubscriptions(cartridgeSubscriptions); @@ -297,7 +297,7 @@ public class CompositeApplicationManager { } } - private void persistCompositeAppSubscription (CompositeAppSubscription compositeAppSubscription) throws CompositeApplicationException { + private void persistCompositeAppSubscription (ApplicationSubscription compositeAppSubscription) throws CompositeApplicationException { if (compositeAppSubscription != null) { try { http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java new file mode 100644 index 0000000..9c3430b --- /dev/null +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java @@ -0,0 +1,51 @@ +/* + * 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. + */ + +package org.apache.stratos.manager.exception; + +public class ApplicationSubscriptionException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 603387881177162687L; + private String message; + + public ApplicationSubscriptionException() { + super(); + } + + public ApplicationSubscriptionException(String message, Throwable cause) { + super(message, cause); + this.message = message; + } + + public ApplicationSubscriptionException(String message) { + super(message); + this.message = message; + } + + public ApplicationSubscriptionException(Throwable cause) { + super(cause); + } + + public String getMessage() { + return message; + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/CompositeAppSubscriptionException.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/CompositeAppSubscriptionException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/CompositeAppSubscriptionException.java deleted file mode 100644 index 710c5f5..0000000 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/CompositeAppSubscriptionException.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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. - */ - -package org.apache.stratos.manager.exception; - -public class CompositeAppSubscriptionException extends Exception { - - private String message; - - public CompositeAppSubscriptionException() { - super(); - } - - public CompositeAppSubscriptionException(String message, Throwable cause) { - super(message, cause); - this.message = message; - } - - public CompositeAppSubscriptionException(String message) { - super(message); - this.message = message; - } - - public CompositeAppSubscriptionException(Throwable cause) { - super(cause); - } - - public String getMessage() { - return message; - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/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 11297d1..2710c98 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 @@ -89,27 +89,27 @@ public class CartridgeSubscriptionManager { return new GroupSubscription(groupName, groupAlias); } - public CompositeAppSubscription createCompositeAppSubscription (String appId, int tenantId) throws CompositeAppSubscriptionException { + public ApplicationSubscription createApplicationSubscription (String appId, int tenantId) throws ApplicationSubscriptionException { if (log.isDebugEnabled()) { - log.debug("createCompositeAppSubscription for appId: " + appId + " and tenantId: " + tenantId); + log.debug("create Application Subscription for appId: " + appId + " and tenantId: " + tenantId); } DataInsertionAndRetrievalManager dataInsertionAndRetrievalMgr = new DataInsertionAndRetrievalManager(); - CompositeAppSubscription compositeAppSubscription; + ApplicationSubscription compositeAppSubscription; try { compositeAppSubscription = dataInsertionAndRetrievalMgr.getCompositeAppSubscription(tenantId, appId); } catch (PersistenceManagerException e) { - log.error("failed to createCompositeAppSubscription for appId: " + appId + " and tenantId: " + tenantId + " e:" + e); - throw new CompositeAppSubscriptionException(e); + log.error("failed to Application Subscription for appId: " + appId + " and tenantId: " + tenantId + " e:" + e); + throw new ApplicationSubscriptionException(e); } if (compositeAppSubscription != null) { // Composite App Subscription already exists with same app id log.error("app Id already exists, failed to createCompositeAppSubscription for appId: " + appId + " and tenantId: " + tenantId); - throw new CompositeAppSubscriptionException("Composite App Subscription already exists with Id [ " + appId + " ]"); + throw new ApplicationSubscriptionException("Composite App Subscription already exists with Id [ " + appId + " ]"); } else { // persist try { @@ -122,7 +122,7 @@ public class CartridgeSubscriptionManager { } } - return new CompositeAppSubscription(appId); + return new ApplicationSubscription(appId); } public CartridgeSubscription createCartridgeSubscription (SubscriptionData subscriptionData) throws ADCException, @@ -185,7 +185,7 @@ public class CartridgeSubscriptionManager { } } - public void persistCompositeAppSubscription (CompositeAppSubscription compositeAppSubscription) throws ADCException { + public void persistCompositeAppSubscription (ApplicationSubscription compositeAppSubscription) throws ADCException { try { new DataInsertionAndRetrievalManager().persistCompositeAppSubscription(compositeAppSubscription); http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/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 9fba1a0..6eaad50 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 @@ -23,7 +23,7 @@ import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.exception.PersistenceManagerException; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.subscription.CartridgeSubscription; -import org.apache.stratos.manager.subscription.CompositeAppSubscription; +import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; import java.util.Collection; @@ -51,10 +51,10 @@ public abstract class PersistenceManager { public abstract Collection<CartridgeSubscription> getCartridgeSubscriptions(int tenantId) throws PersistenceManagerException; - public abstract void persistCompositeAppSubscription (CompositeAppSubscription compositeAppSubscription) + public abstract void persistCompositeAppSubscription (ApplicationSubscription compositeAppSubscription) throws PersistenceManagerException; - public abstract CompositeAppSubscription getCompositeAppSubscription (int tenantId, String compositeAppId) + public abstract ApplicationSubscription getCompositeAppSubscription (int tenantId, String compositeAppId) throws PersistenceManagerException; public abstract void removeCompositeAppSubscription (int tenantId, String compositeAppId) http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/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 9bab469..3fcfcc4 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 @@ -26,7 +26,7 @@ import org.apache.stratos.manager.exception.PersistenceManagerException; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.registry.RegistryManager; import org.apache.stratos.manager.subscription.CartridgeSubscription; -import org.apache.stratos.manager.subscription.CompositeAppSubscription; +import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; import org.apache.stratos.manager.utils.Deserializer; import org.apache.stratos.manager.utils.Serializer; @@ -365,7 +365,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager { } @Override - public void persistCompositeAppSubscription(CompositeAppSubscription compositeAppSubscription) throws PersistenceManagerException { + public void persistCompositeAppSubscription(ApplicationSubscription compositeAppSubscription) throws PersistenceManagerException { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); if (tenantId != MultitenantConstants.SUPER_TENANT_ID) { @@ -387,7 +387,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager { } } - private void persistSubscription (int tenantId, CompositeAppSubscription compositeAppSubscription) throws PersistenceManagerException { + private void persistSubscription (int tenantId, ApplicationSubscription compositeAppSubscription) throws PersistenceManagerException { // persist try { @@ -408,7 +408,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager { } @Override - public CompositeAppSubscription getCompositeAppSubscription(int tenantId, String compositeAppId) throws PersistenceManagerException { + public ApplicationSubscription getCompositeAppSubscription(int tenantId, String compositeAppId) throws PersistenceManagerException { if (tenantId != MultitenantConstants.SUPER_TENANT_ID) { // TODO: This is only a workaround. Proper fix is to write to tenant registry @@ -430,7 +430,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager { } } - public CompositeAppSubscription getSubscription (int tenantId, String appId) throws PersistenceManagerException { + public ApplicationSubscription getSubscription (int tenantId, String appId) throws PersistenceManagerException { Object byteObj; @@ -455,8 +455,8 @@ public class RegistryBasedPersistenceManager extends PersistenceManager { throw new PersistenceManagerException(e); } - if (compositeAppSubscriptionObj instanceof CompositeAppSubscription) { - return (CompositeAppSubscription) compositeAppSubscriptionObj; + if (compositeAppSubscriptionObj instanceof ApplicationSubscription) { + return (ApplicationSubscription) compositeAppSubscriptionObj; } return null; http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/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 91830cd..47709d0 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 @@ -29,7 +29,7 @@ import org.apache.stratos.manager.lookup.LookupDataHolder; import org.apache.stratos.manager.persistence.PersistenceManager; import org.apache.stratos.manager.persistence.RegistryBasedPersistenceManager; import org.apache.stratos.manager.subscription.CartridgeSubscription; -import org.apache.stratos.manager.subscription.CompositeAppSubscription; +import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; @@ -395,12 +395,12 @@ public class DataInsertionAndRetrievalManager { persistenceManager.removeGroupSubscription(tenantId, groupName, groupAlias); } - public void persistCompositeAppSubscription (CompositeAppSubscription compositeAppSubscription) throws PersistenceManagerException { + public void persistCompositeAppSubscription (ApplicationSubscription compositeAppSubscription) throws PersistenceManagerException { persistenceManager.persistCompositeAppSubscription(compositeAppSubscription); } - public CompositeAppSubscription getCompositeAppSubscription (int tenantId, String appId) throws PersistenceManagerException { + public ApplicationSubscription getCompositeAppSubscription (int tenantId, String appId) throws PersistenceManagerException { return persistenceManager.getCompositeAppSubscription(tenantId, appId); } http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationSubscription.java new file mode 100644 index 0000000..ab5e005 --- /dev/null +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationSubscription.java @@ -0,0 +1,78 @@ +/* + * 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. + */ + +package org.apache.stratos.manager.subscription; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.manager.subscriber.Subscriber; +import org.jboss.util.propertyeditor.StringArrayEditor; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class ApplicationSubscription implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 3380699449827682550L; + + private static Log log = LogFactory.getLog(ApplicationSubscription.class); + + private String appId; + + private Set<String> cartridgeSubscriptionAliases; + + private Set<String> groupSubscriptionAliases; + + public ApplicationSubscription (String appId) { + + this.appId = appId; + cartridgeSubscriptionAliases = new HashSet<String>(); + groupSubscriptionAliases = new HashSet<String>(); + } + + public Set<String> getGroupSubscriptionAliases() { + return groupSubscriptionAliases; + } + + public void addCartridgeSubscriptionAlias (String cartridgeSubscriptionAlias) { + cartridgeSubscriptionAliases.add(cartridgeSubscriptionAlias); + } + + public void addCartridgeSubscriptionAliases (Set<String> cartridgeSubscriptionAliases) { + cartridgeSubscriptionAliases.addAll(cartridgeSubscriptionAliases); + } + + public void addGroupSubscriptionAlias (String groupSubscriptionAlias) { + groupSubscriptionAliases.add(groupSubscriptionAlias); + } + + public void addGroupSubscriptionAliases (Set<String> groupSubscriptionAliases) { + groupSubscriptionAliases.addAll(groupSubscriptionAliases); + } + + public String getAppId() { + return appId; + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CompositeAppSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CompositeAppSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CompositeAppSubscription.java deleted file mode 100644 index 2a99842..0000000 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CompositeAppSubscription.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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. - */ - -package org.apache.stratos.manager.subscription; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.manager.subscriber.Subscriber; -import org.jboss.util.propertyeditor.StringArrayEditor; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -public class CompositeAppSubscription implements Serializable { - - private static Log log = LogFactory.getLog(CompositeAppSubscription.class); - - private String appId; - - private Set<String> cartridgeSubscriptionAliases; - - private Set<String> groupSubscriptionAliases; - - public CompositeAppSubscription (String appId) { - - this.appId = appId; - cartridgeSubscriptionAliases = new HashSet<String>(); - groupSubscriptionAliases = new HashSet<String>(); - } - - public Set<String> getGroupSubscriptionAliases() { - return groupSubscriptionAliases; - } - - public void addCartridgeSubscriptionAlias (String cartridgeSubscriptionAlias) { - cartridgeSubscriptionAliases.add(cartridgeSubscriptionAlias); - } - - public void addCartridgeSubscriptionAliases (Set<String> cartridgeSubscriptionAliases) { - cartridgeSubscriptionAliases.addAll(cartridgeSubscriptionAliases); - } - - public void addGroupSubscriptionAlias (String groupSubscriptionAlias) { - groupSubscriptionAliases.add(groupSubscriptionAlias); - } - - public void addGroupSubscriptionAliases (Set<String> groupSubscriptionAliases) { - groupSubscriptionAliases.addAll(groupSubscriptionAliases); - } - - public String getAppId() { - return appId; - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java index 6d24765..dbe1727 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java @@ -22,11 +22,11 @@ package org.apache.stratos.manager.topology.receiver; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.manager.exception.ADCException; -import org.apache.stratos.manager.exception.CompositeAppSubscriptionException; +import org.apache.stratos.manager.exception.ApplicationSubscriptionException; import org.apache.stratos.manager.exception.CompositeApplicationDefinitionException; import org.apache.stratos.manager.exception.CompositeApplicationException; import org.apache.stratos.manager.manager.CartridgeSubscriptionManager; -import org.apache.stratos.manager.subscription.CompositeAppSubscription; +import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.topology.model.TopologyClusterInformationModel; import org.apache.stratos.messaging.domain.topology.Application; import org.apache.stratos.messaging.domain.topology.Cluster; @@ -291,17 +291,21 @@ public class StratosManagerTopologyEventReceiver implements Runnable { // create and persist Application subscritpion CartridgeSubscriptionManager cartridgeSubscriptionManager = new CartridgeSubscriptionManager(); - CompositeAppSubscription compositeAppSubscription; + ApplicationSubscription compositeAppSubscription; Application app = appCreateEvent.getApplication(); String appId = app.getId(); int tenantId = app.getTenantId(); + + if (log.isDebugEnabled()) { + log.debug("received application created event for app: " + appId + " and tenant: " + tenantId); + } try { - compositeAppSubscription = cartridgeSubscriptionManager.createCompositeAppSubscription(appId, tenantId); + compositeAppSubscription = cartridgeSubscriptionManager.createApplicationSubscription(appId, tenantId); cartridgeSubscriptionManager.persistCompositeAppSubscription(compositeAppSubscription); - } catch (CompositeAppSubscriptionException e) { - //throw new CompositeApplicationDefinitionException(e); + } catch (ApplicationSubscriptionException e) { + log.error("failed to persist application subscription, caught exception: " + e); } catch (ADCException e) { - //throw new CompositeApplicationException(e); + log.error("failed to persist application subscription, caught exception: " + e); } } finally { TopologyManager.releaseReadLock(); http://git-wip-us.apache.org/repos/asf/stratos/blob/1788f1b5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java index 743be48..a9fc6fe 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java @@ -24,7 +24,7 @@ import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.lookup.ClusterIdToSubscription; import org.apache.stratos.manager.subscription.CartridgeSubscription; -import org.apache.stratos.manager.subscription.CompositeAppSubscription; +import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; @@ -81,7 +81,7 @@ public class Serializer { } - public static byte[] serializeCompositeAppSubscriptionToByteArray (CompositeAppSubscription compositeAppSubscription) + public static byte[] serializeCompositeAppSubscriptionToByteArray (ApplicationSubscription compositeAppSubscription) throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream();
