diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml index 3eebdb7cfc..b1c01c5394 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml @@ -279,7 +279,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.email.sender.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 33efc96495..f80c60cde0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -275,7 +275,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.email.sender.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java index 08cfdff591..dca58e7515 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java @@ -38,7 +38,6 @@ import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManag import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier; import org.wso2.carbon.device.mgt.core.geo.task.GeoFenceEventOperationManager; -import org.wso2.carbon.device.mgt.core.metadata.mgt.MetadataManagementServiceImpl; import org.wso2.carbon.device.mgt.core.operation.timeout.task.OperationTimeoutTaskManagerService; import org.wso2.carbon.device.mgt.core.privacy.PrivacyComplianceProvider; import org.wso2.carbon.device.mgt.core.push.notification.mgt.PushNotificationProviderRepository; @@ -47,7 +46,7 @@ import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; import org.wso2.carbon.device.mgt.core.status.task.DeviceStatusTaskManagerService; import org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerService; import org.wso2.carbon.device.mgt.core.traccar.api.service.DeviceAPIClientService; -import org.wso2.carbon.email.sender.core.service.EmailSenderService; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService; import org.wso2.carbon.ntask.core.service.TaskService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java index 0d24f1125c..d394a54529 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java @@ -86,7 +86,7 @@ import org.wso2.carbon.device.mgt.core.traccar.api.service.DeviceAPIClientServic import org.wso2.carbon.device.mgt.core.traccar.api.service.impl.DeviceAPIClientServiceImpl; import org.wso2.carbon.device.mgt.core.util.DeviceManagementSchemaInitializer; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; -import org.wso2.carbon.email.sender.core.service.EmailSenderService; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService; import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; @@ -133,7 +133,7 @@ import java.util.concurrent.TimeUnit; * bind="setConfigurationContextService" * unbind="unsetConfigurationContextService" * @scr.reference name="email.sender.service" - * interface="org.wso2.carbon.email.sender.core.service.EmailSenderService" + * interface="io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService" * cardinality="0..1" * policy="dynamic" * bind="setEmailSenderService" diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index 7380baa807..04d06f5c7d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -152,12 +152,12 @@ import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.device.mgt.core.util.HttpReportingUtil; -import org.wso2.carbon.email.sender.core.ContentProviderInfo; -import org.wso2.carbon.email.sender.core.EmailContext; -import org.wso2.carbon.email.sender.core.EmailSendingFailedException; -import org.wso2.carbon.email.sender.core.EmailTransportNotConfiguredException; -import org.wso2.carbon.email.sender.core.TypedValue; -import org.wso2.carbon.email.sender.core.service.EmailSenderService; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.ContentProviderInfo; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailContext; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSendingFailedException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailTransportNotConfiguredException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.TypedValue; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService; import org.wso2.carbon.stratos.common.beans.TenantInfoBean; import org.wso2.carbon.tenant.mgt.services.TenantMgtAdminService; import org.wso2.carbon.user.api.UserStoreException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestEmailSenderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestEmailSenderService.java index fc1e174f72..252e24af58 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestEmailSenderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestEmailSenderService.java @@ -18,10 +18,10 @@ */ package org.wso2.carbon.device.mgt.core.common; -import org.wso2.carbon.email.sender.core.EmailContext; -import org.wso2.carbon.email.sender.core.EmailSendingFailedException; -import org.wso2.carbon.email.sender.core.EmailTransportNotConfiguredException; -import org.wso2.carbon.email.sender.core.service.EmailSenderService; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailContext; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSendingFailedException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailTransportNotConfiguredException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService; public class TestEmailSenderService implements EmailSenderService { @Override diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml index d0556076b9..1fb676175e 100644 --- a/components/test-coverage/pom.xml +++ b/components/test-coverage/pom.xml @@ -95,7 +95,7 @@ - ${basedir}/../email-sender/org.wso2.carbon.email.sender.core + ${basedir}/../email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core identity-extensions diff --git a/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml similarity index 95% rename from components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/pom.xml rename to components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml index 93cb4643fa..a92e765fb2 100644 --- a/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/pom.xml +++ b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.email.sender.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core bundle WSO2 Carbon - Email Sender Core WSO2 Carbon - Email Sender Core @@ -49,7 +49,7 @@ ${project.artifactId} ${carbon.device.mgt.version} Email Management Core Bundle - org.wso2.carbon.email.sender.core.internal + io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal org.apache.axis2.*;version="${axis2.osgi.version.range}", org.apache.axiom.*; version="${axiom.osgi.version.range}", @@ -74,8 +74,8 @@ org.apache.commons.collections - !org.wso2.carbon.email.sender.core.internal, - org.wso2.carbon.email.sender.core.* + !io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal, + io.entgra.device.mgt.core.transport.mgt.email.sender.core.* diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/ContentProcessingInterruptedException.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/ContentProcessingInterruptedException.java index db54398a46..6a228dcd03 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/ContentProcessingInterruptedException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class ContentProcessingInterruptedException extends Exception { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/ContentProviderInfo.java similarity index 96% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/ContentProviderInfo.java index 534f3f963d..352938216a 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/ContentProviderInfo.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import java.util.Map; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContentProvider.java similarity index 93% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContentProvider.java index 2f3ce81e54..7ba8a10948 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContentProvider.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import java.util.Map; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContentProviderFactory.java similarity index 92% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContentProviderFactory.java index c9e13cf4d5..727d70c6f7 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContentProviderFactory.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class EmailContentProviderFactory { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContext.java similarity index 98% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContext.java index d6faede2f1..e9a8eb54e7 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailContext.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import java.util.*; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailData.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailData.java index 128d400a57..5320dc6c48 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailData.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderConfig.java similarity index 98% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderConfig.java index 5c2104fb89..a69ac138fd 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderConfig.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import org.w3c.dom.Document; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderConfigurationFailedException.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderConfigurationFailedException.java index 448ed2b64e..119d6d0c69 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderConfigurationFailedException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class EmailSenderConfigurationFailedException extends Exception { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderUtil.java similarity index 96% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderUtil.java index cd915629fa..7808d12479 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSenderUtil.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import org.w3c.dom.Document; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSendingFailedException.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSendingFailedException.java index 1f9fd9bef1..b70892971b 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailSendingFailedException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class EmailSendingFailedException extends Exception { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailTransportNotConfiguredException.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailTransportNotConfiguredException.java index 9b75372389..67964e14e1 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/EmailTransportNotConfiguredException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class EmailTransportNotConfiguredException extends Exception { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/InvalidConfigurationStateException.java similarity index 96% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/InvalidConfigurationStateException.java index 606503acfb..0702e0a7da 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/InvalidConfigurationStateException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class InvalidConfigurationStateException extends RuntimeException { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/RegistryBasedResourceLoader.java similarity index 97% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/RegistryBasedResourceLoader.java index 8b12607fc6..24ba401944 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/RegistryBasedResourceLoader.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/TypedValue.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/TypedValue.java index 616ff44188..8d6a02e6cb 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/TypedValue.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; public class TypedValue { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/VelocityBasedEmailContentProvider.java similarity index 94% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/VelocityBasedEmailContentProvider.java index 156dc4dae6..06d8ece984 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/VelocityBasedEmailContentProvider.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,7 +47,7 @@ public class VelocityBasedEmailContentProvider implements EmailContentProvider { engine.setProperty("resource.loader", "registry"); engine.setProperty("velocimacro.library", ""); engine.setProperty("registry.resource.loader.class", - "org.wso2.carbon.email.sender.core.RegistryBasedResourceLoader"); + "io.entgra.device.mgt.core.transport.mgt.email.sender.core.RegistryBasedResourceLoader"); engine.init(); } diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java similarity index 90% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java index 0a4cea270c..87e8c3a426 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderAxis2ConfigContextObserver.java @@ -16,12 +16,12 @@ * under the License. * */ -package org.wso2.carbon.email.sender.core.internal; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal; import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.email.sender.core.EmailSenderConfigurationFailedException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSenderConfigurationFailedException; import org.wso2.carbon.utils.Axis2ConfigurationContextObserver; class EmailSenderAxis2ConfigContextObserver implements Axis2ConfigurationContextObserver { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderDataHolder.java similarity index 93% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderDataHolder.java index fa7c4ee451..9db2d4c3a4 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderDataHolder.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.email.sender.core.internal; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal; -import org.wso2.carbon.email.sender.core.service.EmailSenderService; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.utils.ConfigurationContextService; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderServiceComponent.java similarity index 93% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderServiceComponent.java index b45798a0c1..fefe9002c0 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailSenderServiceComponent.java @@ -15,14 +15,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.email.sender.core.internal; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; -import org.wso2.carbon.email.sender.core.EmailSenderConfig; -import org.wso2.carbon.email.sender.core.service.EmailSenderService; -import org.wso2.carbon.email.sender.core.service.EmailSenderServiceImpl; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSenderConfig; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderServiceImpl; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.utils.Axis2ConfigurationContextObserver; import org.wso2.carbon.utils.ConfigurationContextService; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailUtils.java similarity index 95% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailUtils.java index 8088d95503..7eb06e83f0 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/internal/EmailUtils.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.email.sender.core.internal; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.CarbonContext; -import org.wso2.carbon.email.sender.core.EmailSenderConfigurationFailedException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSenderConfigurationFailedException; import org.wso2.carbon.registry.api.Collection; import org.wso2.carbon.registry.api.Registry; import org.wso2.carbon.registry.api.RegistryException; diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/service/EmailSenderService.java similarity index 70% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/service/EmailSenderService.java index de84b7aee2..e39dcc9aaf 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/service/EmailSenderService.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.email.sender.core.service; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core.service; -import org.wso2.carbon.email.sender.core.EmailContext; -import org.wso2.carbon.email.sender.core.EmailSendingFailedException; -import org.wso2.carbon.email.sender.core.EmailTransportNotConfiguredException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailContext; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSendingFailedException; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailTransportNotConfiguredException; public interface EmailSenderService { diff --git a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/service/EmailSenderServiceImpl.java similarity index 96% rename from components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/service/EmailSenderServiceImpl.java index befb45047e..bb8e68d4d0 100644 --- a/components/transport-mgt/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/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/email/sender/core/service/EmailSenderServiceImpl.java @@ -16,8 +16,10 @@ * under the License. */ -package org.wso2.carbon.email.sender.core.service; +package io.entgra.device.mgt.core.transport.mgt.email.sender.core.service; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.*; +import io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal.EmailSenderDataHolder; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.impl.llom.util.AXIOMUtil; import org.apache.axis2.AxisFault; @@ -30,8 +32,6 @@ import org.apache.axis2.context.MessageContext; import org.apache.axis2.transport.mail.MailConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.email.sender.core.*; -import org.wso2.carbon.email.sender.core.internal.EmailSenderDataHolder; import org.wso2.carbon.utils.ConfigurationContextService; import javax.xml.stream.XMLStreamException; diff --git a/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/test/resources/log4j.properties similarity index 100% rename from components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/log4j.properties rename to components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/test/resources/log4j.properties diff --git a/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/test/resources/testng.xml similarity index 100% rename from components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/src/test/resources/testng.xml rename to components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/src/test/resources/testng.xml diff --git a/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/velocity.log b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/velocity.log similarity index 100% rename from components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/velocity.log rename to components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/velocity.log diff --git a/components/transport-mgt/email-sender/pom.xml b/components/transport-mgt/email-sender/pom.xml index ec0ee86edc..0cad77b1c5 100644 --- a/components/transport-mgt/email-sender/pom.xml +++ b/components/transport-mgt/email-sender/pom.xml @@ -33,7 +33,7 @@ http://wso2.org - org.wso2.carbon.email.sender.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml similarity index 95% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml index 26bedc75d9..d1fc5eb639 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.transport.mgt.sms.handler.api + io.entgra.device.mgt.core.transport.mgt.sms.handler.api war Entgra - SMS Handler API Entgra - SMS Handler API @@ -145,12 +145,12 @@ io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.core + io.entgra.device.mgt.core.transport.mgt.sms.handler.core provided io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.common + io.entgra.device.mgt.core.transport.mgt.sms.handler.common provided diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/ConfigurationManagementService.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java similarity index 97% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/ConfigurationManagementService.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java index 18d295b53a..bdf2f53ebf 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/ConfigurationManagementService.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.api.service; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.api; -import io.entgra.transport.mgt.sms.handler.common.SMSHandlerConstants; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.SMSHandlerConstants; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/ApiOriginFilter.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/ApiOriginFilter.java similarity index 95% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/ApiOriginFilter.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/ApiOriginFilter.java index 867636638b..905deefcf6 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/ApiOriginFilter.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/ApiOriginFilter.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.api.service.addons; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/GsonMessageBodyHandler.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java similarity index 97% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/GsonMessageBodyHandler.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java index 9917fc119b..929799870c 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/GsonMessageBodyHandler.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.api.service.addons; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/impl/ConfigurationManagementServiceImpl.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/impl/ConfigurationManagementServiceImpl.java similarity index 87% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/impl/ConfigurationManagementServiceImpl.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/impl/ConfigurationManagementServiceImpl.java index f849161df7..14ffc2058f 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/impl/ConfigurationManagementServiceImpl.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/impl/ConfigurationManagementServiceImpl.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.api.service.impl; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.api.impl; -import io.entgra.transport.mgt.sms.handler.api.service.ConfigurationManagementService; -import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.api.ConfigurationManagementService; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 89% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 8c3cefe9e4..d7df70ab9c 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -49,7 +49,7 @@ - - + + diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml similarity index 96% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml index e2e3f78aac..41c9521f8e 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml @@ -77,7 +77,7 @@ ApiOriginFilter - io.entgra.transport.mgt.sms.handler.api.service.addons.ApiOriginFilter + io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons.ApiOriginFilter diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml similarity index 95% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml index 99419a84d1..890c968ec0 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.transport.mgt.sms.handler.common + io.entgra.device.mgt.core.transport.mgt.sms.handler.common bundle Entgra - SMS Handler Common Entgra - SMS Handler Common @@ -46,7 +46,7 @@ ${carbon.device.mgt.version} SMS Management Common Bundle - io.entgra.transport.mgt.sms.handler.common.* + io.entgra.device.mgt.core.transport.mgt.sms.handler.common.* io.swagger.annotations; version="${swagger.annotations.version}"; resolution:=optional, diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/SMSHandlerConstants.java similarity index 76% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/SMSHandlerConstants.java index c5b5e62066..9650392c1d 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/SMSHandlerConstants.java @@ -1,4 +1,4 @@ -package io.entgra.transport.mgt.sms.handler.common; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common; /** * This class holds SMS Management Constants diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/bean/SMSMessage.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/bean/SMSMessage.java similarity index 95% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/bean/SMSMessage.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/bean/SMSMessage.java index f7e33116bb..2470fb09e4 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/bean/SMSMessage.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/bean/SMSMessage.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.common.bean; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.bean; import io.swagger.annotations.ApiModelProperty; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/Property.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/Property.java similarity index 94% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/Property.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/Property.java index f5a3195ae1..8a409f1020 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/Property.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/Property.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.common.config; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSConfiguration.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/SMSConfiguration.java similarity index 96% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSConfiguration.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/SMSConfiguration.java index ffc6952db6..a12831973f 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSConfiguration.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/SMSConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.common.config; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSGateway.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/SMSGateway.java similarity index 96% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSGateway.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/SMSGateway.java index a1e031328b..e533d10077 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSGateway.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/config/SMSGateway.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.common.config; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/exception/SMSSenderException.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/exception/SMSSenderException.java similarity index 94% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/exception/SMSSenderException.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/exception/SMSSenderException.java index 06a3b4cde4..809083087c 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/exception/SMSSenderException.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/exception/SMSSenderException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.common.exception; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.exception; /** * Exception that will be thrown during SMS Sender Management diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/spi/SMSSender.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/spi/SMSSender.java similarity index 83% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/spi/SMSSender.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/spi/SMSSender.java index 25fa4210fe..470ca719da 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/spi/SMSSender.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/common/spi/SMSSender.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.common.spi; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.spi; -import io.entgra.transport.mgt.sms.handler.common.bean.SMSMessage; -import io.entgra.transport.mgt.sms.handler.common.exception.SMSSenderException; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.bean.SMSMessage; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.exception.SMSSenderException; /** * Manages the sending of SMS. diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml similarity index 89% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml index 1ab778c991..5cd2500ee8 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.transport.mgt.sms.handler.core + io.entgra.device.mgt.core.transport.mgt.sms.handler.core bundle Entgra - SMS Handler Core Entgra - SMS Handler Core @@ -75,9 +75,9 @@ ${project.artifactId} ${carbon.device.mgt.version} SMS Management Core Bundle - io.entgra.transport.mgt.sms.handler.core.internal + io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal - io.entgra.transport.mgt.sms.handler.common.*, + io.entgra.device.mgt.core.transport.mgt.sms.handler.common.*, javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional, javax.xml.bind.annotation, javax.xml.bind, @@ -87,8 +87,8 @@ org.wso2.carbon.device.mgt.core.* - !io.entgra.transport.mgt.sms.handler.core.internal, - io.entgra.transport.mgt.sms.handler.core.* + !io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal, + io.entgra.device.mgt.core.transport.mgt.sms.handler.core.* * @@ -110,7 +110,7 @@ io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.common + io.entgra.device.mgt.core.transport.mgt.sms.handler.common provided diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/SMSSenderFactory.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/SMSSenderFactory.java similarity index 89% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/SMSSenderFactory.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/SMSSenderFactory.java index 27e7bc6802..4f638e4fe0 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/SMSSenderFactory.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/SMSSenderFactory.java @@ -16,11 +16,11 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.core; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.core; -import io.entgra.transport.mgt.sms.handler.common.config.SMSGateway; -import io.entgra.transport.mgt.sms.handler.common.spi.SMSSender; -import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config.SMSGateway; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.spi.SMSSender; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java similarity index 93% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java index aa1d64dde8..ac897b9719 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.core.config; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config; -import io.entgra.transport.mgt.sms.handler.common.SMSHandlerConstants; -import io.entgra.transport.mgt.sms.handler.common.config.SMSConfiguration; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.SMSHandlerConstants; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config.SMSConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java similarity index 78% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java index a585433b95..0c55a7332a 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.core.impl; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.core.impl; -import io.entgra.transport.mgt.sms.handler.common.bean.SMSMessage; -import io.entgra.transport.mgt.sms.handler.common.config.SMSGateway; -import io.entgra.transport.mgt.sms.handler.common.exception.SMSSenderException; -import io.entgra.transport.mgt.sms.handler.common.spi.SMSSender; -import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.bean.SMSMessage; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config.SMSGateway; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.exception.SMSSenderException; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.spi.SMSSender; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java similarity index 85% rename from components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java rename to components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java index abaafee2b5..67b8c50b5b 100644 --- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java @@ -16,16 +16,16 @@ * under the License. */ -package io.entgra.transport.mgt.sms.handler.core.internal; +package io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal; -import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager; +import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; /** * @scr.component - * name="io.entgra.transport.mgt.sms.handler.core.internal.SMSHandlerServiceComponent" immediate="true" + * name="io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal.SMSHandlerServiceComponent" immediate="true" */ public class SMSHandlerServiceComponent { diff --git a/components/transport-mgt/sms-handler/pom.xml b/components/transport-mgt/sms-handler/pom.xml index 39404588d2..fa6aac4379 100644 --- a/components/transport-mgt/sms-handler/pom.xml +++ b/components/transport-mgt/sms-handler/pom.xml @@ -34,9 +34,9 @@ - io.entgra.transport.mgt.sms.handler.core - io.entgra.transport.mgt.sms.handler.common - io.entgra.transport.mgt.sms.handler.api + io.entgra.device.mgt.core.transport.mgt.sms.handler.core + io.entgra.device.mgt.core.transport.mgt.sms.handler.common + io.entgra.device.mgt.core.transport.mgt.sms.handler.api diff --git a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml index f36f5205ea..35d8a9c1d9 100644 --- a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml +++ b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml @@ -37,7 +37,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.email.sender.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core org.wso2.orbit.org.apache.velocity @@ -95,7 +95,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.email.sender.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.email.sender.core:${carbon.device.mgt.version} org.wso2.orbit.org.apache.velocity:velocity:${velocity.version} diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml index 5912af2341..28b232c450 100644 --- a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml @@ -49,7 +49,7 @@ io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.api + io.entgra.device.mgt.core.transport.mgt.sms.handler.api ${project.version} war true diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml index c34e0867ee..76e9eb5ca7 100644 --- a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml @@ -37,11 +37,11 @@ io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.core + io.entgra.device.mgt.core.transport.mgt.sms.handler.core io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.common + io.entgra.device.mgt.core.transport.mgt.sms.handler.common @@ -94,10 +94,10 @@ - io.entgra.device.mgt.core:io.entgra.transport.mgt.sms.handler.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.core:${carbon.device.mgt.version} - io.entgra.device.mgt.core:io.entgra.transport.mgt.sms.handler.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.common:${carbon.device.mgt.version} diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml index d225f912ec..0f9f4eaf2a 100644 --- a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml @@ -22,7 +22,7 @@ - + sample diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 index 0ffc635427..53fc4cb9e6 100644 --- a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 @@ -22,7 +22,7 @@ - + sample diff --git a/pom.xml b/pom.xml index 82bbb5fa38..ed3bb2dd86 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ - + components/transport-mgt components/analytics-mgt components/webapp-authenticator-framework @@ -60,7 +60,7 @@ - + features/transport-mgt features/analytics-mgt features/webapp-authenticator-framework @@ -264,7 +264,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.email.sender.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core ${carbon.device.mgt.version} @@ -312,12 +312,12 @@ io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.core + io.entgra.device.mgt.core.transport.mgt.sms.handler.core ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.transport.mgt.sms.handler.common + io.entgra.device.mgt.core.transport.mgt.sms.handler.common ${carbon.device.mgt.version}