From 789ee553e6275af6f777279135f88f3d4e077d8d Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Tue, 16 Feb 2021 19:12:57 +0530
Subject: [PATCH] Move email-sender component to tranport-mgt

---
 .../email-sender/org.wso2.carbon.email.sender.core/pom.xml    | 0
 .../sender/core/ContentProcessingInterruptedException.java    | 0
 .../wso2/carbon/email/sender/core/ContentProviderInfo.java    | 0
 .../wso2/carbon/email/sender/core/EmailContentProvider.java   | 0
 .../carbon/email/sender/core/EmailContentProviderFactory.java | 0
 .../java/org/wso2/carbon/email/sender/core/EmailContext.java  | 0
 .../java/org/wso2/carbon/email/sender/core/EmailData.java     | 0
 .../org/wso2/carbon/email/sender/core/EmailSenderConfig.java  | 0
 .../sender/core/EmailSenderConfigurationFailedException.java  | 0
 .../org/wso2/carbon/email/sender/core/EmailSenderUtil.java    | 0
 .../carbon/email/sender/core/EmailSendingFailedException.java | 0
 .../sender/core/EmailTransportNotConfiguredException.java     | 0
 .../email/sender/core/InvalidConfigurationStateException.java | 0
 .../carbon/email/sender/core/RegistryBasedResourceLoader.java | 0
 .../java/org/wso2/carbon/email/sender/core/TypedValue.java    | 0
 .../email/sender/core/VelocityBasedEmailContentProvider.java  | 0
 .../core/internal/EmailSenderAxis2ConfigContextObserver.java  | 0
 .../email/sender/core/internal/EmailSenderDataHolder.java     | 0
 .../sender/core/internal/EmailSenderServiceComponent.java     | 0
 .../wso2/carbon/email/sender/core/internal/EmailUtils.java    | 0
 .../carbon/email/sender/core/service/EmailSenderService.java  | 0
 .../email/sender/core/service/EmailSenderServiceImpl.java     | 0
 .../src/test/resources/log4j.properties                       | 0
 .../src/test/resources/testng.xml                             | 0
 .../org.wso2.carbon.email.sender.core/velocity.log            | 0
 components/{ => transport-mgt}/email-sender/pom.xml           | 4 ++--
 components/transport-mgt/pom.xml                              | 1 +
 .../email-sender/org.wso2.carbon.email.sender.feature/pom.xml | 2 +-
 .../src/main/resources/build.properties                       | 0
 .../src/main/resources/conf/email-sender-config.xml           | 0
 .../email/templates/default-enrollment-invitation.vm          | 0
 .../src/main/resources/email/templates/default.vm             | 0
 .../resources/email/templates/policy-violating-notifier.vm    | 0
 .../src/main/resources/email/templates/user-enrollment.vm     | 0
 .../src/main/resources/email/templates/user-registration.vm   | 0
 .../src/main/resources/email/templates/user-verify.vm         | 0
 .../src/main/resources/email/templates/user-welcome.vm        | 0
 .../src/main/resources/p2.inf                                 | 0
 features/{ => transport-mgt}/email-sender/pom.xml             | 4 ++--
 features/transport-mgt/pom.xml                                | 1 +
 pom.xml                                                       | 2 --
 41 files changed, 7 insertions(+), 7 deletions(-)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/pom.xml (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProcessingInterruptedException.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProviderInfo.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProvider.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProviderFactory.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContext.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailData.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfig.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfigurationFailedException.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderUtil.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSendingFailedException.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailTransportNotConfiguredException.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/InvalidConfigurationStateException.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/RegistryBasedResourceLoader.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/TypedValue.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/VelocityBasedEmailContentProvider.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderDataHolder.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailUtils.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderService.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml (100%)
 rename components/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.core/velocity.log (100%)
 rename components/{ => transport-mgt}/email-sender/pom.xml (92%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/pom.xml (97%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm (100%)
 rename features/{ => transport-mgt}/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf (100%)
 rename features/{ => transport-mgt}/email-sender/pom.xml (93%)

diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/pom.xml
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/pom.xml
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProcessingInterruptedException.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProcessingInterruptedException.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProcessingInterruptedException.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProcessingInterruptedException.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProviderInfo.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProviderInfo.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProviderInfo.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/ContentProviderInfo.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProvider.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProvider.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProvider.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProvider.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProviderFactory.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProviderFactory.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProviderFactory.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContentProviderFactory.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContext.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContext.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContext.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailContext.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailData.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailData.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailData.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailData.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfig.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfig.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfig.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfig.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfigurationFailedException.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfigurationFailedException.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfigurationFailedException.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderConfigurationFailedException.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderUtil.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderUtil.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderUtil.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSenderUtil.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSendingFailedException.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSendingFailedException.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSendingFailedException.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailSendingFailedException.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailTransportNotConfiguredException.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailTransportNotConfiguredException.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailTransportNotConfiguredException.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/EmailTransportNotConfiguredException.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/InvalidConfigurationStateException.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/InvalidConfigurationStateException.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/InvalidConfigurationStateException.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/InvalidConfigurationStateException.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/RegistryBasedResourceLoader.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/RegistryBasedResourceLoader.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/RegistryBasedResourceLoader.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/RegistryBasedResourceLoader.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/TypedValue.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/TypedValue.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/TypedValue.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/TypedValue.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/VelocityBasedEmailContentProvider.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/VelocityBasedEmailContentProvider.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/VelocityBasedEmailContentProvider.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/VelocityBasedEmailContentProvider.java
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/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderDataHolder.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderDataHolder.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderDataHolder.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderDataHolder.java
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/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailSenderServiceComponent.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailUtils.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailUtils.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailUtils.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/internal/EmailUtils.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderService.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderService.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderService.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderService.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/velocity.log b/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/velocity.log
similarity index 100%
rename from components/email-sender/org.wso2.carbon.email.sender.core/velocity.log
rename to components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/velocity.log
diff --git a/components/email-sender/pom.xml b/components/transport-mgt/email-sender/pom.xml
similarity index 92%
rename from components/email-sender/pom.xml
rename to components/transport-mgt/email-sender/pom.xml
index 23b09390c00..33817efa23e 100644
--- a/components/email-sender/pom.xml
+++ b/components/transport-mgt/email-sender/pom.xml
@@ -21,9 +21,9 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>carbon-devicemgt</artifactId>
+        <artifactId>transport-mgt</artifactId>
         <version>4.1.12-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/transport-mgt/pom.xml b/components/transport-mgt/pom.xml
index 9794bb77ca9..2fa7c65c0c9 100644
--- a/components/transport-mgt/pom.xml
+++ b/components/transport-mgt/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>sms-handler</module>
+        <module>email-sender</module>
     </modules>
 
 </project>
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
similarity index 97%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
index 5f14e97427f..58bc8c85931 100644
--- a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
+++ b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
@@ -87,7 +87,7 @@
                         </goals>
                         <configuration>
                             <id>org.wso2.carbon.email.sender</id>
-                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
                                     <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf
similarity index 100%
rename from features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf
rename to features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf
diff --git a/features/email-sender/pom.xml b/features/transport-mgt/email-sender/pom.xml
similarity index 93%
rename from features/email-sender/pom.xml
rename to features/transport-mgt/email-sender/pom.xml
index 7c4f49db264..ea751866fef 100644
--- a/features/email-sender/pom.xml
+++ b/features/transport-mgt/email-sender/pom.xml
@@ -21,9 +21,9 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>carbon-devicemgt</artifactId>
+        <artifactId>transport-mgt-feature</artifactId>
         <version>4.1.12-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/transport-mgt/pom.xml b/features/transport-mgt/pom.xml
index d49c085590e..84148ff7ede 100644
--- a/features/transport-mgt/pom.xml
+++ b/features/transport-mgt/pom.xml
@@ -17,5 +17,6 @@
 
     <modules>
         <module>sms-handler</module>
+        <module>email-sender</module>
     </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index 7bb19f9f1fa..ba74a95be35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
         <module>components/policy-mgt</module>
         <module>components/certificate-mgt</module>
         <module>components/webapp-authenticator-framework</module>
-        <module>components/email-sender</module>
         <module>components/ui-request-interceptor</module>
         <module>components/transport-mgt</module>
         <module>features/device-mgt</module>
@@ -54,7 +53,6 @@
         <module>features/webapp-authenticator-framework</module>
         <module>features/certificate-mgt</module>
         <module>features/oauth-extensions</module>
-        <module>features/email-sender</module>
         <module>features/heartbeat-management</module>
         <module>features/ui-request-interceptor</module>
         <module>features/jwt-client</module>