Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 610c22d2d -> a520063c7
fixing unknown listener issue and setting tenant id when adding and retreiving from registry Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a520063c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a520063c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a520063c Branch: refs/heads/4.0.0-grouping Commit: a520063c77986361e10282622a8f2f29534a4472 Parents: 610c22d Author: reka <[email protected]> Authored: Mon Nov 3 18:05:52 2014 +0530 Committer: reka <[email protected]> Committed: Mon Nov 3 18:05:52 2014 +0530 ---------------------------------------------------------------------- .../topology/AutoscalerTopologyEventReceiver.java | 4 ++-- .../autoscaler/registry/RegistryManager.java | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a520063c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java index dee3e97..525c73e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -415,7 +415,7 @@ public class AutoscalerTopologyEventReceiver implements Runnable { } });*/ - topologyEventReceiver.addEventListener(new ApplicationUndeployedEventListener() { + /*topologyEventReceiver.addEventListener(new ApplicationUndeployedEventListener() { @Override protected void onEvent(Event event) { @@ -541,7 +541,7 @@ public class AutoscalerTopologyEventReceiver implements Runnable { // releaseReadLockForApplication(applicationUndeployedEvent.getApplicationId()); // } } - }); + });*/ /*topologyEventReceiver.addEventListener(new ApplicationTerminatingEventListener() { http://git-wip-us.apache.org/repos/asf/stratos/blob/a520063c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java index 5e995da..af2f795 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java @@ -36,10 +36,12 @@ import org.apache.stratos.autoscaler.util.ServiceReferenceHolder; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.Applications; +import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.registry.core.Registry; import org.wso2.carbon.registry.core.Resource; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.exceptions.ResourceNotFoundException; +import org.wso2.carbon.utils.multitenancy.MultitenantConstants; import java.util.ArrayList; import java.util.List; @@ -88,7 +90,11 @@ public class RegistryManager { * @param resourcePath resource path to be persisted. */ private void persist(Object dataObj, String resourcePath) throws AutoScalerException { - + PrivilegedCarbonContext ctx = PrivilegedCarbonContext + .getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + try { registryService.beginTransaction(); @@ -146,6 +152,10 @@ public class RegistryManager { public void persistApplication (Application application) { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext + .getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); String resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.APPLICATIONS_RESOURCE + "/" + application.getUniqueIdentifier(); @@ -157,6 +167,11 @@ public class RegistryManager { } public String [] getApplicationResourcePaths () { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext + .getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + Object obj = retrieve(AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.APPLICATIONS_RESOURCE);
