From 243a74da8c99d1329018e2376f3a8ccffcdba5fc Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Thu, 11 May 2023 12:30:03 +0530 Subject: [PATCH] refactored heart beat, notification logger, identity extensions component --- .../pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 10 ++++----- .../APIManagementProviderService.java | 2 +- .../APIManagementProviderServiceImpl.java | 8 +++---- ...ApplicationManagerExtensionDataHolder.java | 2 +- .../publisher/BaseAPIPublisherTest.java | 2 +- .../pom.xml | 2 +- .../client/OAuthRequestInterceptor.java | 6 ++--- .../APIIntegrationClientDataHolder.java | 2 +- .../APIIntegrationClientServiceComponent.java | 4 ++-- .../pom.xml | 4 ++-- .../core/impl/SubscriptionManagerImpl.java | 2 +- .../application/mgt/core/util/OAuthUtils.java | 8 +++---- .../pom.xml | 2 +- ...CertificateManagementAdminServiceImpl.java | 4 ++-- .../api/util/CertificateMgtAPIUtils.java | 2 +- .../pom.xml | 2 +- .../DeviceManagementConfigServiceImpl.java | 4 ++-- .../org.wso2.carbon.device.mgt.api/pom.xml | 2 +- ...alyticsArtifactsManagementServiceImpl.java | 2 +- .../service/impl/DeviceAgentServiceImpl.java | 2 +- .../DeviceEventManagementServiceImpl.java | 2 +- .../impl/DeviceManagementServiceImpl.java | 8 +++---- ...yticsArtifactUploaderAdminServiceImpl.java | 4 ++-- .../mgt/jaxrs/util/DeviceMgtAPIUtils.java | 6 ++--- .../service/impl/DeviceAgentServiceTest.java | 2 +- .../org.wso2.carbon.device.mgt.core/pom.xml | 14 ++++++------ .../GeoLocationProviderServiceImpl.java | 6 ++--- .../internal/DeviceManagementDataHolder.java | 2 +- .../DeviceManagementServiceComponent.java | 4 ++-- .../NotificationManagementServiceImpl.java | 4 ++-- .../impl/DynamicPartitionedScheduleTask.java | 2 +- .../impl/RandomlyAssignedScheduleTask.java | 2 +- .../mgt/core/util/DeviceManagerUtil.java | 8 +++---- .../core/TestHeartBeatManagementService.java | 8 +++---- .../GeoLocationProviderServiceTest.java | 2 -- .../mgt/core/task/DeviceTaskManagerTest.java | 2 +- .../modules/business-controllers/device.js | 2 +- .../app/modules/oauth/token-handler-utils.js | 6 ++--- .../analytics-view.js | 2 +- .../cdmf.unit.geo-dashboard/geo-dashboard.js | 2 +- .../cdmf.unit.geo-devices/geo-devices.js | 2 +- .../pom.xml | 8 +++---- ...HeartBeatBeaconConfigurationException.java | 2 +- .../beacon/HeartBeatBeaconUtils.java | 6 ++--- .../beacon/config/HeartBeatBeaconConfig.java | 10 ++++----- .../config/datasource/DataSourceConfig.java | 2 +- .../datasource/JNDILookupDefinition.java | 2 +- .../beacon/dao/HeartBeatBeaconDAOFactory.java | 10 ++++----- .../heartbeat/beacon/dao/HeartBeatDAO.java | 10 ++++----- .../dao/exception/HeartBeatDAOException.java | 2 +- .../dao/impl/GenericHeartBeatDAOImpl.java | 18 +++++++-------- .../dao/util/HeartBeatBeaconDAOUtil.java | 7 +++--- .../beacon/dto/ElectedCandidate.java | 2 +- .../heartbeat/beacon/dto/HeartBeatEvent.java | 2 +- .../heartbeat/beacon/dto/ServerContext.java | 2 +- .../HeartBeatManagementException.java | 2 +- .../InvalidConfigurationStateException.java | 2 +- .../ServerStatusUpdationFailedException.java | 2 +- .../internal/HeartBeatBeaconComponent.java | 16 +++++++------- .../internal/HeartBeatBeaconDataHolder.java | 4 ++-- .../beacon/internal/HeartBeatExecutor.java | 14 ++++++------ .../service/HeartBeatManagementService.java | 8 +++---- .../HeartBeatManagementServiceImpl.java | 20 ++++++++--------- .../src/test/resources/log4j.properties | 0 .../src/test/resources/testng.xml | 0 components/heartbeat-management/pom.xml | 2 +- .../pom.xml | 8 +++---- .../jwt/client/extension/JWTClient.java | 12 +++++----- .../extension/constant/JWTConstants.java | 2 +- .../client/extension/dto/AccessTokenInfo.java | 2 +- .../jwt/client/extension/dto/JWTConfig.java | 4 ++-- .../JWTClientAlreadyExistsException.java | 2 +- .../JWTClientConfigurationException.java | 2 +- .../exception/JWTClientException.java | 2 +- .../JWTClientExtensionDataHolder.java | 2 +- .../JWTClientExtensionServiceComponent.java | 12 +++++----- .../service/JWTClientManagerService.java | 8 +++---- .../service/JWTClientManagerServiceImpl.java | 16 +++++++------- .../client/extension/util/JWTClientUtil.java | 12 +++++----- .../service/JWTClientManagerServiceTest.java | 8 +++---- .../extension/service/JWTClientTest.java | 12 +++++----- .../extension/service/JWTClientUtilTest.java | 8 +++---- .../common/BaseJWTClientManagerExtTest.java | 4 ++-- .../service/common/DataSourceConfig.java | 2 +- .../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 | 0 .../conf/datasources/master-datasources.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/jwt.properties | 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/log4j.properties | 0 .../src/test/resources/testng.xml | 6 ++--- .../user-test/user-mgt-registry-test.xml | 0 components/identity-extensions/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../notification/logger/DeviceLogContext.java | 2 +- .../notification/logger/UserLogContext.java | 2 +- .../logger/impl/EntgraDeviceLoggerImpl.java | 6 ++--- .../logger/impl/EntgraUserLoggerImpl.java | 6 ++--- .../logger/util/MDCContextUtil.java | 6 ++--- .../src/test/resources/log4j.properties | 0 components/logger/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 ++-- .../core/PolicyManagerServiceImplTest.java | 2 +- .../mock/TestHeartBeatManagementService.java | 8 +++---- .../pom.xml | 2 +- .../pom.xml | 8 +++---- .../core/internal/TaskManagerDataHolder.java | 2 +- .../internal/TaskManagerServiceComponent.java | 4 ++-- .../service/TaskManagementServiceImpl.java | 2 +- .../mgt/core/util/TaskManagementUtil.java | 2 +- .../pom.xml | 4 ++-- .../task/mgt/watcher/IoTSStartupHandler.java | 2 +- .../internal/TaskWatcherDataHolder.java | 2 +- .../internal/TaskWatcherServiceComponent.java | 4 ++-- components/test-coverage/pom.xml | 4 ++-- .../pom.xml | 2 +- .../ui/request/interceptor/UserHandler.java | 4 ++-- .../pom.xml | 2 +- .../authenticator/JWTAuthenticatorTest.java | 6 ++--- .../pom.xml | 4 ++-- features/heartbeat-management/pom.xml | 1 - .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- pom.xml | 22 +++++++++---------- 149 files changed, 287 insertions(+), 291 deletions(-) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon}/pom.xml (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java (95%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java (95%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java (90%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java (96%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java (79%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java (96%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java (93%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java (93%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java (95%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/dto/ServerContext.java (95%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java (96%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java (82%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java (89%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java (86%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java (81%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core}/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java (94%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon}/src/test/resources/log4j.properties (100%) rename components/heartbeat-management/{io.entgra.server.bootup.heartbeat.beacon => io.entgra.device.mgt.core.server.bootup.heartbeat.beacon}/src/test/resources/testng.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/pom.xml (96%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/JWTClient.java (94%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/constant/JWTConstants.java (95%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/dto/AccessTokenInfo.java (95%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/dto/JWTConfig.java (96%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java (94%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/exception/JWTClientConfigurationException.java (94%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/exception/JWTClientException.java (94%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java (97%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java (89%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/JWTClientManagerService.java (80%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java (91%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/util/JWTClientUtil.java (95%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java (88%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/JWTClientTest.java (95%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/JWTClientUtilTest.java (92%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java (95%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core}/identity/jwt/client/extension/service/common/DataSourceConfig.java (96%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/dbscripts/h2.sql (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/jmx.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/jwt.properties (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/launch.ini (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/mime.mappings (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/mime.types (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/registry.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/security/authenticators.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/tomcat/web.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/carbon-home/repository/conf/user-mgt.xml (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/log4j.properties (100%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/testng.xml (73%) rename components/identity-extensions/{org.wso2.carbon.identity.jwt.client.extension => io.entgra.device.mgt.core.identity.jwt.client.extension}/src/test/resources/user-test/user-mgt-registry-test.xml (100%) rename components/logger/{io.entgra.notification.logger => io.entgra.device.mgt.core.notification.logger}/pom.xml (95%) rename components/logger/{io.entgra.notification.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core}/notification/logger/DeviceLogContext.java (97%) rename components/logger/{io.entgra.notification.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core}/notification/logger/UserLogContext.java (98%) rename components/logger/{io.entgra.notification.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core}/notification/logger/impl/EntgraDeviceLoggerImpl.java (97%) rename components/logger/{io.entgra.notification.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core}/notification/logger/impl/EntgraUserLoggerImpl.java (97%) rename components/logger/{io.entgra.notification.logger/src/main/java/io/entgra => io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core}/notification/logger/util/MDCContextUtil.java (91%) rename components/logger/{io.entgra.notification.logger => io.entgra.device.mgt.core.notification.logger}/src/test/resources/log4j.properties (100%) diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml index e7975baa0b..1f08f5968f 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml @@ -248,7 +248,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml index 5e67cd6221..02e71ad141 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml @@ -156,7 +156,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided @@ -316,7 +316,7 @@ io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon com.google.guava diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml index 9e04621c6f..dbaf97ad9b 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml @@ -69,7 +69,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided @@ -115,10 +115,10 @@ org.wso2.carbon.apimgt.impl;version="${carbon.api.mgt.version.range}", org.wso2.carbon.apimgt.impl.utils;version="${carbon.api.mgt.version.range}", org.wso2.carbon.context;version="${carbon.kernel.version.range}", - org.wso2.carbon.identity.jwt.client.extension, - org.wso2.carbon.identity.jwt.client.extension.dto, - org.wso2.carbon.identity.jwt.client.extension.exception, - org.wso2.carbon.identity.jwt.client.extension.service, + io.entgra.device.mgt.core.identity.jwt.client.extension, + io.entgra.device.mgt.core.identity.jwt.client.extension.dto, + io.entgra.device.mgt.core.identity.jwt.client.extension.exception, + io.entgra.device.mgt.core.identity.jwt.client.extension.service, org.wso2.carbon.registry.core.exceptions;version="[1.0,2)", org.wso2.carbon.registry.core.service;version="[1.0,2)", org.wso2.carbon.registry.indexing.service;version="${carbon.registry.imp.pkg.version.range}", diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderService.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderService.java index 132daee6ff..c95cccc6ba 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderService.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderService.java @@ -20,7 +20,7 @@ package io.entgra.device.mgt.core.apimgt.application.extension; import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey; import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; /** * This comprise on operation that is been done with api manager from CDMF. This service needs to be implemented in APIM. diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java index 79cf51f600..338af5a1e2 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java @@ -42,10 +42,10 @@ import org.wso2.carbon.apimgt.impl.APIConstants; import org.wso2.carbon.apimgt.impl.APIManagerFactory; import org.wso2.carbon.apimgt.impl.utils.APIUtil; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/internal/APIApplicationManagerExtensionDataHolder.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/internal/APIApplicationManagerExtensionDataHolder.java index 5cc6eee527..0ee0306775 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/internal/APIApplicationManagerExtensionDataHolder.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/internal/APIApplicationManagerExtensionDataHolder.java @@ -19,7 +19,7 @@ package io.entgra.device.mgt.core.apimgt.application.extension.internal; import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.registry.core.service.TenantRegistryLoader; import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/BaseAPIPublisherTest.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/BaseAPIPublisherTest.java index efe5a6ea7f..d8da938cff 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/BaseAPIPublisherTest.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/BaseAPIPublisherTest.java @@ -34,7 +34,7 @@ import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.user.core.service.RealmService; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import java.io.File; import java.io.InputStream; diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml index 4bf4ae931f..4ae55f3a63 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml @@ -183,7 +183,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension io.entgra.device.mgt.core diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java index d1a77817f2..46289b3ca1 100755 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java @@ -35,9 +35,9 @@ import org.wso2.carbon.apimgt.integration.client.model.OAuthApplication; import org.wso2.carbon.apimgt.integration.client.util.Utils; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import java.util.HashMap; import java.util.Map; diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientDataHolder.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientDataHolder.java index a53572cf25..56584dfdac 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientDataHolder.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientDataHolder.java @@ -19,7 +19,7 @@ package org.wso2.carbon.apimgt.integration.client.internal; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; /** * This holds the required service for this component diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientServiceComponent.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientServiceComponent.java index 4e09da489f..babfad55d9 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientServiceComponent.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientServiceComponent.java @@ -25,12 +25,12 @@ import org.osgi.service.component.ComponentContext; import org.wso2.carbon.apimgt.integration.client.IntegrationClientServiceImpl; import org.wso2.carbon.apimgt.integration.client.configs.APIMConfigReader; import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; /** * @scr.component name="org.wso2.carbon.api.integration.client" immediate="true" * @scr.reference name="api.integration.client.service" - * interface="org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService" + * interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService" * cardinality="1..1" * policy="dynamic" * bind="setJWTClientManagerService" diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml index 2be2d09c36..7f686ceea7 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml @@ -79,7 +79,7 @@ org.apache.commons.codec.digest;version="${commons-codec.wso2.osgi.version.range}", org.wso2.carbon.base, com.dd.*, - org.wso2.carbon.identity.jwt.client.extension.*, + io.entgra.device.mgt.core.identity.jwt.client.extension.*, io.entgra.device.mgt.core.apimgt.application.extension.*, org.apache.commons.httpclient, org.apache.commons.httpclient.methods, @@ -354,7 +354,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java index 0994b04ad2..b0766ad3da 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java @@ -84,7 +84,7 @@ import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; import org.wso2.carbon.device.mgt.core.util.MDMAndroidOperationUtil; import org.wso2.carbon.device.mgt.core.util.MDMIOSOperationUtil; import org.wso2.carbon.device.mgt.core.util.MDMWindowsOperationUtil; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; import org.wso2.carbon.user.api.UserStoreException; import javax.ws.rs.core.MediaType; diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java index 1676f1c096..c7464bea43 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java @@ -25,10 +25,10 @@ import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplication import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException; import org.wso2.carbon.context.PrivilegedCarbonContext; import io.entgra.device.mgt.core.application.mgt.common.dto.ApiRegistrationProfile; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml index d4efb561c0..e97cfa8bd0 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml @@ -175,7 +175,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java index 981af01589..d77ff71e1e 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java @@ -47,8 +47,8 @@ import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import javax.ws.rs.core.Response; import java.security.cert.X509Certificate; diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java index f11e98710e..e7b37b5910 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java @@ -24,7 +24,7 @@ import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager; import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import javax.ws.rs.core.MediaType; diff --git a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml index ec1de01c84..68d59db8df 100644 --- a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml +++ b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml @@ -260,7 +260,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided diff --git a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/java/io/entgra/carbon/device/mgt/config/jaxrs/service/impl/DeviceManagementConfigServiceImpl.java b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/java/io/entgra/carbon/device/mgt/config/jaxrs/service/impl/DeviceManagementConfigServiceImpl.java index 8aea316c55..24b1042c8e 100644 --- a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/java/io/entgra/carbon/device/mgt/config/jaxrs/service/impl/DeviceManagementConfigServiceImpl.java +++ b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/java/io/entgra/carbon/device/mgt/config/jaxrs/service/impl/DeviceManagementConfigServiceImpl.java @@ -46,8 +46,8 @@ import org.wso2.carbon.device.mgt.core.config.ui.UIConfigurationManager; import org.wso2.carbon.device.mgt.core.permission.mgt.PermissionUtils; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import org.wso2.carbon.user.api.Tenant; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml index a52144332c..7f24fb4284 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml @@ -355,7 +355,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java index be85aaa440..dc34d9db29 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java @@ -45,7 +45,7 @@ import org.wso2.carbon.event.receiver.stub.types.EventReceiverConfigurationDto; import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub; import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto; import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import org.wso2.carbon.user.api.UserStoreException; import org.apache.axis2.AxisFault; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceImpl.java index 130b182e2f..c331b88bb3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceImpl.java @@ -48,7 +48,7 @@ import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub; import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto; import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint; import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException; import org.wso2.carbon.user.api.UserStoreException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java index 23be4d88eb..fda7cd37b9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java @@ -46,7 +46,7 @@ import org.wso2.carbon.event.stream.core.exception.EventStreamConfigurationExcep import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub; import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto; import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import org.wso2.carbon.user.api.UserStoreException; import javax.validation.Valid; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index 5001d2a384..a58bf1ad36 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -103,10 +103,10 @@ import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.InputValidationExcepti import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.jaxrs.util.Constants; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException; import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService; import org.wso2.carbon.user.api.UserStoreException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java index c6325a4ec7..d6947bba6c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java @@ -39,8 +39,8 @@ import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.core.util.Utils; import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceAnalyticsArtifactUploaderAdminService; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java index d2014d1f9b..d3cedd9b33 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java @@ -101,9 +101,9 @@ import org.wso2.carbon.event.receiver.stub.EventReceiverAdminServiceStub; import org.wso2.carbon.event.stream.core.EventStreamService; import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub; import org.wso2.carbon.identity.claim.metadata.mgt.dto.ClaimPropertyDTO; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.identity.user.store.count.AbstractCountRetrieverFactory; import org.wso2.carbon.identity.user.store.count.UserStoreCountRetriever; import org.wso2.carbon.identity.user.store.count.exception.UserStoreCounterException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java index 36c148c9a1..d2d9f5abee 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java @@ -53,7 +53,7 @@ import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub; import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto; import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService; import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerServiceImpl; import org.wso2.carbon.user.api.UserStoreException; 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 93b8619161..97af669b90 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 @@ -109,13 +109,13 @@ io.swagger.annotations.*;resolution:=optional, org.wso2.carbon, org.wso2.carbon.base, - org.scannotation.*, + org.scannotation.*, org.wso2.carbon.event.processor.stub, - org.wso2.carbon.identity.jwt.client.extension.service, + io.entgra.device.mgt.core.identity.jwt.client.extension.service, org.apache.commons.codec.binary, - io.entgra.server.bootup.heartbeat.beacon, + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon, io.entgra.device.mgt.core.device.mgt.extensions.logger.*, - io.entgra.notification.logger.* + io.entgra.device.mgt.core.notification.logger.* !org.wso2.carbon.device.mgt.core.internal, @@ -304,7 +304,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided @@ -339,7 +339,7 @@ io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon com.google.guava @@ -360,7 +360,7 @@ io.entgra.device.mgt.core - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.logger diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java index 5f2c6c7916..8fcb913451 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java @@ -61,9 +61,9 @@ import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants; import org.wso2.carbon.event.processor.stub.EventProcessorAdminServiceStub; import org.wso2.carbon.event.processor.stub.types.ExecutionPlanConfigurationDto; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.registry.api.Registry; import org.wso2.carbon.registry.api.RegistryException; import org.wso2.carbon.registry.api.Resource; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java index dca58e7515..aff2ff446f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java @@ -18,7 +18,7 @@ package org.wso2.carbon.device.mgt.core.internal; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java index d394a54529..673d0c5627 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java @@ -17,7 +17,7 @@ */ package org.wso2.carbon.device.mgt.core.internal; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; @@ -145,7 +145,7 @@ import java.util.concurrent.TimeUnit; * bind="setDeviceTypeGeneratorService" * unbind="unsetDeviceTypeGeneratorService" * @scr.reference name="entgra.heart.beat.service" - * interface="io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService" + * interface="io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService" * cardinality="0..1" * policy="dynamic" * bind="setHeartBeatService" 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 f1c9ae2ca3..8f2ed02524 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 @@ -19,8 +19,8 @@ package org.wso2.carbon.device.mgt.core.notification.mgt; 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 io.entgra.device.mgt.core.notification.logger.DeviceLogContext; +import io.entgra.device.mgt.core.notification.logger.impl.EntgraDeviceLoggerImpl; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java index 7e6d0f916d..6f14456603 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java @@ -18,7 +18,7 @@ package org.wso2.carbon.device.mgt.core.task.impl; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/RandomlyAssignedScheduleTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/RandomlyAssignedScheduleTask.java index fb8a5b9235..6453796c3e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/RandomlyAssignedScheduleTask.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/RandomlyAssignedScheduleTask.java @@ -18,7 +18,7 @@ package org.wso2.carbon.device.mgt.core.task.impl; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java index 4dc0b42551..93740e1644 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java @@ -94,10 +94,10 @@ import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.operation.mgt.util.DeviceIDHolder; import org.wso2.carbon.device.mgt.core.report.mgt.Constants; import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.user.api.RealmConfiguration; import org.wso2.carbon.user.api.TenantManager; import org.wso2.carbon.user.api.UserRealm; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestHeartBeatManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestHeartBeatManagementService.java index 4499e5784d..8e3cb8a956 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestHeartBeatManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestHeartBeatManagementService.java @@ -18,10 +18,10 @@ package org.wso2.carbon.device.mgt.core; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.wso2.carbon.device.mgt.common.ServerCtxInfo; import java.util.Map; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java index 649ecf4244..9227c9f859 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java @@ -36,10 +36,8 @@ import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.event.processor.stub.EventProcessorAdminServiceStub; import org.wso2.carbon.event.processor.stub.types.ExecutionPlanConfigurationDto; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; -import java.rmi.RemoteException; import java.util.List; public class GeoLocationProviderServiceTest { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/DeviceTaskManagerTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/DeviceTaskManagerTest.java index 358d2fbf3c..e9327b3e09 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/DeviceTaskManagerTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/DeviceTaskManagerTest.java @@ -17,7 +17,7 @@ */ package org.wso2.carbon.device.mgt.core.task; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.powermock.api.mockito.PowerMockito; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js index 2e80797d88..772967fc78 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js @@ -402,7 +402,7 @@ deviceModule = function () { config.clientSecret = app["client_secret"]; if (config.clientId && config.clientSecret) { var JWTClientManagerServicePackagePath = - "org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"; + "io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"; //noinspection JSUnresolvedFunction, JSUnresolvedVariable var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath); //noinspection JSUnresolvedFunction diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handler-utils.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handler-utils.js index 7a0eeba191..dedbe67623 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handler-utils.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handler-utils.js @@ -290,7 +290,7 @@ var utils = function () { } var endUsername = ssoLoginUser.user.username + "@" + ssoLoginUser.user.domain; var JWTClientManagerServicePackagePath = - "org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"; + "io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"; //noinspection JSUnresolvedFunction, JSUnresolvedVariable var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath); //noinspection JSUnresolvedFunction @@ -353,7 +353,7 @@ var utils = function () { return null; } else { var JWTClientManagerServicePackagePath = - "org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"; + "io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"; //noinspection JSUnresolvedFunction, JSUnresolvedVariable var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath); //noinspection JSUnresolvedFunction @@ -370,7 +370,7 @@ var utils = function () { return null; } else { var JWTClientManagerServicePackagePath = - "org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"; + "io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"; //noinspection JSUnresolvedFunction, JSUnresolvedVariable var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath); //noinspection JSUnresolvedFunction diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/analytics-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/analytics-view.js index a13b87502f..6f7935be28 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/analytics-view.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/analytics-view.js @@ -29,7 +29,7 @@ function onRequest(context) { var constants = require("/app/modules/constants.js"); var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss"); var jwtService = carbonServer.osgiService( - 'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService'); + 'io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService'); var jwtClient = jwtService.getJWTClient(); var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]); var token = ""; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js index b44eb2be49..261a947f76 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js @@ -25,7 +25,7 @@ function onRequest(context) { var constants = require("/app/modules/constants.js"); var wsEndpoint = null; var jwtService = carbonServer.osgiService( - 'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService'); + 'io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService'); var jwtClient = jwtService.getJWTClient(); var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]); var tokenPair = null; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/geo-devices.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/geo-devices.js index 9db76cedad..7df2a6e0e8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/geo-devices.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/geo-devices.js @@ -26,7 +26,7 @@ function onRequest(context) { var constants = require("/app/modules/constants.js"); var wsEndpoint = null; var jwtService = carbonServer.osgiService( - 'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService'); + 'io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService'); var jwtClient = jwtService.getJWTClient(); var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]); var tokenPair = null; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/pom.xml b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/pom.xml rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml index e81e27370a..099fa9ee77 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/pom.xml +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon bundle Entgra - Heartbeat Beacon Entgra - Server Startup and Heartbeat Monitoring Component @@ -49,7 +49,7 @@ ${project.artifactId} ${carbon.device.mgt.version} Server Startup Heart Beat Beacon Bundle - io.entgra.server.bootup.heartbeat.beacon.internal + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal org.apache.axis2.*;version="${axis2.osgi.version.range}", org.apache.axiom.*; version="${axiom.osgi.version.range}", @@ -67,8 +67,8 @@ org.wso2.carbon.device.mgt.common.* - !io.entgra.server.bootup.heartbeat.beacon.internal, - io.entgra.server.bootup.heartbeat.beacon.* + !io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal, + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.* diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java similarity index 95% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java index fe7a26768d..73374890aa 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon; public class HeartBeatBeaconConfigurationException extends Exception { diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java similarity index 95% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java index ec0ec4c915..32f7340998 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon; -import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java similarity index 90% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java index e427dffc86..36ce103de8 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java @@ -16,12 +16,12 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.config; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config; -import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException; -import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; -import io.entgra.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig; -import io.entgra.server.bootup.heartbeat.beacon.exception.InvalidConfigurationStateException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.InvalidConfigurationStateException; import org.w3c.dom.Document; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java index 5ab3aa4dd1..b42b8d268e 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.config.datasource; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java similarity index 96% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java index befbf304b8..2e6a09f1fe 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.config.datasource; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java index e8d3011be9..083ee4ca14 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java @@ -16,12 +16,12 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dao; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao; -import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; -import io.entgra.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig; -import io.entgra.server.bootup.heartbeat.beacon.config.datasource.JNDILookupDefinition; -import io.entgra.server.bootup.heartbeat.beacon.dao.impl.GenericHeartBeatDAOImpl; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.JNDILookupDefinition; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.impl.GenericHeartBeatDAOImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java similarity index 79% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java index 9013e443f5..1d0f00dde2 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java @@ -16,12 +16,12 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dao; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao; -import io.entgra.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException; -import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; import java.util.List; import java.util.Map; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java similarity index 96% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java index bf92afaaa8..23afd189f5 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dao.exception; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception; /** * Custom exception class for group management data access related exceptions. diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java similarity index 93% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java index ab20bd0f2c..18303897b1 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java @@ -16,15 +16,15 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dao.impl; - -import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory; -import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatDAO; -import io.entgra.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException; -import io.entgra.server.bootup.heartbeat.beacon.dao.util.HeartBeatBeaconDAOUtil; -import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.impl; + +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatDAO; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.util.HeartBeatBeaconDAOUtil; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java similarity index 93% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java index 67b91df517..8b4fe0d923 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dao.util; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.util; -import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,7 +28,6 @@ import javax.sql.DataSource; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; import java.util.Arrays; import java.util.Hashtable; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java similarity index 95% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java index 99bfa8eba9..c93180c871 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dto; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto; import java.sql.Timestamp; import java.util.ArrayList; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java index 4feb8b7fe7..bbc162e9b0 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dto; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto; import java.sql.Timestamp; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/ServerContext.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ServerContext.java similarity index 95% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/ServerContext.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ServerContext.java index bdb5abe76e..6d63116fd6 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/dto/ServerContext.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ServerContext.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.dto; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto; public class ServerContext { diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java index 9c90d3a9cb..269150edd1 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.exception; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception; public class HeartBeatManagementException extends Exception { diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java similarity index 96% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java index cb7ebc4385..70b61c35d7 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.exception; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception; public class InvalidConfigurationStateException extends RuntimeException { diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java index 63379d7c70..b8fd57caad 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.exception; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception; public class ServerStatusUpdationFailedException extends Exception { diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java similarity index 82% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java index dc111aef73..990ca60b87 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java @@ -16,21 +16,21 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.internal; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal; -import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; -import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; -import io.entgra.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig; -import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementServiceImpl; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementServiceImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.ndatasource.core.DataSourceService; /** - * @scr.component name="io.entgra.server.bootup.heartbeat.beacon.heartbeatBeaconComponent" + * @scr.component name="io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.heartbeatBeaconComponent" * immediate="true" * @scr.reference name="org.wso2.carbon.ndatasource" * interface="org.wso2.carbon.ndatasource.core.DataSourceService" diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java similarity index 89% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java index dc332a251e..2ff5808598 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.internal; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; public class HeartBeatBeaconDataHolder { diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java similarity index 86% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java index 1f0d50539b..888905fef6 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java @@ -16,14 +16,14 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.internal; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal; -import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException; -import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; -import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java similarity index 81% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java index 0898e2c220..7cba6f26c4 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java @@ -16,11 +16,11 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.service; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import org.wso2.carbon.device.mgt.common.ServerCtxInfo; import java.util.Map; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java similarity index 94% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java index 0f5dd9ef71..87ca0dc853 100644 --- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java @@ -16,17 +16,17 @@ * under the License. */ -package io.entgra.server.bootup.heartbeat.beacon.service; +package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service; -import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; -import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory; -import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatDAO; -import io.entgra.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException; -import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.server.bootup.heartbeat.beacon.internal.HeartBeatBeaconDataHolder; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatDAO; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal.HeartBeatBeaconDataHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.ServerCtxInfo; diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/test/resources/log4j.properties b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/test/resources/log4j.properties similarity index 100% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/test/resources/log4j.properties rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/test/resources/log4j.properties diff --git a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/test/resources/testng.xml b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/test/resources/testng.xml similarity index 100% rename from components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/test/resources/testng.xml rename to components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/test/resources/testng.xml diff --git a/components/heartbeat-management/pom.xml b/components/heartbeat-management/pom.xml index 7c16b82ad4..5e855e498d 100644 --- a/components/heartbeat-management/pom.xml +++ b/components/heartbeat-management/pom.xml @@ -33,7 +33,7 @@ http://entgra.io - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml similarity index 96% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml index 419ddebf61..f532a8e3e8 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension bundle WSO2 Carbon - Device Management JWT Client Extensions WSO2 Carbon - Device Management JWT Client Extensions @@ -179,10 +179,10 @@ ${project.artifactId} ${carbon.device.mgt.version} Device Management JWT Client Bundle - org.wso2.carbon.identity.jwt.client.extension.internal + io.entgra.device.mgt.core.identity.jwt.client.extension.internal - !org.wso2.carbon.identity.jwt.client.extension.internal, - org.wso2.carbon.identity.jwt.client.extension.* + !io.entgra.device.mgt.core.identity.jwt.client.extension.internal, + io.entgra.device.mgt.core.identity.jwt.client.extension.* org.osgi.framework.*;version="${imp.package.version.osgi.framework}", diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/JWTClient.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/JWTClient.java similarity index 94% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/JWTClient.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/JWTClient.java index 0ade855c71..ea0ac57dd3 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/JWTClient.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/JWTClient.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension; +package io.entgra.device.mgt.core.identity.jwt.client.extension; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; @@ -30,11 +30,11 @@ import org.apache.http.message.BasicNameValuePair; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.wso2.carbon.identity.jwt.client.extension.constant.JWTConstants; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil; +import io.entgra.device.mgt.core.identity.jwt.client.extension.constant.JWTConstants; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil; import java.io.IOException; import java.net.MalformedURLException; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/constant/JWTConstants.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/constant/JWTConstants.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/constant/JWTConstants.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/constant/JWTConstants.java index 998813054a..4750e4e7dd 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/constant/JWTConstants.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/constant/JWTConstants.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.constant; +package io.entgra.device.mgt.core.identity.jwt.client.extension.constant; /** * This holds the constants related JWT client component. diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/dto/AccessTokenInfo.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/AccessTokenInfo.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/dto/AccessTokenInfo.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/AccessTokenInfo.java index a0240dc818..2e757b6797 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/dto/AccessTokenInfo.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/AccessTokenInfo.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.dto; +package io.entgra.device.mgt.core.identity.jwt.client.extension.dto; /** * This holds the token information that return from the token endpoint. diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/dto/JWTConfig.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/JWTConfig.java similarity index 96% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/dto/JWTConfig.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/JWTConfig.java index 67ebcb4099..7a1fdc0d6e 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/dto/JWTConfig.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/JWTConfig.java @@ -1,7 +1,7 @@ -package org.wso2.carbon.identity.jwt.client.extension.dto; +package io.entgra.device.mgt.core.identity.jwt.client.extension.dto; import org.wso2.carbon.core.util.Utils; -import org.wso2.carbon.identity.jwt.client.extension.constant.JWTConstants; +import io.entgra.device.mgt.core.identity.jwt.client.extension.constant.JWTConstants; import java.util.ArrayList; import java.util.List; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java similarity index 94% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java index fab6d324c1..cfdadd4ec2 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java @@ -17,7 +17,7 @@ * */ -package org.wso2.carbon.identity.jwt.client.extension.exception; +package io.entgra.device.mgt.core.identity.jwt.client.extension.exception; public class JWTClientAlreadyExistsException extends Exception { public JWTClientAlreadyExistsException() { diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientConfigurationException.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientConfigurationException.java similarity index 94% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientConfigurationException.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientConfigurationException.java index cd7e947fe0..1d8466ac28 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientConfigurationException.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientConfigurationException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.identity.jwt.client.extension.exception; +package io.entgra.device.mgt.core.identity.jwt.client.extension.exception; public class JWTClientConfigurationException extends Exception { public JWTClientConfigurationException() { diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientException.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientException.java similarity index 94% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientException.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientException.java index 0808292371..5546fc88c1 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/exception/JWTClientException.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.identity.jwt.client.extension.exception; +package io.entgra.device.mgt.core.identity.jwt.client.extension.exception; public class JWTClientException extends Exception{ public JWTClientException() { diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java similarity index 97% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java index 8e66fd49ab..59de868852 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.identity.jwt.client.extension.internal; +package io.entgra.device.mgt.core.identity.jwt.client.extension.internal; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.TenantRegistryLoader; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java similarity index 89% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java index 3ca1717089..e4ff7849b6 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java @@ -16,16 +16,16 @@ * under the License. * */ -package org.wso2.carbon.identity.jwt.client.extension.internal; +package io.entgra.device.mgt.core.identity.jwt.client.extension.internal; 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.identity.jwt.client.extension.exception.JWTClientConfigurationException; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerServiceImpl; -import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerServiceImpl; +import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.TenantRegistryLoader; @@ -34,7 +34,7 @@ import org.wso2.carbon.user.core.service.RealmService; import java.io.IOException; /** - * @scr.component name="org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionServiceComponent" + * @scr.component name="io.entgra.device.mgt.core.identity.jwt.client.extension.internal.JWTClientExtensionServiceComponent" * immediate="true" * @scr.reference name="registry.service" * interface="org.wso2.carbon.registry.core.service.RegistryService" diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerService.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerService.java similarity index 80% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerService.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerService.java index 83e4ca8884..98e6ce0cbe 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerService.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.service; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import java.util.Properties; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java similarity index 91% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java index 810487e491..b74abc304a 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java @@ -16,20 +16,20 @@ * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.service; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.constant.JWTConstants; -import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientAlreadyExistsException; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.constant.JWTConstants; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientAlreadyExistsException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil; import org.wso2.carbon.registry.core.Resource; import org.wso2.carbon.registry.core.exceptions.RegistryException; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/util/JWTClientUtil.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/util/JWTClientUtil.java index f9980d2122..55be8b3afc 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/util/JWTClientUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.util; +package io.entgra.device.mgt.core.identity.jwt.client.extension.util; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSAlgorithm; @@ -36,11 +36,11 @@ import org.apache.http.util.EntityUtils; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.core.util.KeyStoreManager; -import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.registry.core.Registry; import org.wso2.carbon.registry.core.Resource; import org.wso2.carbon.registry.core.exceptions.RegistryException; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java similarity index 88% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java index 2f120c166e..28d058b538 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java @@ -15,16 +15,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.service; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.service.common.BaseJWTClientManagerExtTest; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.service.common.BaseJWTClientManagerExtTest; import java.util.Properties; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientTest.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientTest.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientTest.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientTest.java index a9c759e29e..15f2476ee2 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientTest.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.service; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,11 +30,11 @@ import org.testng.IObjectFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.ObjectFactory; import org.testng.annotations.Test; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil; +import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil; import java.io.IOException; import java.security.KeyManagementException; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientUtilTest.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientUtilTest.java similarity index 92% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientUtilTest.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientUtilTest.java index 603ea9994d..64e92e6fff 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientUtilTest.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientUtilTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.service; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; @@ -29,9 +29,9 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.ObjectFactory; import org.testng.annotations.Test; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil; import org.wso2.carbon.registry.core.exceptions.RegistryException; import java.io.ByteArrayInputStream; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java index c982b7e044..7103ac87dc 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.identity.jwt.client.extension.service.common; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder; +import io.entgra.device.mgt.core.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder; import org.wso2.carbon.registry.core.config.RegistryContext; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.internal.RegistryDataHolder; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/common/DataSourceConfig.java b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/DataSourceConfig.java similarity index 96% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/common/DataSourceConfig.java rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/DataSourceConfig.java index d1ac720af8..28ed64e06d 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/java/org/wso2/carbon/identity/jwt/client/extension/service/common/DataSourceConfig.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/DataSourceConfig.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.identity.jwt.client.extension.service.common; +package io.entgra.device.mgt.core.identity.jwt.client.extension.service.common; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/dbscripts/h2.sql b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/dbscripts/h2.sql similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/dbscripts/h2.sql rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/dbscripts/h2.sql diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/carbon.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/carbon.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/carbon.xml 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/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jmx.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jmx.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jmx.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jwt.properties b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jwt.properties similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jwt.properties rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/jwt.properties diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/launch.ini similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/launch.ini rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/launch.ini diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.mappings similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.mappings rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.mappings diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.types similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.types rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/mime.types diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/log4j.properties similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/log4j.properties rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/log4j.properties diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/registry.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/registry.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/registry.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/registry.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/security/authenticators.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/security/authenticators.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/security/authenticators.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/web.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/web.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/tomcat/web.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/user-mgt.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/user-mgt.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/log4j.properties b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/log4j.properties similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/log4j.properties rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/log4j.properties diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/testng.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/testng.xml similarity index 73% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/testng.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/testng.xml index d837c6f8a4..60ceb6b349 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/testng.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/testng.xml @@ -23,9 +23,9 @@ - - - + + + \ No newline at end of file diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/user-test/user-mgt-registry-test.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/user-test/user-mgt-registry-test.xml similarity index 100% rename from components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/user-test/user-mgt-registry-test.xml rename to components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/resources/user-test/user-mgt-registry-test.xml diff --git a/components/identity-extensions/pom.xml b/components/identity-extensions/pom.xml index ccb689d70d..8fcdb04c89 100644 --- a/components/identity-extensions/pom.xml +++ b/components/identity-extensions/pom.xml @@ -33,8 +33,8 @@ http://wso2.org - org.wso2.carbon.device.mgt.oauth.extensions - org.wso2.carbon.identity.jwt.client.extension + + io.entgra.device.mgt.core.identity.jwt.client.extension diff --git a/components/logger/io.entgra.notification.logger/pom.xml b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml similarity index 95% rename from components/logger/io.entgra.notification.logger/pom.xml rename to components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml index ee48b890c5..e07f8adb9a 100644 --- a/components/logger/io.entgra.notification.logger/pom.xml +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml @@ -26,7 +26,7 @@ 5.0.26-SNAPSHOT - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.logger Entgra - Notification Logger bundle http://entgra.io @@ -75,7 +75,7 @@ org.wso2.carbon.context;version="[4.4,5) - io.entgra.notification.logger.* + io.entgra.device.mgt.core.notification.logger.* diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/DeviceLogContext.java similarity index 97% rename from components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java rename to components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/DeviceLogContext.java index ae3263c8cb..8ea17b3fdc 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/DeviceLogContext.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.notification.logger; +package io.entgra.device.mgt.core.notification.logger; import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/UserLogContext.java similarity index 98% rename from components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java rename to components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/UserLogContext.java index 29d1aa751a..eb39184532 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/UserLogContext.java +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/UserLogContext.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.notification.logger; +package io.entgra.device.mgt.core.notification.logger; import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraDeviceLoggerImpl.java similarity index 97% rename from components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java rename to components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraDeviceLoggerImpl.java index f72d1fa010..86cd840317 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraDeviceLoggerImpl.java +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraDeviceLoggerImpl.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.notification.logger.impl; +package io.entgra.device.mgt.core.notification.logger.impl; 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 io.entgra.device.mgt.core.notification.logger.DeviceLogContext; +import io.entgra.device.mgt.core.notification.logger.util.MDCContextUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.MDC; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraUserLoggerImpl.java similarity index 97% rename from components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java rename to components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraUserLoggerImpl.java index 94f70fd7e7..d2b9b321ff 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraUserLoggerImpl.java +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraUserLoggerImpl.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.notification.logger.impl; +package io.entgra.device.mgt.core.notification.logger.impl; 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 io.entgra.device.mgt.core.notification.logger.UserLogContext; +import io.entgra.device.mgt.core.notification.logger.util.MDCContextUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.MDC; diff --git a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/util/MDCContextUtil.java b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/util/MDCContextUtil.java similarity index 91% rename from components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/util/MDCContextUtil.java rename to components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/util/MDCContextUtil.java index 7db6830a1a..9ae2e6f193 100644 --- a/components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/util/MDCContextUtil.java +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/util/MDCContextUtil.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.notification.logger.util; +package io.entgra.device.mgt.core.notification.logger.util; -import io.entgra.notification.logger.DeviceLogContext; -import io.entgra.notification.logger.UserLogContext; +import io.entgra.device.mgt.core.notification.logger.DeviceLogContext; +import io.entgra.device.mgt.core.notification.logger.UserLogContext; import org.apache.log4j.MDC; public final class MDCContextUtil { diff --git a/components/logger/io.entgra.notification.logger/src/test/resources/log4j.properties b/components/logger/io.entgra.device.mgt.core.notification.logger/src/test/resources/log4j.properties similarity index 100% rename from components/logger/io.entgra.notification.logger/src/test/resources/log4j.properties rename to components/logger/io.entgra.device.mgt.core.notification.logger/src/test/resources/log4j.properties diff --git a/components/logger/pom.xml b/components/logger/pom.xml index 9e3b2031f6..5375683ce9 100644 --- a/components/logger/pom.xml +++ b/components/logger/pom.xml @@ -32,7 +32,7 @@ http://entgra.io - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.logger diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml index 10bdf658b5..c4c8ce26ad 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml @@ -323,7 +323,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml index f293629cef..99f5d50ebe 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml @@ -238,12 +238,12 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension test io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon test diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/PolicyManagerServiceImplTest.java b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/PolicyManagerServiceImplTest.java index 432a7cd98d..93387d2fac 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/PolicyManagerServiceImplTest.java +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/PolicyManagerServiceImplTest.java @@ -30,7 +30,7 @@ import io.entgra.device.mgt.core.policy.mgt.core.mock.TypeXDeviceManagementServi import io.entgra.device.mgt.core.policy.mgt.core.task.MonitoringTask; import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleService; import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagementConstants; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/mock/TestHeartBeatManagementService.java b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/mock/TestHeartBeatManagementService.java index 841d697ff7..776d979d76 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/mock/TestHeartBeatManagementService.java +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/java/io/entgra/device/mgt/core/policy/mgt/core/mock/TestHeartBeatManagementService.java @@ -18,10 +18,10 @@ package io.entgra.device.mgt.core.policy.mgt.core.mock; -import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; -import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.wso2.carbon.device.mgt.common.ServerCtxInfo; import java.util.Map; diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml index bd5fe07765..3caee4c4a6 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml @@ -309,7 +309,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension provided diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml index a92d1046e2..b194973fa2 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml @@ -67,9 +67,9 @@ org.wso2.carbon.context, org.apache.commons.codec.binary;version="${commons-codec.wso2.osgi.version.range}", org.apache.commons.codec.digest;version="${commons-codec.wso2.osgi.version.range}", - io.entgra.server.bootup.heartbeat.beacon.dto, - io.entgra.server.bootup.heartbeat.beacon.exception, - io.entgra.server.bootup.heartbeat.beacon.service, + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto, + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception, + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service, !io.entgra.device.mgt.core.task.mgt.core.internal, @@ -124,7 +124,7 @@ io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon provided diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java index aa8265a785..84ff1344ce 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java @@ -17,7 +17,7 @@ */ package io.entgra.device.mgt.core.task.mgt.core.internal; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; import org.wso2.carbon.ntask.core.service.TaskService; diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java index 947dd5340f..386aef3346 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java @@ -18,7 +18,7 @@ package io.entgra.device.mgt.core.task.mgt.core.internal; import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import io.entgra.device.mgt.core.task.mgt.core.config.TaskManagementConfig; import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig; import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; @@ -46,7 +46,7 @@ import org.wso2.carbon.ntask.core.service.TaskService; * bind="setTaskService" * unbind="unsetTaskService" * @scr.reference name="entgra.heart.beat.service" - * interface="io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService" + * interface="io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService" * cardinality="0..1" * policy="dynamic" * bind="setHeartBeatService" diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java index 91334172bf..80b757514f 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java @@ -21,7 +21,7 @@ import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO; import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory; import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder; import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException; diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java index b4a2a7e3b7..1dd20714a2 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java @@ -18,7 +18,7 @@ package io.entgra.device.mgt.core.task.mgt.core.util; import com.google.gson.Gson; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder; diff --git a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml index ac95521f94..0cf361215d 100755 --- a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml @@ -50,7 +50,7 @@ Task Watcher Bundle io.entgra.device.mgt.core.task.mgt.watcher.internal - io.entgra.server.bootup.heartbeat.beacon.*, + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.*, io.entgra.device.mgt.core.task.mgt.common.*, io.entgra.device.mgt.core.task.mgt.core.*, org.apache.commons.logging, @@ -110,7 +110,7 @@ io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon provided diff --git a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java index 16794243ad..c7ac374b80 100755 --- a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java @@ -18,7 +18,7 @@ package io.entgra.device.mgt.core.task.mgt.watcher; -import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; diff --git a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java index 39a3ef89f1..7831566224 100755 --- a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java @@ -17,7 +17,7 @@ */ package io.entgra.device.mgt.core.task.mgt.watcher.internal; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; import org.wso2.carbon.ntask.core.service.TaskService; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java index da3c47c962..876edb5b25 100755 --- a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java @@ -21,7 +21,7 @@ import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; import io.entgra.device.mgt.core.task.mgt.core.config.TaskConfigurationManager; import io.entgra.device.mgt.core.task.mgt.core.config.TaskManagementConfig; import io.entgra.device.mgt.core.task.mgt.watcher.IoTSStartupHandler; -import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; +import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; @@ -46,7 +46,7 @@ import org.wso2.carbon.user.core.service.RealmService; * bind="setTaskMgtService" * unbind="unsetTaskMgtService" * @scr.reference name="entgra.heart.beat.service" - * interface="io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService" + * interface="io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService" * cardinality="0..1" * policy="dynamic" * bind="setHeartBeatService" diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml index d37b8b1dfc..4f01359f30 100644 --- a/components/test-coverage/pom.xml +++ b/components/test-coverage/pom.xml @@ -106,7 +106,7 @@ ${basedir}/../${identity.extensions}/org.wso2.carbon.identity.authenticator.backend.oauth - ${basedir}/../${identity.extensions}/org.wso2.carbon.identity.jwt.client.extension + ${basedir}/../${identity.extensions}/io.entgra.device.mgt.core.identity.jwt.client.extension @@ -400,7 +400,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 01e9f42f48..362673afd0 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 @@ -125,7 +125,7 @@ io.entgra.device.mgt.core - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.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 14dbe6ecfa..a369af61c9 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 @@ -27,8 +27,8 @@ 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.core.device.mgt.extensions.logger.spi.EntgraLogger; -import io.entgra.notification.logger.UserLogContext; -import io.entgra.notification.logger.impl.EntgraUserLoggerImpl; +import io.entgra.device.mgt.core.notification.logger.UserLogContext; +import io.entgra.device.mgt.core.notification.logger.impl.EntgraUserLoggerImpl; import org.apache.http.HttpHeaders; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpPost; diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml index 9e38583777..81df5af255 100644 --- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml @@ -265,7 +265,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension test diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/JWTAuthenticatorTest.java b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/JWTAuthenticatorTest.java index f7f7fdd207..e4bee2f65d 100644 --- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/JWTAuthenticatorTest.java +++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/JWTAuthenticatorTest.java @@ -25,9 +25,9 @@ import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.wso2.carbon.base.MultitenantConstants; -import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil; +import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil; import io.entgra.device.mgt.core.webapp.authenticator.framework.AuthenticationInfo; import java.io.File; diff --git a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml index 4b216342e2..cef7df4577 100644 --- a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml +++ b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml @@ -42,7 +42,7 @@ io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon io.entgra.device.mgt.core @@ -128,7 +128,7 @@ - io.entgra.device.mgt.core:io.entgra.server.bootup.heartbeat.beacon:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.server.bootup.heartbeat.beacon:${carbon.device.mgt.version} diff --git a/features/heartbeat-management/pom.xml b/features/heartbeat-management/pom.xml index 6cb70b919b..a586c244a8 100644 --- a/features/heartbeat-management/pom.xml +++ b/features/heartbeat-management/pom.xml @@ -27,7 +27,6 @@ 4.0.0 - io.entgra.device.mgt.core heart-beat-feature pom Entgra - Heart Beat Feature diff --git a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml index 8eb71945f7..4e6249cba0 100644 --- a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml +++ b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml @@ -39,7 +39,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension org.wso2.orbit.com.nimbusds @@ -96,7 +96,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.identity.jwt.client.extension:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.identity.jwt.client.extension:${carbon.device.mgt.version} org.wso2.orbit.com.nimbusds:nimbus-jose-jwt:${nimbus.orbit.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 b532c1f511..90ca4df5b5 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 @@ -51,7 +51,7 @@ io.entgra.device.mgt.core - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.logger @@ -104,7 +104,7 @@ - io.entgra.device.mgt.core:io.entgra.notification.logger:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.notification.logger:${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index 9c573bf185..0c91df0257 100644 --- a/pom.xml +++ b/pom.xml @@ -34,10 +34,10 @@ - - + components/heartbeat-management + components/device-mgt components/device-mgt-extensions - + components/identity-extensions components/apimgt-extensions components/application-mgt components/policy-mgt @@ -46,24 +46,24 @@ components/transport-mgt components/analytics-mgt components/webapp-authenticator-framework - + components/logger components/task-mgt components/subtype-mgt components/tenant-mgt components/operation-template-mgt - + features/device-mgt features/apimgt-extensions features/application-mgt features/policy-mgt features/certificate-mgt - + features/heartbeat-management features/ui-request-interceptor - + features/jwt-client features/device-mgt-extensions features/transport-mgt features/analytics-mgt features/webapp-authenticator-framework - + features/logger features/task-mgt features/subtype-mgt features/tenant-mgt @@ -296,7 +296,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension ${carbon.device.mgt.version} @@ -307,7 +307,7 @@ io.entgra.device.mgt.core - io.entgra.server.bootup.heartbeat.beacon + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon ${carbon.device.mgt.version} @@ -347,7 +347,7 @@ io.entgra.device.mgt.core - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.logger ${carbon.device.mgt.version}