From 6dc0a9dd381ab40a6b3a7f33a2966c072a391176 Mon Sep 17 00:00:00 2001 From: charitha Date: Tue, 17 May 2016 18:40:39 +0530 Subject: [PATCH] Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario --- ...eManagementAxis2ConfigContextObserver.java | 64 ------------------- .../devicemgt/app/modules/login.js | 8 ++- ...EmailSenderAxis2ConfigContextObserver.java | 3 +- .../internal/EmailSenderServiceComponent.java | 6 +- 4 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementAxis2ConfigContextObserver.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementAxis2ConfigContextObserver.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementAxis2ConfigContextObserver.java deleted file mode 100644 index 3634164d33..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementAxis2ConfigContextObserver.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. 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.wso2.carbon.device.mgt.core.internal; - -import org.apache.axis2.context.ConfigurationContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.CarbonContext; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.context.RegistryType; -import org.wso2.carbon.device.mgt.common.DeviceManagementException; -import org.wso2.carbon.registry.api.Collection; -import org.wso2.carbon.registry.api.Registry; -import org.wso2.carbon.registry.api.RegistryException; -import org.wso2.carbon.registry.api.Resource; -import org.wso2.carbon.utils.Axis2ConfigurationContextObserver; -import org.wso2.carbon.utils.CarbonUtils; -import org.wso2.carbon.utils.multitenancy.MultitenantConstants; - -import java.io.File; -import java.io.FilenameFilter; - -public class DeviceManagementAxis2ConfigContextObserver implements Axis2ConfigurationContextObserver { - - private static final String EMAIL_TEMPLATE_DIR_RELATIVE_REGISTRY_PATH = "email-templates"; - private static final Log log = LogFactory.getLog(DeviceManagementAxis2ConfigContextObserver.class); - - @Override - public void creatingConfigurationContext(int tenantId) { - - } - - @Override - public void createdConfigurationContext(ConfigurationContext configurationContext) { - - } - - @Override - public void terminatingConfigurationContext(ConfigurationContext configurationContext) { - - } - - @Override - public void terminatedConfigurationContext(ConfigurationContext configurationContext) { - - } - -} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/login.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/login.js index 1c014f4ab8..d24df7c480 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/login.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/login.js @@ -26,13 +26,17 @@ var onFail; var properties; var utility = require("/app/modules/utility.js").utility; var apiWrapperUtil = require("/app/modules/api-wrapper-util.js").apiWrapperUtil; - if(context.input.samlToken){ + if (context.input.samlToken) { properties = {samlToken: context.input.samlToken}; apiWrapperUtil.setupAccessTokenPair(constants.GRANT_TYPE_SAML, properties); - }else{ + } else { properties = {username: context.input.username, password: context.input.password}; apiWrapperUtil.setupAccessTokenPair(constants.GRANT_TYPE_PASSWORD, properties); } + var devicemgtProps = require('/app/conf/devicemgt-props.js').config(); + var carbonServer = require("carbon").server; + (new carbonServer.Server({url: devicemgtProps["httpsURL"]})) + .login(context.input.username, context.input.password); }; onFail = function (error) { diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java index 19a7349596..4bd0cc5cca 100644 --- a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java +++ b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java @@ -65,7 +65,8 @@ public class EmailSenderAxis2ConfigContextObserver implements Axis2Configuration private void setupEmailTemplates() throws EmailSenderConfigurationFailedException { File templateDir = - new File(CarbonUtils.getCarbonRepository() + "resources" + File.separator + "email-templates"); + new File(CarbonUtils.getCarbonHome() + File.separator + "repository" + File.separator + "resources" + + File.separator + "email-templates"); if (!templateDir.exists()) { if (log.isDebugEnabled()) { log.debug("The directory that is expected to use as the container for all email templates is not " + diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java index b166c5861b..38b8e451dd 100644 --- a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java +++ b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java @@ -30,6 +30,7 @@ import org.wso2.carbon.registry.api.Registry; import org.wso2.carbon.registry.api.RegistryException; import org.wso2.carbon.registry.api.Resource; import org.wso2.carbon.registry.core.service.RegistryService; +import org.wso2.carbon.utils.Axis2ConfigurationContextObserver; import org.wso2.carbon.utils.CarbonUtils; import org.wso2.carbon.utils.ConfigurationContextService; @@ -55,9 +56,8 @@ import java.io.IOException; */ public class EmailSenderServiceComponent { - private static Log log = LogFactory.getLog(EmailSenderServiceComponent.class); - private static final String EMAIL_TEMPLATE_DIR_RELATIVE_REGISTRY_PATH = "/email-templates"; + private static Log log = LogFactory.getLog(EmailSenderServiceComponent.class); @SuppressWarnings("unused") protected void activate(ComponentContext componentContext) { @@ -77,6 +77,8 @@ public class EmailSenderServiceComponent { if (log.isDebugEnabled()) { log.debug("Email sender core bundle has been successfully initialized"); } + componentContext.getBundleContext().registerService(Axis2ConfigurationContextObserver.class.getName(), + new EmailSenderAxis2ConfigContextObserver(), null); } catch (Throwable e) { log.error("Error occurred while initializing email sender core bundle", e); }