From 75309b8d962ad80721bd1acc73e94122b30ebd62 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Thu, 11 May 2023 12:14:29 +0530 Subject: [PATCH] refactored device-mgt extension component --- .../repository/conf/cdm-config.xml | 8 +++---- .../repository/conf/cdm-config.xml | 8 +++---- .../pom.xml | 8 +++---- .../manager/DefaultRolesConfigManager.java | 6 ++--- .../manager/IoTSStartupHandler.java | 8 +++---- .../manager/bean/DefaultRolesConfig.java | 2 +- .../defaultrole/manager/bean/Role.java | 2 +- .../DefaultRoleManagerException.java | 2 +- .../internal/RoleManagerDataHolder.java | 4 ++-- .../internal/RoleManagerServiceComponent.java | 6 ++--- .../defaultrole/manager}/BaseTest.java | 2 +- .../manager}/DefaultRoleReadingTest.java | 7 +++--- .../resources/carbon-home/dbscripts/h2.sql | 0 .../repository/conf/axis2/axis2.xml | 0 .../repository/conf/axis2/axis2_client.xml | 0 .../repository/conf/axis2/tenant-axis2.xml | 0 .../carbon-home/repository/conf/carbon.xml | 0 .../repository/conf/cdm-config.xml | 8 +++---- .../conf/datasources/data-source-config.xml | 0 .../repository/conf/default-roles-config.xml | 0 .../conf/etc/bundle-config/README.txt | 0 .../carboncontext-osgi-services.properties | 0 .../repository/conf/etc/config-validation.xml | 0 .../carbon-home/repository/conf/etc/jmx.xml | 0 .../repository/conf/etc/launch.ini | 0 .../conf/etc/logging-bridge.properties | 0 .../repository/conf/etc/mime.mappings | 0 .../repository/conf/etc/mime.types | 0 .../repository/conf/etc/osgi-debug.options | 0 .../repository/conf/etc/tasks-config.xml | 0 .../repository/conf/log4j.properties | 0 .../carbon-home/repository/conf/registry.xml | 0 .../conf/security/authenticators.xml | 0 .../conf/tomcat/carbon/META-INF/context.xml | 0 .../conf/tomcat/carbon/WEB-INF/web.xml | 0 .../conf/tomcat/catalina-server.xml | 0 .../repository/conf/tomcat/tomcat-users.xml | 0 .../repository/conf/tomcat/web.xml | 0 .../carbon-home/repository/conf/user-mgt.xml | 0 .../src/test/resources/testng.xml | 2 +- .../pom.xml | 6 ++--- .../type/deployer/DeviceTypeCAppDeployer.java | 4 ++-- .../deployer/DeviceTypePluginDeployer.java | 6 ++--- .../DeviceTypeManagementDataHolder.java | 2 +- .../DeviceTypeManagementServiceComponent.java | 3 +-- .../deployer/util/DeviceTypeConfigUtil.java | 2 +- .../util/DeviceTypePluginConstants.java | 2 +- .../src/main/resources/META-INF/component.xml | 4 ++-- .../deployer/DeviceTypeCAppDeployerTest.java | 5 ++-- .../DeviceTypePluginDeployerTest.java | 3 ++- .../src/test/resources/android.xml | 0 .../src/test/resources/invalidAndroid.xml | 0 .../src/test/resources/log4j.properties | 0 .../test/resources/repository/conf/carbon.xml | 0 .../src/test/resources/testng.xml | 4 ++-- .../pom.xml | 6 ++--- .../mgt/extensions/logger/LogContext.java | 2 +- .../extensions/logger/spi/EntgraLogger.java | 4 ++-- .../pom.xml | 6 ++--- .../PullNotificationSubscriberImpl.java | 4 ++-- .../internal/PullNotificationDataHolder.java | 2 +- .../PullNotificationServiceComponent.java | 4 ++-- .../pom.xml | 6 ++--- .../fcm/FCMBasedPushNotificationProvider.java | 2 +- .../provider/fcm/FCMNotificationStrategy.java | 4 ++-- .../provider/fcm/internal/FCMDataHolder.java | 2 +- .../FCMPushNotificationServiceComponent.java | 4 ++-- .../pom.xml | 6 ++--- .../HTTPBasedPushNotificationProvider.java | 2 +- .../provider/http/HTTPMessageExecutor.java | 2 +- .../http/HTTPNotificationStrategy.java | 2 +- .../HTTPPushNotificationServiceComponent.java | 4 ++-- .../pom.xml | 6 ++--- .../MQTTBasedPushNotificationProvider.java | 2 +- .../mqtt/MQTTNotificationStrategy.java | 6 ++--- .../mqtt/internal/MQTTDataHolder.java | 5 +--- .../MQTTPushNotificationServiceComponent.java | 4 ++-- .../internal/util/MQTTAdapterConstants.java | 2 +- .../mqtt/CarbonContextInitializationUtil.java | 2 +- ...MQTTBasedPushNotificationProviderTest.java | 8 +++---- .../mqtt/MQTTNotificationStrategyTest.java | 8 +++---- .../src/test/resources/conf/carbon.xml | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/testng.xml | 4 ++-- .../pom.xml | 6 ++--- .../XMPPBasedPushNotificationProvider.java | 2 +- .../xmpp/XMPPNotificationStrategy.java | 6 ++--- .../xmpp/internal/XMPPDataHolder.java | 2 +- .../XMPPPushNotificationServiceComponent.java | 4 ++-- .../internal/util/XMPPAdapterConstants.java | 2 +- .../pom.xml | 4 ++-- .../stateengine/dto/StateUpdateResult.java | 2 +- .../exception/StateValidationException.java | 2 +- .../stateengine/spi/DeviceStateMachine.java | 6 ++--- .../stateengine/util/StateEngineUtil.java | 2 +- components/device-mgt-extensions/pom.xml | 18 +++++++------- .../org.wso2.carbon.device.mgt.core/pom.xml | 6 ++++- .../NotificationManagementServiceImpl.java | 2 +- .../repository/conf/cdm-config.xml | 8 +++---- .../resources/config/operation/cdm-config.xml | 8 +++---- .../pom.xml | 6 ++--- .../HTTPDeviceTypeManagerService.java | 2 +- .../test/resources/device-types/android.xml | 2 +- .../test/resources/device-types/sample.xml | 2 +- .../repository/conf/cdm-config.xml | 8 +++---- .../io.entgra.notification.logger/pom.xml | 4 ++-- .../notification/logger/DeviceLogContext.java | 2 +- .../notification/logger/UserLogContext.java | 2 +- .../logger/impl/EntgraDeviceLoggerImpl.java | 4 ++-- .../logger/impl/EntgraUserLoggerImpl.java | 4 ++-- .../repository/conf/cdm-config.xml | 8 +++---- .../repository/conf/cdm-config.xml | 8 +++---- .../repository/conf/cdm-config.xml | 8 +++---- components/test-coverage/pom.xml | 24 +++++++++---------- .../pom.xml | 2 +- .../ui/request/interceptor/UserHandler.java | 2 +- .../repository/conf/cdm-config.xml | 8 +++---- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../src/main/resources/conf/cdm-config.xml | 8 +++---- .../repository/conf/cdm-config.xml.j2 | 8 +++---- .../pom.xml | 4 ++-- .../pom.xml | 2 +- pom.xml | 22 ++++++++--------- 130 files changed, 238 insertions(+), 237 deletions(-) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/pom.xml (95%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java (91%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java (91%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java (94%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/bean/Role.java (95%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java (91%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java (94%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java (93%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager}/BaseTest.java (96%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager}/DefaultRoleReadingTest.java (83%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/dbscripts/h2.sql (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (93%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/default-roles-config.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/jmx.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/launch.ini (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/mime.mappings (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/mime.types (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/registry.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/security/authenticators.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/tomcat/web.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/carbon-home/repository/conf/user-mgt.xml (100%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.defaultrole.manager => io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager}/src/test/resources/testng.xml (89%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/pom.xml (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java (97%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java (95%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java (95%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/src/main/resources/META-INF/component.xml (80%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java (95%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core}/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java (97%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/src/test/resources/android.xml (100%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/src/test/resources/invalidAndroid.xml (100%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/src/test/resources/log4j.properties (100%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/src/test/resources/repository/conf/carbon.xml (100%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.device.type.deployer => io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer}/src/test/resources/testng.xml (79%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.logger => io.entgra.device.mgt.core.device.mgt.extensions.logger}/pom.xml (91%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/logger/LogContext.java (92%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/logger/spi/EntgraLogger.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.pull.notification => io.entgra.device.mgt.core.device.mgt.extensions.pull.notification}/pom.xml (94%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java (94%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm}/pom.xml (95%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java (90%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.http => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http}/pom.xml (95%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java (97%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java (97%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java (86%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt}/pom.xml (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java (92%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java (94%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java (91%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java (96%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt}/src/test/resources/conf/carbon.xml (100%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt}/src/test/resources/log4j.properties (100%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt}/src/test/resources/testng.xml (77%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp}/pom.xml (95%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java (93%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java (94%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java (94%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java (92%) rename components/device-mgt-extensions/{org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java (93%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.stateengine => io.entgra.device.mgt.core.device.mgt.extensions.stateengine}/pom.xml (97%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/stateengine/dto/StateUpdateResult.java (96%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/stateengine/exception/StateValidationException.java (95%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java (83%) rename components/device-mgt-extensions/{io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra => io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core}/device/mgt/extensions/stateengine/util/StateEngineUtil.java (97%) diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 71ed3d5e82..f913dc8333 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml index baa1fad1b2..857f8e5573 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml similarity index 95% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml index d432a7c16d..393f3c5407 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.entgra.device.mgt.extensions.defaultrole.manager + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager bundle Entgra IoT - Default User Roles Management Module Entgra IoT - Default User Roles Management Module Implementation @@ -59,7 +59,7 @@ ${project.artifactId} ${carbon.device.mgt.version} IoT - User Roles Management Bundle - io.entgra.device.mgt.extensions.defaultrole.manager.internal + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -79,8 +79,8 @@ org.wso2.carbon.user.mgt.common - !io.entgra.device.mgt.extensions.defaultrole.manager.internal, - io.entgra.device.mgt.extensions.defaultrole.manager.*;version="${project.version}" + !io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal, + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.*;version="${project.version}" diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java similarity index 91% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java index c6f3640d33..d5164ed0ea 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java @@ -17,10 +17,10 @@ * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager; -import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; -import io.entgra.device.mgt.extensions.defaultrole.manager.exception.DefaultRoleManagerException; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.exception.DefaultRoleManagerException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java similarity index 91% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java index 84f5a75dec..236ad99d26 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager; -import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; -import io.entgra.device.mgt.extensions.defaultrole.manager.bean.Role; -import io.entgra.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.Role; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.CarbonConstants; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java similarity index 94% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java index 5f97c1226b..15b0b30305 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.bean; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/Role.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/Role.java similarity index 95% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/Role.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/Role.java index ced6c5a5fd..5d4bac0abd 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/Role.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/Role.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.bean; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java similarity index 91% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java index ec3d33936d..9dd4b4361d 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.exception; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.exception; public class DefaultRoleManagerException extends Exception { diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java similarity index 94% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java index 84aa08ba4c..076902739a 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal; -import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.user.api.UserRealm; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java similarity index 93% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java index 08ff1d6f9b..3ac6aa7137 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java @@ -17,15 +17,15 @@ * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal; -import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.core.ServerStartupObserver; -import io.entgra.device.mgt.extensions.defaultrole.manager.IoTSStartupHandler; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.IoTSStartupHandler; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.utils.ConfigurationContextService; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/BaseTest.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/BaseTest.java similarity index 96% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/BaseTest.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/BaseTest.java index 9dd5881b38..7ace713e88 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/BaseTest.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/BaseTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.test; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/DefaultRoleReadingTest.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRoleReadingTest.java similarity index 83% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/DefaultRoleReadingTest.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRoleReadingTest.java index c297dd7fe6..c030821785 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/DefaultRoleReadingTest.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRoleReadingTest.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.device.mgt.extensions.defaultrole.manager.test; +package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager; import com.google.gson.Gson; -import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; -import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; -import io.entgra.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; +import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/dbscripts/h2.sql b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/dbscripts/h2.sql similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/dbscripts/h2.sql rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/dbscripts/h2.sql diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/carbon.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/carbon.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/carbon.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml similarity index 93% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 71e06b50a6..e02cf1e8bf 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -33,16 +33,16 @@ true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/default-roles-config.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/default-roles-config.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/default-roles-config.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/default-roles-config.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/jmx.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/jmx.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/jmx.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/launch.ini similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/launch.ini rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/launch.ini diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.mappings similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.mappings rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.mappings diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.types similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.types rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.types diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/log4j.properties similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/log4j.properties rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/log4j.properties diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/registry.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/registry.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/registry.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/registry.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/security/authenticators.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/security/authenticators.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/security/authenticators.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/web.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/web.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/web.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/user-mgt.xml similarity index 100% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/user-mgt.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml similarity index 89% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml index 47820d719f..c186a2418e 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml @@ -24,7 +24,7 @@ - + diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml index 252368ce0e..3af4711c73 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.device.type.deployer + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer bundle WSO2 Carbon - Device Type Deployer WSO2 Carbon - Device Type Deployer Implementation @@ -126,8 +126,8 @@ ${carbon.device.mgt.version} Device Type Deployer Bundle - !org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal, - org.wso2.carbon.device.mgt.extensions.device.type.deployer.* + !io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal, + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.* javax.naming, diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java similarity index 97% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java index 2880177a9e..4ba19f7ba7 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer; import org.apache.axis2.deployment.Deployer; import org.apache.axis2.deployment.DeploymentException; @@ -30,7 +30,7 @@ import org.wso2.carbon.application.deployer.CarbonApplication; import org.wso2.carbon.application.deployer.config.Artifact; import org.wso2.carbon.application.deployer.config.CappFile; import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; +import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; import java.io.File; import java.util.ArrayList; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java similarity index 95% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java index 82d039f53e..d7698ab796 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.deployment.AbstractDeployer; @@ -29,8 +29,8 @@ import org.osgi.framework.ServiceRegistration; import org.w3c.dom.Document; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypeConfigUtil; +import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypeConfigUtil; import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeConfigIdentifier; import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerService; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceTypeConfiguration; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java index 55142d18b4..f4d3d18f35 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal; import org.osgi.framework.BundleContext; import org.wso2.carbon.registry.core.service.RegistryService; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java index 88761df2e1..176a8f0615 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java @@ -16,13 +16,12 @@ * under the License. */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer; import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.utils.ConfigurationContextService; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java similarity index 95% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java index 7240c38f23..a26081d8b8 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util; import org.w3c.dom.Document; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.exception.DeviceTypeConfigurationException; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java index 8b8ad98cf2..4d07ee3c02 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util; /** * This holds the constants used for this bundle. diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml similarity index 80% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml index 7cdcead989..10c86df544 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml @@ -17,11 +17,11 @@ devicetypes xml - org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer - + diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java similarity index 95% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java index 0aa0e28839..7dcc4c8510 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java @@ -16,8 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer; +import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer; import org.apache.axis2.deployment.DeploymentException; import org.apache.axis2.engine.AxisConfiguration; import org.mockito.Mockito; @@ -28,7 +29,7 @@ import org.wso2.carbon.application.deployer.config.ApplicationConfiguration; import org.wso2.carbon.application.deployer.config.Artifact; import org.wso2.carbon.application.deployer.config.CappFile; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; +import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; import org.wso2.carbon.registry.core.exceptions.RegistryException; import java.io.File; import java.io.IOException; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java similarity index 97% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java index 597575ea31..f7498b9522 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java @@ -16,8 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.extensions.device.type.deployer; +package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer; +import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer; import org.apache.axis2.deployment.DeploymentException; import org.apache.axis2.deployment.repository.util.DeploymentFileData; import org.junit.Assert; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml similarity index 100% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml similarity index 100% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties similarity index 100% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml similarity index 100% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml similarity index 79% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml index 5d4a11b9b9..dcfe541d45 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml @@ -22,8 +22,8 @@ - - + + diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml similarity index 91% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml index 8126ffb693..b7d211c38a 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger bundle Entgra IoT - Logger Impl Entgra IoT - Entgra Logger Implementation @@ -50,11 +50,11 @@ ${carbon.device.mgt.version} Entgra Logger Bundle - io.entgra.device.mgt.extensions.logger, + io.entgra.device.mgt.core.device.mgt.extensions.logger, org.apache.commons.logging - io.entgra.device.mgt.extensions.logger.* + io.entgra.device.mgt.core.device.mgt.extensions.logger.* diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/LogContext.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/LogContext.java similarity index 92% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/LogContext.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/LogContext.java index 6c88396b9f..c2ff57ab10 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/LogContext.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/LogContext.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.logger; +package io.entgra.device.mgt.core.device.mgt.extensions.logger; public class LogContext { } diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/spi/EntgraLogger.java similarity index 93% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/spi/EntgraLogger.java index 2ffa6ffa8d..6701c02f56 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/spi/EntgraLogger.java @@ -17,9 +17,9 @@ * under the License. */ -package io.entgra.device.mgt.extensions.logger.spi; +package io.entgra.device.mgt.core.device.mgt.extensions.logger.spi; -import io.entgra.device.mgt.extensions.logger.LogContext; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; import org.apache.commons.logging.Log; public interface EntgraLogger extends Log { diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml similarity index 94% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml index b1b6d356fc..cc8425b696 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.pull.notification + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification bundle WSO2 Carbon - Pull Notification Provider Implementation WSO2 Carbon - Pull Notification Provider Implementation @@ -78,8 +78,8 @@ ${carbon.device.mgt.version} Pull Notification Provider Bundle - !org.wso2.carbon.device.mgt.extensions.pull.notification.internal, - org.wso2.carbon.device.mgt.extensions.pull.notification.* + !io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal, + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.* org.osgi.framework.*;version="${imp.package.version.osgi.framework}", diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java index c05c290931..895879f8cd 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.pull.notification; +package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -33,7 +33,7 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature; import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; -import org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal.PullNotificationDataHolder; import java.util.ArrayList; import java.util.List; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java index a73bb2e3f3..f14c77247c 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.pull.notification.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal; import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java similarity index 94% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java index bc0363a0d7..41b22aa51f 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.pull.notification.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,7 +26,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService; /** - * @scr.component name="org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true" * @scr.reference name="carbon.device.mgt.provider" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * cardinality="1..1" diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml similarity index 95% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml index 110ad2b3ac..a4a928e25d 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm bundle WSO2 Carbon - FCM Based Push Notification Provider Implementation WSO2 Carbon - FCM Based Push Notification Provider Implementation @@ -130,8 +130,8 @@ ${carbon.device.mgt.version} FCM Based Push Notification Provider Bundle - !org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal, - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.* + !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal, + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.* com.google.gson, diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java index 30affceb27..d38743f870 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java index 5c80aa62f9..4e5d294905 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -29,7 +29,7 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder; import java.io.IOException; import java.io.OutputStream; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java index 64569d7fb6..968ef4afe0 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java similarity index 90% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java index 8993e6928a..757e8dd458 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.osgi.service.component.ComponentContext; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; /** - * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true" * @scr.reference name="carbon.device.mgt.provider" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * cardinality="1..1" diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml similarity index 95% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml index 9b0be2d7d9..3bb86f027e 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http bundle WSO2 Carbon - HTTP Based Push Notification Provider Implementation WSO2 Carbon - HTTP Based Push Notification Provider Implementation @@ -121,8 +121,8 @@ ${carbon.device.mgt.version} MQTT Based Push Notification Provider Bundle - !org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal, - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.* + !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal, + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.* org.apache.commons.logging, diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java index 5f083400b1..e41e209812 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java similarity index 97% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java index 5c8ab798d1..e48a587694 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java @@ -1,4 +1,4 @@ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http; import com.google.gson.Gson; import org.apache.commons.httpclient.HostConfiguration; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java similarity index 97% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java index fe8126d2a9..f37ddef749 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http; import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HttpClient; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java similarity index 86% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java index b16e1728d9..709680378c 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java @@ -16,14 +16,14 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; /** - * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal.HTTPPushNotificationServiceComponent" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal.HTTPPushNotificationServiceComponent" immediate="true" */ public class HTTPPushNotificationServiceComponent { diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml index d88641d5f8..3473d8dcf4 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt bundle WSO2 Carbon - MQTT Based Push Notification Provider Implementation WSO2 Carbon - MQTT Based Push Notification Provider Implementation @@ -143,8 +143,8 @@ ${carbon.device.mgt.version} MQTT Based Push Notification Provider Bundle - !org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal, - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.* + !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal, + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.* org.apache.commons.logging, diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java index c4f645b255..c5ec43dd42 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java index cb83c0fa1c..180b4360ca 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,8 +28,8 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; import org.wso2.carbon.event.output.adapter.core.MessageType; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java index d381f0042b..55196d7558 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java @@ -16,15 +16,12 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; -import java.util.List; -import java.util.Stack; - public class MQTTDataHolder { private OutputEventAdapterService outputEventAdapterService; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java similarity index 92% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java index 8f0ca3dad6..d715076f04 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; /** - * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTPushNotificationServiceComponent" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTPushNotificationServiceComponent" immediate="true" * @scr.reference name="carbon.device.mgt.provider" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * cardinality="1..1" diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java index 9dfaf1c87b..665bcb2814 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util; public final class MQTTAdapterConstants { diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java similarity index 94% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java index 8ddf3dea62..63d6ce10a9 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt; import org.wso2.carbon.context.PrivilegedCarbonContext; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java similarity index 91% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java index c655a19067..6e61580ff6 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt; import org.mockito.Mockito; import org.testng.Assert; @@ -25,12 +25,12 @@ import org.testng.annotations.Test; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService; import org.wso2.carbon.registry.core.exceptions.RegistryException; -import java.io.File; + import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java similarity index 96% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java index f005eac4a3..6fa15715b7 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt; import org.mockito.Mockito; import org.testng.Assert; @@ -29,14 +29,14 @@ import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfi import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import static org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation.POLICY_OPERATION_CODE; -import java.io.File; + import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml similarity index 100% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/log4j.properties b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/log4j.properties similarity index 100% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/log4j.properties rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/log4j.properties diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml similarity index 77% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml index d76f7ab144..e6303269e5 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml @@ -22,8 +22,8 @@ - - + + diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml similarity index 95% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml index a99ed77671..2a38855fcf 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp bundle WSO2 Carbon - XMPP Based Push Notification Provider Implementation WSO2 Carbon - XMPP Based Push Notification Provider Implementation @@ -130,8 +130,8 @@ ${carbon.device.mgt.version} XMPP Based Push Notification Provider Bundle - !org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal, - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.* + !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal, + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.* org.apache.commons.logging, diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java index 29d75ed991..c11c0abf9b 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java similarity index 94% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java index 6b5d0fa474..68b5b3f3c9 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,8 +25,8 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.XMPPDataHolder; -import org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.util.XMPPAdapterConstants; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.XMPPDataHolder; +import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.util.XMPPAdapterConstants; import org.wso2.carbon.event.output.adapter.core.MessageType; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java similarity index 94% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java index a961a621bf..f575f64957 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java similarity index 92% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java index 71dada3b66..cbb56e1fc7 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; /** - * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true" * @scr.reference name="carbon.device.mgt.provider" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * cardinality="1..1" diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java index 8c4cf7740b..d8b36501ed 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.util; +package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.util; public final class XMPPAdapterConstants { diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml similarity index 97% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/pom.xml rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml index baab402026..66478c0e3f 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.entgra.device.mgt.extensions.stateengine + io.entgra.device.mgt.core.device.mgt.extensions.stateengine bundle Entgra IoT - State Engine Entgra IoT - State Engine Components @@ -64,7 +64,7 @@ org.wso2.carbon.device.mgt.common.* - io.entgra.device.mgt.extensions.stateengine.*, + io.entgra.device.mgt.core.device.mgt.extensions.stateengine.*, org.wso2.carbon.logging diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/dto/StateUpdateResult.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/dto/StateUpdateResult.java similarity index 96% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/dto/StateUpdateResult.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/dto/StateUpdateResult.java index a3166cda64..010428c5af 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/dto/StateUpdateResult.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/dto/StateUpdateResult.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.stateengine.dto; +package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.dto; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/exception/StateValidationException.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/exception/StateValidationException.java similarity index 95% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/exception/StateValidationException.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/exception/StateValidationException.java index fc5ae05e86..82fd3f9ee8 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/exception/StateValidationException.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/exception/StateValidationException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.stateengine.exception; +package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.exception; public class StateValidationException extends Exception { diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java similarity index 83% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java index 28a62504aa..166397ae60 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java @@ -17,10 +17,10 @@ * under the License. */ -package io.entgra.device.mgt.extensions.stateengine.spi; +package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.spi; -import io.entgra.device.mgt.extensions.stateengine.dto.StateUpdateResult; -import io.entgra.device.mgt.extensions.stateengine.exception.StateValidationException; +import io.entgra.device.mgt.core.device.mgt.extensions.stateengine.dto.StateUpdateResult; +import io.entgra.device.mgt.core.device.mgt.extensions.stateengine.exception.StateValidationException; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/util/StateEngineUtil.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/util/StateEngineUtil.java similarity index 97% rename from components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/util/StateEngineUtil.java rename to components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/util/StateEngineUtil.java index 012b90d7b0..e2f0a874f9 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/util/StateEngineUtil.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/util/StateEngineUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package io.entgra.device.mgt.extensions.stateengine.util; +package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/device-mgt-extensions/pom.xml b/components/device-mgt-extensions/pom.xml index f3ffa72d03..6bfd0b58f1 100644 --- a/components/device-mgt-extensions/pom.xml +++ b/components/device-mgt-extensions/pom.xml @@ -34,15 +34,15 @@ http://wso2.org - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp - org.wso2.carbon.device.mgt.extensions.device.type.deployer - org.wso2.carbon.device.mgt.extensions.pull.notification - io.entgra.device.mgt.extensions.logger - io.entgra.device.mgt.extensions.defaultrole.manager - io.entgra.device.mgt.extensions.stateengine + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification + io.entgra.device.mgt.core.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager + io.entgra.device.mgt.core.device.mgt.extensions.stateengine 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 548d395125..93b8619161 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 @@ -114,7 +114,7 @@ org.wso2.carbon.identity.jwt.client.extension.service, org.apache.commons.codec.binary, io.entgra.server.bootup.heartbeat.beacon, - io.entgra.device.mgt.extensions.logger.*, + io.entgra.device.mgt.core.device.mgt.extensions.logger.*, io.entgra.notification.logger.* @@ -354,6 +354,10 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.task.mgt.common + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.extensions.logger + io.entgra.device.mgt.core io.entgra.notification.logger diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java index 4770f9fee4..f1c9ae2ca3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java @@ -18,7 +18,7 @@ package org.wso2.carbon.device.mgt.core.notification.mgt; -import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger; import io.entgra.notification.logger.DeviceLogContext; import io.entgra.notification.logger.impl.EntgraDeviceLoggerImpl; import org.wso2.carbon.device.mgt.common.Device; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 675a58e80d..5c7bcd19f5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml index 88b809a476..8b0c82ae17 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml @@ -31,10 +31,10 @@ 2000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml index ec04499745..4d1d931367 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml @@ -78,7 +78,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.pull.notification + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification test @@ -188,8 +188,8 @@ org.wso2.carbon.device.mgt.core.service, com.google.gson - org.wso2.carbon.device.mgt.extensions.pull.notification, - org.wso2.carbon.device.mgt.extensions.pull.notification.* + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification, + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.* diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java index eb72a6e410..a5f76867ac 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java @@ -46,7 +46,7 @@ import java.util.Map; public class HTTPDeviceTypeManagerService extends DeviceTypeManagerService implements DeviceTypeDefinitionProvider { private DeviceTypeMetaDefinition deviceTypeMetaDefinition; - private static final String DEFAULT_PULL_NOTIFICATION_CLASS_NAME = "org.wso2.carbon.device.mgt.extensions.pull.notification.PullNotificationSubscriberImpl"; + private static final String DEFAULT_PULL_NOTIFICATION_CLASS_NAME = "io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.PullNotificationSubscriberImpl"; public HTTPDeviceTypeManagerService(String deviceTypeName, DeviceTypeMetaDefinition deviceTypeMetaDefinition) { super(getDeviceTypeConfigIdentifier(deviceTypeName), getDeviceTypeConfiguration( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml index bc5f7b3f3e..bbaf11dcc0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml @@ -603,7 +603,7 @@ false - + admin diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml index 2943982aeb..5690fa392a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml @@ -99,7 +99,7 @@ - + admin diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 7b57ee7414..1aaf96aa7f 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/logger/io.entgra.notification.logger/pom.xml b/components/logger/io.entgra.notification.logger/pom.xml index 2d9db8cf2d..ee48b890c5 100644 --- a/components/logger/io.entgra.notification.logger/pom.xml +++ b/components/logger/io.entgra.notification.logger/pom.xml @@ -42,7 +42,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger @@ -69,7 +69,7 @@ ${carbon.device.mgt.version} Device Notification Logger Bundle - io.entgra.device.mgt.extensions.logger.*, + io.entgra.device.mgt.core.device.mgt.extensions.logger.*, org.apache.commons.logging;version="[1.2,2)", org.apache.log4j;version="[1.2,2)", org.wso2.carbon.context;version="[4.4,5) diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java index 3becd28b9c..ae3263c8cb 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java +++ b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java @@ -18,7 +18,7 @@ package io.entgra.notification.logger; -import io.entgra.device.mgt.extensions.logger.LogContext; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; public class DeviceLogContext extends LogContext { private final String deviceName; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java index 49f8d0f189..29d1aa751a 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java +++ b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java @@ -18,7 +18,7 @@ package io.entgra.notification.logger; -import io.entgra.device.mgt.extensions.logger.LogContext; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; public class UserLogContext extends LogContext { private final String userName; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java index f1360ae6c3..f72d1fa010 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java +++ b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java @@ -18,8 +18,8 @@ package io.entgra.notification.logger.impl; -import io.entgra.device.mgt.extensions.logger.LogContext; -import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger; import io.entgra.notification.logger.DeviceLogContext; import io.entgra.notification.logger.util.MDCContextUtil; import org.apache.commons.logging.Log; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java index 92beeabb2f..94f70fd7e7 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java +++ b/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java @@ -18,8 +18,8 @@ package io.entgra.notification.logger.impl; -import io.entgra.device.mgt.extensions.logger.LogContext; -import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger; import io.entgra.notification.logger.UserLogContext; import io.entgra.notification.logger.util.MDCContextUtil; import org.apache.commons.logging.Log; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 0e53e2b7d6..e22d094712 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -33,16 +33,16 @@ true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 51780af1fb..775d49b7a4 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml index 4abba45769..322b3b0f32 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -32,16 +32,16 @@ true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml index 2d24a4859f..d37b8b1dfc 100644 --- a/components/test-coverage/pom.xml +++ b/components/test-coverage/pom.xml @@ -76,22 +76,22 @@ device-mgt-extensions - ${basedir}/../${device.extensions}/org.wso2.carbon.device.mgt.extensions.device.type.deployer + ${basedir}/../${device.extensions}/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer - ${basedir}/../${device.extensions}/org.wso2.carbon.device.mgt.extensions.pull.notification + ${basedir}/../${device.extensions}/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification - ${basedir}/../${device.extensions}/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm + ${basedir}/../${device.extensions}/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm - ${basedir}/../${device.extensions}/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http + ${basedir}/../${device.extensions}/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http - ${basedir}/../${device.extensions}/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt + ${basedir}/../${device.extensions}/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt - ${basedir}/../${device.extensions}/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp + ${basedir}/../${device.extensions}/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp @@ -325,7 +325,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -365,7 +365,7 @@ - + diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml index 81ac6e3347..01e9f42f48 100644 --- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml +++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml @@ -120,7 +120,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger provided diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java index b967ce5324..14dbe6ecfa 100644 --- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java +++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java @@ -26,7 +26,7 @@ import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData; import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil; -import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger; +import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger; import io.entgra.notification.logger.UserLogContext; import io.entgra.notification.logger.impl.EntgraUserLoggerImpl; import org.apache.http.HttpHeaders; diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml index c297d697c8..b49063083f 100644 --- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml index 3e470ec36a..a23fb2a220 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml @@ -39,7 +39,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.defaultrole.manager + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager @@ -94,7 +94,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.extensions.defaultrole.manager:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml index 85a73f88c9..8fea541cbe 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml @@ -36,7 +36,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.device.type.deployer + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer @@ -89,7 +89,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.extensions.device.type.deployer:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml index 5a819e1bfd..50341cdf7f 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml @@ -39,7 +39,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger @@ -94,7 +94,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.extensions.logger:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.logger:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml index 2e9b228a10..e4ae862603 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml @@ -36,7 +36,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm @@ -89,7 +89,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml index 99cf358d36..90f18cd5af 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml @@ -36,7 +36,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http @@ -89,7 +89,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml index 1b4e2e3a8c..8b25a51d6d 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml @@ -36,7 +36,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt @@ -89,7 +89,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml index 195650ae47..37aa7b3da2 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml @@ -36,7 +36,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp @@ -89,7 +89,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp:${carbon.device.mgt.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml index be29603cb0..725dad7ca9 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml @@ -39,7 +39,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.stateengine + io.entgra.device.mgt.core.device.mgt.extensions.stateengine @@ -95,7 +95,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.extensions.stateengine:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.stateengine:${carbon.device.mgt.version} diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml index de35cf1ba8..f0a7251756 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml @@ -31,10 +31,10 @@ 60000 true - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 index 264345c2e0..c2cc325308 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 @@ -38,10 +38,10 @@ true {% endif %} - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider {% if device_mgt_conf.push_notification_conf.push_notification_providers is defined %} {%- for push_notification_provider in device_mgt_conf.push_notification_conf.push_notification_providers -%} {{push_notification_provider}} diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml index 1ad082a505..45dafaf167 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml @@ -50,7 +50,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.pull.notification + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification org.wso2.orbit.org.apache.pdfbox @@ -118,7 +118,7 @@ io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.url.printer:${carbon.device.mgt.version} - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.extensions.pull.notification:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.pull.notification:${carbon.device.mgt.version} diff --git a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml index 8a6c45ed74..b532c1f511 100644 --- a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml +++ b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml @@ -47,7 +47,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger io.entgra.device.mgt.core diff --git a/pom.xml b/pom.xml index a1a9473d3a..9c573bf185 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ - + components/device-mgt-extensions components/apimgt-extensions components/application-mgt @@ -59,7 +59,7 @@ features/ui-request-interceptor - + features/device-mgt-extensions features/transport-mgt features/analytics-mgt features/webapp-authenticator-framework @@ -1643,47 +1643,47 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.defaultrole.manager + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.device.mgt.extensions.stateengine + io.entgra.device.mgt.core.device.mgt.extensions.stateengine ${carbon.device.mgt.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.device.type.deployer + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer ${carbon.device.mgt.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm ${carbon.device.mgt.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt ${carbon.device.mgt.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http ${carbon.device.mgt.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp ${carbon.device.mgt.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.extensions.pull.notification + io.entgra.device.mgt.core.device.mgt.extensions.pull.notification ${carbon.device.mgt.version}