more cleanup, removing unused grouping POC code ...
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9beae459 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9beae459 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9beae459 Branch: refs/heads/4.0.0-grouping Commit: 9beae45922537a1d672d97ab8fad40f1bd1ab04a Parents: 773a01e Author: Martin Eppel <[email protected]> Authored: Wed Oct 22 16:07:54 2014 -0700 Committer: Martin Eppel <[email protected]> Committed: Wed Oct 22 16:07:54 2014 -0700 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 65 +--- .../runtime/FasterLookUpDataHolder.java | 20 -- .../controller/topology/TopologyBuilder.java | 22 -- .../topology/TopologyEventPublisher.java | 21 -- .../client/CloudControllerServiceClient.java | 8 +- .../CompositeApplicationManager.java | 312 ------------------ .../application/utils/ApplicationUtils.java | 82 ----- .../DataInsertionAndRetrievalManager.java | 1 - .../stratos/manager/utils/Serializer.java | 1 - .../topology/ConfigCompositeApplication.java | 2 +- .../bean/util/converter/PojoConverter.java | 124 -------- .../rest/endpoint/services/ServiceUtils.java | 4 - .../rest/endpoint/services/StratosAdmin.java | 36 --- .../main/resources/CloudControllerService.wsdl | 313 ++++++------------- 14 files changed, 91 insertions(+), 920 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 3ccaccd..2fbf89a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -95,7 +95,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { currentData.setMemberIdToContext(serializedObj.getMemberIdToContext()); currentData.setClusterIdToMemberContext(serializedObj.getClusterIdToMemberContext()); currentData.setCartridges(serializedObj.getCartridges()); - currentData.setConfigCompositeApplication(serializedObj.getConfigCompositeApplication()); currentData.setServiceGroups(serializedObj.getServiceGroups()); if(log.isDebugEnabled()) { @@ -115,50 +114,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } - // restore compostie application - List<ConfigCompositeApplication> apps = restoreConfigCompositeApplication(); - if (apps == null) { - this.dataHolder.setConfigCompositeApplication(new ArrayList<ConfigCompositeApplication>()); - - } - } - - - public void deployCompositeApplicationDefinition(CompositeApplicationDefinition compositeApplicationDefinition) throws InvalidCompositeApplicationDefinitionException, - InvalidIaasProviderException { - - String alias = compositeApplicationDefinition.getAlias(); - if(log.isDebugEnabled()){ - log.debug("composite application alias : " + alias); - } - - ConfigCompositeApplication messConfigApp = null;//TopologyBuilder.convertCompositeApplication(compositeApplicationDefinition); - String key = "compositeApplicationAlias"; //app.getAlias() - - - List<ConfigCompositeApplication> data = new ArrayList<ConfigCompositeApplication>(); - data.add(messConfigApp); - dataHolder.setConfigCompositeApplication(data); - - // persist - persist(); - - if(log.isDebugEnabled()){ - log.debug("deploying composite application in cloud controller: " + compositeApplicationDefinition); - } - - TopologyBuilder.handleCompositeApplicationCreated(messConfigApp); + } - public void unDeployCompositeApplicationDefinition(String appAlias) throws InvalidCompositeApplicationDefinitionException, - InvalidIaasProviderException { - if(log.isDebugEnabled()){ - log.debug("undeploying composite application in cloud controller, removing all composite apps "); - dataHolder.removeAllConfigCompositeApplications(); - persist(); - TopologyBuilder.handleCompositeApplicationRemoved(appAlias); - } - } public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, InvalidIaasProviderException { @@ -1462,26 +1420,5 @@ public class CloudControllerServiceImpl implements CloudControllerService { //persist(); } - private List<ConfigCompositeApplication> restoreConfigCompositeApplication () { - List<ConfigCompositeApplication> apps = this.dataHolder.getConfigCompositeApplication(); - if (apps == null) { - if (log.isDebugEnabled()) { - log.debug("composite applications for cloud controller is null while restoring "); - } - return apps; - } - if (log.isDebugEnabled()) { - log.debug("trying to restore composite applications for cloud controller " + apps.size()); - } - for (ConfigCompositeApplication messConfigApp : apps) { - if (log.isDebugEnabled()) { - log.debug(" restoring composite application for cloud controller " + messConfigApp.getAlias()); - } - TopologyBuilder.handleCompositeApplicationCreated(messConfigApp); - } - - return apps; - } - } http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java index e9e550a..973e924 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.pojo.*; import org.apache.stratos.cloud.controller.registry.RegistryManager; -import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher; import java.io.Serializable; @@ -87,8 +86,6 @@ public class FasterLookUpDataHolder implements Serializable{ * List of deployed service groups */ private List<ServiceGroup> serviceGroups; - - private List<ConfigCompositeApplication> configCompositeApplication; /** * List of IaaS Providers. @@ -134,8 +131,6 @@ public class FasterLookUpDataHolder implements Serializable{ cartridges = new ArrayList<Cartridge>(); serviceGroups = new ArrayList<ServiceGroup>(); - configCompositeApplication = new ArrayList<ConfigCompositeApplication>(); - } public List<Cartridge> getCartridges() { @@ -154,20 +149,6 @@ public class FasterLookUpDataHolder implements Serializable{ return this.serviceGroups; } - public List<ConfigCompositeApplication> getConfigCompositeApplication() { - return configCompositeApplication; - } - - public void setConfigCompositeApplication( - List<ConfigCompositeApplication> configCompositeApplication) { - this.configCompositeApplication = configCompositeApplication; - } - - public void removeAllConfigCompositeApplications() { - if (this.configCompositeApplication != null) { - this.configCompositeApplication.removeAll(configCompositeApplication); - } - } public Cartridge getCartridge(String cartridgeType) { for (Cartridge cartridge : cartridges) { @@ -177,7 +158,6 @@ public class FasterLookUpDataHolder implements Serializable{ } return null; - } public void addCartridge(Cartridge newCartridges) { http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index cee40f3..ac409c7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -738,28 +738,6 @@ public class TopologyBuilder { TopologyEventPublisher.sendApplicationUndeployedEvent(applicationId, clusterData); } - public static void handleCompositeApplicationCreated(ConfigCompositeApplication messConfigApp) { - Topology topology = TopologyManager.getTopology(); - - //ConfigCompositeApplication messConfigApp; - try { - - TopologyManager.acquireWriteLock(); - String key = "compositeApplicationAlias"; //app.getAlias() - topology.addConfigCompositeApplication(key, messConfigApp); - TopologyManager.updateTopology(topology); - } finally { - TopologyManager.releaseWriteLock(); - } - TopologyEventPublisher.sendConfigApplicationCreatedEventEvent(messConfigApp); - log.info("TopolgyBuilder: sending sendConfigApplicationCreatedEventEvent "); - - } - - public static void handleCompositeApplicationRemoved(String alias) { - log.info("TopolgyBuilder: sending sendConfigApplicationRemovedEventEvent "); - TopologyEventPublisher.sendConfigApplicationRemovedEventEvent(alias); - } public static void handleClusterActivatedEvent(ClusterActivatedEvent clusterActivatedEvent) { Topology topology = TopologyManager.getTopology(); http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java index f6b247b..21d8267 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java @@ -228,27 +228,6 @@ public class TopologyEventPublisher { publishEvent(completeTopologyEvent); } - // Grouping - public static void sendConfigApplicationCreatedEventEvent(ConfigCompositeApplication configCompositeApplication) { - - CompositeApplicationCreatedEvent compositeApplicationCreatedEvent = new CompositeApplicationCreatedEvent(configCompositeApplication); - - if(log.isDebugEnabled()) { - log.debug(String.format("Publishing compositeApplicationCreatedEvent: " + compositeApplicationCreatedEvent)); - } - publishEvent(compositeApplicationCreatedEvent); - } - - public static void sendConfigApplicationRemovedEventEvent(String alias) { - - CompositeApplicationRemovedEvent compositeApplicationCreatedEvent = new CompositeApplicationRemovedEvent(alias); - - if(log.isDebugEnabled()) { - log.debug(String.format("Publishing compositeApplicationRemovedEvent: " + compositeApplicationCreatedEvent)); - } - publishEvent(compositeApplicationCreatedEvent); - } - public static void sendApplicationActivatedEvent(ApplicationActivatedEvent applicationActivatedEvent) { if(log.isInfoEnabled()) { log.info(String.format("Publishing application activated event: [appId] %s", http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java index efe7de1..75f48d8 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java @@ -132,7 +132,7 @@ public class CloudControllerServiceClient { public void deployApplicationDefinition(ApplicationContext applicationContext) - throws RemoteException, CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException, + throws RemoteException, CloudControllerServiceInvalidIaasProviderExceptionException, CloudControllerServiceApplicationDefinitionExceptionException { stub.deployApplicationDefinition(applicationContext); @@ -145,12 +145,6 @@ public class CloudControllerServiceClient { stub.unDeployApplicationDefinition(applicationId, tenantId, tenantDomain); } - public void unDeployCompositeApplicationDefinition(String appAlias) throws RemoteException, CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException, CloudControllerServiceInvalidIaasProviderExceptionException { - stub.unDeployCompositeApplicationDefinition(appAlias); - } - - - @SuppressWarnings("unused") private Properties http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/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 deleted file mode 100644 index 649db84..0000000 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java +++ /dev/null @@ -1,312 +0,0 @@ -package org.apache.stratos.manager.composite.application; - -import java.util.*; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; -import org.apache.stratos.manager.composite.application.parser.CompositeApplicationParser; -import org.apache.stratos.manager.composite.application.parser.DefaultCompositeApplicationParser; -import org.apache.stratos.manager.composite.application.structure.CompositeAppContext; -import org.apache.stratos.manager.composite.application.structure.GroupContext; -import org.apache.stratos.manager.composite.application.structure.SubscribableContext; -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.ApplicationSubscription; -import org.apache.stratos.manager.subscription.GroupSubscription; -import org.apache.stratos.manager.subscription.SubscriptionData; - -//Grouping -public class CompositeApplicationManager { - - private static Log log = LogFactory.getLog(CompositeApplicationManager.class); - - CartridgeSubscriptionManager cartridgeSubscriptionManager; - - public CompositeApplicationManager () { - cartridgeSubscriptionManager = new CartridgeSubscriptionManager(); - } - - public void deployCompositeApplication (ApplicationDefinition compositeAppDefinition, int tenantId, String tenantDomain, - String tenantAdminUsername) throws CompositeApplicationException, CompositeApplicationDefinitionException, - PersistenceManagerException { - - CompositeApplicationParser compositeAppParser = new DefaultCompositeApplicationParser(); - CompositeAppContext compositeAppContext = compositeAppParser.parse(compositeAppDefinition); - - log.info("Composite Application [ Id: " + compositeAppDefinition.getApplicationId() + " , alias: " - + compositeAppDefinition.getAlias() + " ] parsed successfully"); - - // create the CompositeAppSubscription - ApplicationSubscription compositeAppSubscription; - try { - compositeAppSubscription = cartridgeSubscriptionManager.createApplicationSubscription(compositeAppContext.getAppId(), tenantId); - - } catch (ApplicationSubscriptionException e) { - throw new CompositeApplicationDefinitionException(e); - } - - // keep track of all CartridgeSubscriptions, against the alias - Map<String, CartridgeSubscription> aliasToCartridgeSubscription = new HashMap<String, CartridgeSubscription>(); - - // Keep track of all Group Subscriptions - Map<String, GroupSubscription> groupAliasToGroupSubscription = new HashMap<String, GroupSubscription>(); - - // traverse through the Composite App Structure and create Cartridge Subscriptions - if(compositeAppContext.getSubscribableContexts() != null) { - // Subscriptions relevant to top level Subscribables - - for (CartridgeSubscription cartridgeSubscription : getCartridgeSybscriptionsForSubscribables(compositeAppContext.getSubscribableContexts(), - tenantId, tenantDomain, tenantAdminUsername)) { - - // check if a Cartridge Subscription already exists with this alias for this Composite App - if (cartridgeSubscriptionExistsForAlias(aliasToCartridgeSubscription, cartridgeSubscription.getAlias())) { - throw new CompositeApplicationException("Cartridge Subscription with alias [ " + cartridgeSubscription.getAlias() - + " ] already exists in Composite Application [ " + compositeAppSubscription.getAppId() + " ]"); - } - - aliasToCartridgeSubscription.put(cartridgeSubscription.getAlias(), cartridgeSubscription); - } - // get top level cartridge aliases to add to Composite App Subscription - compositeAppSubscription.addCartridgeSubscriptionAliases(getCartrigdeSubscriptionAliases(compositeAppContext.getSubscribableContexts())); - } - - if (compositeAppContext.getGroupContexts() != null) { - // Subscriptions relevant to Groups - - for (CartridgeSubscription cartridgeSubscription : getCartridgeSubscriptionForGroups(compositeAppContext.getGroupContexts(), tenantId, - tenantDomain, tenantAdminUsername)) { - - // check if a Cartridge Subscription already exists with this alias for this Composite App - if (cartridgeSubscriptionExistsForAlias(aliasToCartridgeSubscription, cartridgeSubscription.getAlias())) { - throw new CompositeApplicationException("Cartridge Subscription with alias [ " + cartridgeSubscription.getAlias() - + " ] already exists in Composite Application [ " + compositeAppSubscription.getAppId() + " ]"); - } - - aliasToCartridgeSubscription.put(cartridgeSubscription.getAlias(), cartridgeSubscription); - } - - // create Group Subscriptions and collect them - List<GroupSubscription> groupSubscriptions = new LinkedList<GroupSubscription>(); - getGroupSubscriptions(compositeAppContext.getGroupContexts(), tenantId, groupSubscriptions); - for (GroupSubscription groupSubscription : groupSubscriptions) { - - // check if a Group Subscription already exists with this alias for this Composite App - if (groupSubscriptionExistsForAlias(groupAliasToGroupSubscription, groupSubscription.getGroupAlias())) { - throw new CompositeApplicationException("Group Subscription with alias [ " + groupSubscription.getGroupAlias() - + " ] already exists in Composite Application [ " + compositeAppSubscription.getAppId() + " ]"); - } - - groupAliasToGroupSubscription.put(groupSubscription.getGroupAlias(), groupSubscription); - } - - // set top level group aliases to Composite App Subscription - compositeAppSubscription.addGroupSubscriptionAliases(getGroupSubscriptionAliases(compositeAppContext.getGroupContexts())); - } - - // TODO: send the Composite App structure to CC - - // persist - persistSubscriptions(aliasToCartridgeSubscription.values(), groupAliasToGroupSubscription.values(), compositeAppSubscription); - } - - private Set<String> getCartrigdeSubscriptionAliases (Set<SubscribableContext> subscribableContexts) throws CompositeApplicationException { - - Set<String> cartridgeSubscriptionAliases = new HashSet<String>(); - for (SubscribableContext subscribableContext : subscribableContexts) { - cartridgeSubscriptionAliases.add(subscribableContext.getAlias()); - } - - return cartridgeSubscriptionAliases; - } - - private void getGroupSubscriptions(Set<GroupContext> groupContexts, int tenantID, List<GroupSubscription> groupSubscriptions) throws CompositeApplicationException { - - for (GroupContext groupContext : groupContexts) { - // create Group Subscriptions for this Group - GroupSubscription groupSubscription; - try { - groupSubscription = cartridgeSubscriptionManager.createGroupSubscription(groupContext.getName(), groupContext.getAlias(), tenantID); - - } catch (GroupSubscriptionException e) { - throw new CompositeApplicationException(e); - } - if (groupContext.getSubscribableContexts() != null) { - groupSubscription.addCartridgeSubscriptionAliases(getCartrigdeSubscriptionAliases(groupContext.getSubscribableContexts())); - } - - // nested Group - if (groupContext.getGroupContexts() != null) { - groupSubscription.addGroupSubscriptionAliases(getGroupSubscriptionAliases(groupContext.getGroupContexts())); - // need to recurse to get other nested groups, if any - getGroupSubscriptions(groupContext.getGroupContexts(), tenantID, groupSubscriptions); - } - - groupSubscriptions.add(groupSubscription); - } - } - - private Set<String> getGroupSubscriptionAliases (Set<GroupContext> groupContexts) throws CompositeApplicationException { - - Set<String> topLevelGroupAliases = new HashSet<String>(); - - for (GroupContext topLevelGroupCtxt : groupContexts) { - topLevelGroupAliases.add(topLevelGroupCtxt.getAlias()); - } - - return topLevelGroupAliases; - } - - private Set<CartridgeSubscription> getCartridgeSubscriptionForGroups (Set<GroupContext> groupContexts, - int tenantId, String tenantDomain, - String tenantAdminUsername) - throws CompositeApplicationException { - - Set<CartridgeSubscription> cartridgeSubscriptions = new HashSet<CartridgeSubscription>(); - for (GroupContext groupContext : groupContexts) { - // create Subscriptions for the Group's top level Subscribables - if (groupContext.getSubscribableContexts() != null) { - cartridgeSubscriptions.addAll(getCartridgeSybscriptionsForSubscribables(groupContext.getSubscribableContexts(), - tenantId, tenantDomain, tenantAdminUsername)); - } - // create Subscriptions for the nested Group's Subscribables - if (groupContext.getGroupContexts() != null) { - cartridgeSubscriptions.addAll(getCartridgeSubscriptionForGroups(groupContext.getGroupContexts(), tenantId, - tenantDomain, tenantAdminUsername)); - } - } - - return cartridgeSubscriptions; - } - - private Set<CartridgeSubscription> getCartridgeSybscriptionsForSubscribables (Set<SubscribableContext> subscribableContexts, - int tenantId, String tenantDomain, - String tenantAdminUsername) - throws CompositeApplicationException { - - Set<CartridgeSubscription> cartridgeSubscriptions = new HashSet<CartridgeSubscription>(); - - for (SubscribableContext subscribableContext : subscribableContexts) { - cartridgeSubscriptions.add(getCartridgeSubscription(subscribableContext, tenantId, tenantDomain, tenantAdminUsername)); - } - - return cartridgeSubscriptions; - } - - private CartridgeSubscription getCartridgeSubscription (SubscribableContext subscribableContext, int tenantId, String tenantDomain, - String tenantAdminUsername) throws CompositeApplicationException { - - SubscriptionData subscriptionData = new SubscriptionData(); - subscriptionData.setCartridgeType(subscribableContext.getCartridgeType()); - subscriptionData.setCartridgeAlias(subscribableContext.getAlias()); - subscriptionData.setAutoscalingPolicyName(subscribableContext.getAutoscalingPolicy()); - subscriptionData.setDeploymentPolicyName(subscribableContext.getDeploymentPolicy()); - subscriptionData.setTenantId(tenantId); - subscriptionData.setTenantDomain(tenantDomain); - subscriptionData.setTenantAdminUsername(tenantAdminUsername); - - if (subscribableContext.getRepoUrl() != null && !subscribableContext.getRepoUrl().isEmpty()) { - subscriptionData.setRepositoryType("git"); - subscriptionData.setRepositoryURL(subscribableContext.getRepoUrl()); - subscriptionData.setPrivateRepository(subscribableContext.isPrivateRepo()); - subscriptionData.setRepositoryUsername(subscribableContext.getUsername()); - subscriptionData.setRepositoryPassword(subscribableContext.getPassword()); - } - - CartridgeSubscriptionManager cartridgeSubscriptionManager = new CartridgeSubscriptionManager(); - try { - return cartridgeSubscriptionManager.createCartridgeSubscription(subscriptionData); - - } catch (ADCException e) { - throw new CompositeApplicationException(e); - } catch (InvalidCartridgeAliasException e) { - throw new CompositeApplicationException(e); - } catch (DuplicateCartridgeAliasException e) { - throw new CompositeApplicationException(e); - } catch (PolicyException e) { - throw new CompositeApplicationException(e); - } catch (UnregisteredCartridgeException e) { - throw new CompositeApplicationException(e); - } catch (RepositoryRequiredException e) { - throw new CompositeApplicationException(e); - } catch (RepositoryCredentialsRequiredException e) { - throw new CompositeApplicationException(e); - } catch (RepositoryTransportException e) { - throw new CompositeApplicationException(e); - } catch (AlreadySubscribedException e) { - throw new CompositeApplicationException(e); - } catch (InvalidRepositoryException e) { - throw new CompositeApplicationException(e); - } - - } - - private boolean cartridgeSubscriptionExistsForAlias (Map<String, CartridgeSubscription> aliasToCartridgeSubscription, - String newCartridgeSubscriptionAlias) { - - return aliasToCartridgeSubscription.get(newCartridgeSubscriptionAlias) != null; - } - - - private boolean groupSubscriptionExistsForAlias (Map<String, GroupSubscription> groupAliasToGroupSubscription, - String newGroupSubscriptionAlias) { - - return groupAliasToGroupSubscription.get(newGroupSubscriptionAlias) != null; - } - - private synchronized void persistSubscriptions(Collection<CartridgeSubscription> cartridgeSubscriptions, - Collection<GroupSubscription> groupSubscriptions, - ApplicationSubscription compositeAppSubscription) - throws CompositeApplicationException { - - persistCartridgeSubscriptions(cartridgeSubscriptions); - persistGroupSubscriptions(groupSubscriptions); - persistCompositeAppSubscription(compositeAppSubscription); - } - - private void persistCartridgeSubscriptions (Collection<CartridgeSubscription> cartridgeSubscriptions) throws CompositeApplicationException { - - if (cartridgeSubscriptions == null) { - return; - } - - for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { - try { - cartridgeSubscriptionManager.persistCartridgeSubscription(cartridgeSubscription); - - } catch (ADCException e) { - throw new CompositeApplicationException(e); - } - } - } - - private void persistGroupSubscriptions (Collection<GroupSubscription> groupSubscriptions) throws CompositeApplicationException { - - if (groupSubscriptions == null) { - return; - } - - for (GroupSubscription groupSubscription : groupSubscriptions) { - try { - cartridgeSubscriptionManager.persistGroupSubscription(groupSubscription); - - } catch (ADCException e) { - throw new CompositeApplicationException(e); - } - } - } - - private void persistCompositeAppSubscription (ApplicationSubscription compositeAppSubscription) throws CompositeApplicationException { - - if (compositeAppSubscription != null) { - try { - cartridgeSubscriptionManager.persistApplicationSubscription(compositeAppSubscription); - - } catch (ADCException e) { - throw new CompositeApplicationException(e); - } - } - } - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/utils/ApplicationUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/utils/ApplicationUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/utils/ApplicationUtils.java index e208562..4dbf251 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/utils/ApplicationUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/utils/ApplicationUtils.java @@ -11,94 +11,12 @@ import org.apache.stratos.messaging.broker.publish.EventPublisherPool; import org.apache.stratos.messaging.event.topology.CompositeApplicationCreatedEvent; import org.apache.stratos.messaging.event.topology.CompositeApplicationRemovedEvent; import org.apache.stratos.messaging.util.Constants; -import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; // Grouping public class ApplicationUtils { private static Log log = LogFactory.getLog(ApplicationUtils.class); - - static class ApplicationCreatedEventPublisher implements Runnable { - - private ConfigCompositeApplication configCompositeApplication; - - public ApplicationCreatedEventPublisher(ConfigCompositeApplication configCompositeApplication) { - this.configCompositeApplication = configCompositeApplication; - - } - - @Override - public void run() { - try { - if(log.isInfoEnabled()) { - log.info(String.format("Publishing application createdevent: [application-alias] %s ", configCompositeApplication.getAlias())); - } - CompositeApplicationCreatedEvent event = new CompositeApplicationCreatedEvent(configCompositeApplication); - EventPublisher eventPublisher = EventPublisherPool.getPublisher(Constants.TOPOLOGY_TOPIC); - eventPublisher.publish(event); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error(String.format("Could not publish tenant subscribed event: [application-alias] %s ", configCompositeApplication.getAlias()), e); - } - } - - } - - } - - public static void publishApplicationCreatedEvent(ConfigCompositeApplication configCompositeApplication) { - - - Executor exec = new Executor() { - @Override - public void execute(Runnable command) { - command.run(); - } - }; - - exec.execute(new ApplicationCreatedEventPublisher(configCompositeApplication)); - } - - - static class ApplicationRemovedEventPublisher implements Runnable { - - private String configCompositeApplicationAlias; - - public ApplicationRemovedEventPublisher(String configCompositeApplicationAlias) { - this.configCompositeApplicationAlias = configCompositeApplicationAlias; - - } - - @Override - public void run() { - try { - if(log.isInfoEnabled()) { - log.info(String.format("Publishing application createdevent: [application-alias] %s ", configCompositeApplicationAlias)); - } - CompositeApplicationRemovedEvent event = new CompositeApplicationRemovedEvent(configCompositeApplicationAlias); - EventPublisher eventPublisher = EventPublisherPool.getPublisher(Constants.TOPOLOGY_TOPIC); - eventPublisher.publish(event); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error(String.format("Could not publish composite removed event event: [application-alias] %s ", configCompositeApplicationAlias), e); - } - } - - } - - } - - public static void publishApplicationUnDeployEvent(String configApplicationAlias) { - Executor exec = new Executor() { - @Override - public void execute(Runnable command) { - command.run(); - } - }; - - exec.execute(new ApplicationRemovedEventPublisher(configApplicationAlias)); - } public static boolean isAliasValid (String alias) { http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/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 c404978..a386c03 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 @@ -31,7 +31,6 @@ import org.apache.stratos.manager.persistence.RegistryBasedPersistenceManager; import org.apache.stratos.manager.subscription.CartridgeSubscription; import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; -import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; import java.util.Collection; import java.util.Set; http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/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 248abdf..c6dadf9 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 @@ -26,7 +26,6 @@ import org.apache.stratos.manager.lookup.ClusterIdToSubscription; import org.apache.stratos.manager.subscription.CartridgeSubscription; import org.apache.stratos.manager.subscription.ApplicationSubscription; import org.apache.stratos.manager.subscription.GroupSubscription; -import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; import java.io.ByteArrayOutputStream; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java index eb0564b..e2c753b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java @@ -8,6 +8,7 @@ import java.util.List; public class ConfigCompositeApplication implements Serializable { + /* grouping_poc */ private String applicationId; private String alias; private List<ConfigGroup> components; @@ -38,5 +39,4 @@ public class ConfigCompositeApplication implements Serializable { this.cartridges = cartridges; } - } http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index d1d2f4b..cc3ae4a 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -785,12 +785,6 @@ public class PojoConverter { return subscribableContexts; } - private static SubscribableContext getSubscribableContextFromSubscribableDefinition (SubscribableDefinition subscribableDefinition) { - - SubscribableContext subscribableContext = new SubscribableContext(); - subscribableContext.setType(subscribableDefinition.getType()); - return subscribableContext; - } public static ApplicationBean applicationToBean(Application application) { @@ -817,122 +811,4 @@ public class PojoConverter { return groupBean; } - /* - public static ConfigCompositeApplication convertToCompositeApplication(CompositeApplicationDefinitionBean appBean) { - ConfigCompositeApplication configApp = new ConfigCompositeApplication(); - - configApp.setAlias(appBean.alias); - configApp.setApplicationId(appBean.applicationId); - - List<org.apache.stratos.messaging.domain.topology.ConfigCartridge> configCartridges = - new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigCartridge>(); - - for (CartridgeDefinition beanCartridge : appBean.cartridges ) { - org.apache.stratos.messaging.domain.topology.ConfigCartridge configCartridge = - new org.apache.stratos.messaging.domain.topology.ConfigCartridge(); - configCartridge.setAlias(beanCartridge.alias); - configCartridges.add(configCartridge); - } - configApp.setCartridges(configCartridges); - - // converting groups / components - List<org.apache.stratos.messaging.domain.topology.ConfigGroup> configGroups = - new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigGroup>(); - - for (ComponentDefinition beanGroup : appBean.components ) { - org.apache.stratos.messaging.domain.topology.ConfigGroup configGroup = - new org.apache.stratos.messaging.domain.topology.ConfigGroup(); - configGroup.setAlias(beanGroup.alias); - configGroup.setSubscribables(beanGroup.subscribables); - org.apache.stratos.messaging.domain.topology.ConfigDependencies configDep = - new org.apache.stratos.messaging.domain.topology.ConfigDependencies(); - - - // convert dependencies - configDep.setKill_behavior(beanGroup.dependencies.kill_behavior); - List<org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair> configPairs = - new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair>(); - for (ConfigDependencies.Pair beanPair : beanGroup.dependencies.startup_order) { - configPairs.add(new org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair(beanPair.getKey(), beanPair.getValue())); - } - configDep.setStartup_order(configPairs); - configGroup.setDependencies(configDep); - - configGroups.add(configGroup); - } - configApp.setComponents(configGroups); - - return configApp; - } - */ - // grouping - /* - public static CompositeApplicationDefinition convertToCompositeApplicationForCC (CompositeApplicationDefinitionBean appBean) { - CompositeApplicationDefinition configApp = new CompositeApplicationDefinition(); - - configApp.setAlias(appBean.alias); - configApp.setApplicationId(appBean.applicationId); - - - - List<org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge> configCartridges = - new ArrayList<org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge>(); - - for (CartridgeDefinition beanCartridge : appBean.cartridges ) { - org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge configCartridge = - new org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge(); - configCartridge.setAlias(beanCartridge.alias); - configCartridges.add(configCartridge); - } - org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge [] arrayConfigCartridge = - new org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge[configCartridges.size()]; - arrayConfigCartridge = configCartridges.toArray(arrayConfigCartridge); - configApp.setCartridges(arrayConfigCartridge); - - // converting groups / components - List<org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup> configGroups = - new ArrayList<org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup>(); - - for (ComponentDefinition beanGroup : appBean.components ) { - org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup configGroup = - new org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup(); - configGroup.setAlias(beanGroup.alias); - String [] arraySubscribables = new String[beanGroup.subscribables.size()]; - arraySubscribables = beanGroup.subscribables.toArray(arraySubscribables); - configGroup.setSubscribables(arraySubscribables); - org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencies configDep = - new org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencies(); - - - // convert dependencies - configDep.setKill_behavior(beanGroup.dependencies.kill_behavior); - int i = 0; - org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair[] configPairs = - new org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair[beanGroup.dependencies.startup_order.size()]; - - for (ConfigDependencies.Pair beanPair : beanGroup.dependencies.startup_order) { - //configPairs.add(new org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair(beanPair.getKey(), beanPair.getValue())); - - org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair pair = new org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair(); - pair.setKey(beanPair.getKey()); - pair.setValue(beanPair.getValue()); - - configPairs[i] = pair; - i++; - } - configDep.setStartup_order(configPairs); - configGroup.setDependencies(configDep); - - configGroups.add(configGroup); - - } - org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup [] configGroupArray = - new org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup[configGroups.size()]; - configGroupArray = configGroups.toArray(configGroupArray); - configApp.setComponents(configGroupArray); - - return configApp; - } - - */ } http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 4423586..1bd2568 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -33,7 +33,6 @@ import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.cloud.controller.stub.pojo.application.ApplicationContext; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; -import org.apache.stratos.manager.composite.application.CompositeApplicationManager; import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.deploy.service.ServiceDeploymentManager; @@ -86,7 +85,6 @@ public class ServiceUtils { private static CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager(); private static ServiceGroupingManager serviceGropingManager = new ServiceGroupingManager(); private static ServiceDeploymentManager serviceDeploymentManager = new ServiceDeploymentManager(); - private static CompositeApplicationManager compositeApplicationManager = new CompositeApplicationManager(); static void deployCartridge(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt, String userName, String tenantDomain) throws RestAPIException { @@ -156,8 +154,6 @@ public class ServiceUtils { } catch (RemoteException e) { throw new RestAPIException(e); - } catch (CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException e) { - throw new RestAPIException(e); } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) { throw new RestAPIException(e); } catch (CloudControllerServiceApplicationDefinitionExceptionException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/9beae459/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java index 2439797..56602ad 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java @@ -183,42 +183,6 @@ public class StratosAdmin extends AbstractAdmin { } -// -// @DELETE -// @Path("/application/definition/{applicationAlias}") -// @Produces("application/json") -// @Consumes("application/json") -// @AuthorizationAction("/permission/protected/manage/monitor/tenants") -// @SuperTenantService(true) -// // Grouping -// public Response unDeployApplicationDefinitionX(@PathParam("applicationAlias")String configCompositeApplicationAlias) -// throws RestAPIException { -// -// ServiceUtils.unDeployApplication(configCompositeApplicationAlias, getConfigContext(), getUsername(), -// getTenantDomain()); -// return Response.noContent().build(); -// -// } - - - - /* - * Grouping --- fix API, use this instead of POST to remove application !!!! - - @DELETE - @Path("/cartridge/definition/{cartridgeType}") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/protected/manage/monitor/tenants") - @SuperTenantService(true) - public StratosAdminResponse unDeployCartridgeDefinition (@PathParam("cartridgeType") String cartridgeType) throws RestAPIException { - - return ServiceUtils.undeployCartridge(cartridgeType); - } - nnnnnn - */ - - @POST @Path("/cartridge/definition/") @Produces("application/json")
