Updated Branches: refs/heads/master c1702b184 -> 24086e311
removing topology mgt from Stratos Manager Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6a969836 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6a969836 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6a969836 Branch: refs/heads/master Commit: 6a9698361e7844e0f1e5b2b0abba8fdb15bea8b0 Parents: 34faa85 Author: Isuru <[email protected]> Authored: Wed Jan 8 13:30:11 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Jan 8 08:05:10 2014 +0000 ---------------------------------------------------------------------- components/org.apache.stratos.manager/pom.xml | 9 +++++++-- .../internal/ADCManagementServerComponent.java | 11 ++-------- .../stratos/manager/internal/DataHolder.java | 7 +++---- .../service/ApplicationManagementService.java | 10 ++++------ .../utils/ApplicationManagementUtil.java | 21 ++++++++++---------- components/pom.xml | 4 ++-- features/manager/stratos-mgt/pom.xml | 2 +- service-stubs/pom.xml | 2 +- 8 files changed, 30 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/components/org.apache.stratos.manager/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml index 9623048..063ad17 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -51,11 +51,11 @@ <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.adc.topology.mgt</artifactId> <version>${project.version}</version> - </dependency> + </dependency--> <dependency> <groupId>org.wso2.carbon</groupId> @@ -110,6 +110,11 @@ <artifactId>org.apache.stratos.common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.messaging</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java index 07b5186..8c8f194 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java @@ -27,7 +27,6 @@ import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager; import org.apache.stratos.manager.topology.receiver.StratosManagerTopologyReceiver; import org.apache.stratos.manager.utils.CartridgeConfigFileReader; import org.apache.stratos.manager.utils.StratosDBUtils; -import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber; import org.apache.stratos.messaging.util.Constants; @@ -54,12 +53,6 @@ import org.wso2.carbon.utils.ConfigurationContextService; * "org.wso2.carbon.registry.core.service.RegistryService" * cardinality="1..1" policy="dynamic" bind="setRegistryService" * unbind="unsetRegistryService" - * @scr.reference name="topology.mgt.service" - * interface= - * "org.apache.stratos.adc.topology.mgt.service.TopologyManagementService" - * cardinality="1..1" policy="dynamic" - * bind="setTopologyManagementService" - * unbind="unsetTopologyManagementService" * @scr.reference name="ntask.component" interface="org.wso2.carbon.ntask.core.service.TaskService" * cardinality="1..1" policy="dynamic" bind="setTaskService" * unbind="unsetTaskService" @@ -159,12 +152,12 @@ public class ADCManagementServerComponent { protected void unsetRegistryService(RegistryService registryService) { } - protected void setTopologyManagementService(TopologyManagementService topologyMgtService) { + /*protected void setTopologyManagementService(TopologyManagementService topologyMgtService) { DataHolder.setTopologyMgtService(topologyMgtService); } protected void unsetTopologyManagementService(TopologyManagementService topologyMgtService) { - } + }*/ protected void setTaskService(TaskService taskService) { if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/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 02f0f2f..9de2327 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 @@ -20,7 +20,6 @@ package org.apache.stratos.manager.internal; import org.apache.axis2.context.ConfigurationContext; -import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; @@ -35,7 +34,7 @@ public class DataHolder { private static RealmService realmService; private static RegistryService registryService; - private static TopologyManagementService topologyMgtService; + //private static TopologyManagementService topologyMgtService; private static EventPublisher eventPublisher; public static RealmService getRealmService() { @@ -72,13 +71,13 @@ public class DataHolder { DataHolder.registryService = registryService; } - public static TopologyManagementService getTopologyMgtService() { + /*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/6a969836/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/ApplicationManagementService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/ApplicationManagementService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/ApplicationManagementService.java index df0cdb6..5cc24d7 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/ApplicationManagementService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/ApplicationManagementService.java @@ -22,20 +22,18 @@ package org.apache.stratos.manager.service; 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; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dto.*; import org.apache.stratos.manager.exception.*; -import org.apache.stratos.manager.subscription.CartridgeSubscription; -import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.manager.CartridgeSubscriptionManager; +import org.apache.stratos.manager.subscription.CartridgeSubscription; import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.ApplicationManagementUtil; import org.apache.stratos.manager.utils.CartridgeConstants; import org.apache.stratos.manager.utils.PersistenceManager; import org.apache.stratos.manager.utils.PolicyHolder; -import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; -import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.core.AbstractAdmin; import org.wso2.carbon.registry.core.exceptions.RegistryException; @@ -254,11 +252,11 @@ public class ApplicationManagementService extends AbstractAdmin { if (!cartridgeMatches(cartridgeInfo, subscription, searchPattern)) { continue; } - TopologyManagementService topologyMgtService = DataHolder.getTopologyMgtService(); + /*TopologyManagementService topologyMgtService = DataHolder.getTopologyMgtService(); String[] ips = topologyMgtService.getActiveIPs(subscription.getCartridge(), subscription.getClusterDomain(), subscription.getClusterSubdomain()); Cartridge cartridge = ApplicationManagementUtil.populateCartridgeInfo(cartridgeInfo, subscription, ips, getTenantDomain()); - cartridges.add(cartridge); + cartridges.add(cartridge);*/ } } else { if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java index 98b47d4..b08d5d4 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java @@ -29,6 +29,11 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.engine.AxisConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.Properties; +import org.apache.stratos.cloud.controller.pojo.Property; +import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException; +import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.DataCartridge; @@ -41,13 +46,6 @@ import org.apache.stratos.manager.exception.*; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.repository.Repository; import org.apache.stratos.manager.service.RepositoryInfoBean; -import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; -import org.apache.stratos.adc.topology.mgt.serviceobjects.DomainContext; -import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.pojo.Properties; -import org.apache.stratos.cloud.controller.pojo.Property; -import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException; -import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.LsRemoteCommand; import org.eclipse.jgit.api.errors.GitAPIException; @@ -286,7 +284,7 @@ public class ApplicationManagementUtil { } } - TopologyManagementService topologyService = DataHolder.getTopologyMgtService(); + /*TopologyManagementService topologyService = DataHolder.getTopologyMgtService(); DomainContext[] domainContexts = topologyService.getDomainsAndSubdomains(cartridgeType, tenantId); log.info("Retrieved " + domainContexts.length + " domain and corresponding subdomain pairs"); @@ -311,7 +309,7 @@ public class ApplicationManagementUtil { String msg = "Domain contexts not found for " + cartridgeType + " and tenant id " + tenantId; log.warn(msg); throw new ADCException(msg); - } + }*/ } } @@ -928,13 +926,14 @@ public class ApplicationManagementUtil { throw new ADCException("Cannot get cartridge info: " + sub.getCartridge(), e); } - TopologyManagementService topologyMgtService = DataHolder.getTopologyMgtService(); + /*TopologyManagementService topologyMgtService = DataHolder.getTopologyMgtService(); String[] ips = topologyMgtService.getActiveIPs(sub.getCartridge(), sub.getClusterDomain(), sub.getClusterSubdomain()); - return populateCartridgeInfo(cartridgeInfo, sub, ips, tenantDomain); + return populateCartridgeInfo(cartridgeInfo, sub, ips, tenantDomain);*/ + return null; } public static void registerService(String cartridgeType, String domain, String subDomain, http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index 3488279..2b46617 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -44,8 +44,8 @@ <module>org.apache.stratos.autoscaler</module> <!-- CC --> <module>org.apache.stratos.cloud.controller</module> - <!-- ADC --> - <module>org.apache.stratos.adc.topology.mgt</module> + <!-- SM --> + <!--module>org.apache.stratos.adc.topology.mgt</module--> <module>org.apache.stratos.manager</module> <module>org.apache.stratos.deployment</module> <!-- CLI --> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/features/manager/stratos-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/pom.xml b/features/manager/stratos-mgt/pom.xml index 4b9450e..cde9aaa 100644 --- a/features/manager/stratos-mgt/pom.xml +++ b/features/manager/stratos-mgt/pom.xml @@ -35,7 +35,7 @@ <modules> <module>org.apache.stratos.manager.server.feature</module> - <module>org.apache.stratos.adc.topology.mgt.feature</module> + <!--module>org.apache.stratos.adc.topology.mgt.feature</module--> <module>org.apache.stratos.manager.feature</module> </modules> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6a969836/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 3be0f64..093e6c3 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -51,7 +51,7 @@ <module>org.apache.stratos.tenant.register.gapp.stub</module> <module>org.apache.stratos.redirector.servlet.stub</module> <module>org.apache.stratos.adc.reponotification.service.stub</module> - <module>org.apache.stratos.adc.topologymgt.service.stub</module> + <!--module>org.apache.stratos.adc.topologymgt.service.stub</module--> <module>org.apache.stratos.billing.mgt.stub</module> <module>org.apache.stratos.throttle.stub</module> <module>org.apache.stratos.usage.meteringqueryds.stub</module>
