From fee9fbad7d55fdce8560bada258047cb35acd0ad Mon Sep 17 00:00:00 2001 From: manoj Date: Tue, 24 Mar 2015 18:15:45 +0530 Subject: [PATCH] Refactor Email Functionality --- .../device/mgt/core/DeviceManagementServiceProviderImpl.java | 2 +- .../org/wso2/carbon/device/mgt/core/email/EmailConstants.java | 1 - .../src/main/resources/conf/notification-messages.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java index ba090b14d3..5f0d5fcbb1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java @@ -268,7 +268,7 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ emailMessageProperties.getSubject() + "'", e); } emailMessageProperties.setMessageBody(messageBuilder.toString()); - emailMessageProperties.setSubject(EmailConstants.EnrolmentEmailConstants.ENROLMENT_MAIL_SUBJECT); + emailMessageProperties.setSubject(enrolmentNotifications.getSubject()); EmailServiceDataHolder.getInstance().getEmailServiceProvider().sendEmail(emailMessageProperties); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/email/EmailConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/email/EmailConstants.java index 81c2080c91..2e9babdbdb 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/email/EmailConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/email/EmailConstants.java @@ -24,7 +24,6 @@ public final class EmailConstants { public static final String USERNAME = "user-name"; public static final String DOwN_LOAD_URL = "downloadUrl"; public static final String ENCODED_SCHEME = "UTF-8"; - public static final String ENROLMENT_MAIL_SUBJECT = "Enrol Your Device with wso2 MDM"; } } diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml index e642309f2f..563b4a58c0 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml @@ -27,6 +27,6 @@ Best Regards, WSO2 Carbon Team http://www.wso2.com - Enrol your device + Enrol your device with WSO2 MDM \ No newline at end of file