From 798f9daa69249a83f42383c8f46e22307f3bf956 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 3 May 2023 14:46:47 +0530 Subject: [PATCH] refactor packaging of mobile puglins --- .../pom.xml | 12 +-- .../android/api}/bean/AndroidOperation.java | 2 +- .../bean/AndroidPlatformConfiguration.java | 2 +- .../android/api}/bean/AppRestriction.java | 2 +- .../api}/bean/ApplicationInstallation.java | 2 +- .../api}/bean/ApplicationUninstallation.java | 2 +- .../android/api}/bean/ApplicationUpdate.java | 2 +- .../api}/bean/BlacklistApplications.java | 2 +- .../mobile/android/api}/bean/Camera.java | 2 +- .../android/api}/bean/DeviceEncryption.java | 2 +- .../mobile/android/api}/bean/DeviceLock.java | 2 +- .../mobile/android/api}/bean/DeviceState.java | 2 +- .../android/api}/bean/Disenrollment.java | 2 +- .../android/api}/bean/ErrorListItem.java | 2 +- .../android/api}/bean/ErrorResponse.java | 2 +- .../android/api}/bean/FileTransfer.java | 3 +- .../mobile/android/api}/bean/LockCode.java | 2 +- .../android/api}/bean/Notification.java | 2 +- .../android/api}/bean/NotifierFrequency.java | 2 +- .../android/api}/bean/PasscodePolicy.java | 2 +- .../android/api}/bean/UpgradeFirmware.java | 2 +- .../plugins/mobile/android/api}/bean/Vpn.java | 2 +- .../mobile/android/api}/bean/WebClip.java | 2 +- .../mobile/android/api}/bean/Wifi.java | 2 +- .../mobile/android/api}/bean/WipeData.java | 2 +- .../api}/bean/wrapper/AndroidApplication.java | 2 +- .../api}/bean/wrapper/AndroidDevice.java | 2 +- .../api}/bean/wrapper/AndroidDeviceInfo.java | 2 +- .../wrapper/AppRestrictionBeanWrapper.java | 4 +- .../ApplicationInstallationBeanWrapper.java | 4 +- .../ApplicationUninstallationBeanWrapper.java | 4 +- .../wrapper/ApplicationUpdateBeanWrapper.java | 4 +- .../BlacklistApplicationsBeanWrapper.java | 4 +- .../api}/bean/wrapper/CameraBeanWrapper.java | 4 +- .../bean/wrapper/DeviceEnrollmentInfo.java | 2 +- .../bean/wrapper/DeviceLockBeanWrapper.java | 4 +- .../wrapper/DisenrollmentBeanWrapper.java | 4 +- .../bean/wrapper/EncryptionBeanWrapper.java | 4 +- .../api}/bean/wrapper/EventBeanWrapper.java | 2 +- .../bean/wrapper/FileTransferBeanWrapper.java | 4 +- .../bean/wrapper/LockCodeBeanWrapper.java | 4 +- .../bean/wrapper/NotificationBeanWrapper.java | 4 +- .../wrapper/PasswordPolicyBeanWrapper.java | 4 +- .../wrapper/UpgradeFirmwareBeanWrapper.java | 4 +- .../api}/bean/wrapper/VpnBeanWrapper.java | 4 +- .../api}/bean/wrapper/WebClipBeanWrapper.java | 4 +- .../api}/bean/wrapper/WifiBeanWrapper.java | 4 +- .../bean/wrapper/WipeDataBeanWrapper.java | 4 +- .../android/api}/common/ErrorHandler.java | 4 +- .../android/api}/common/ErrorMessage.java | 2 +- .../api}/common/GsonMessageBodyHandler.java | 2 +- .../api}/common/ValidationInterceptor.java | 2 +- .../api}/exception/AndroidAgentException.java | 2 +- .../exception/AndroidOperationException.java | 4 +- .../api}/exception/BadRequestException.java | 4 +- .../android/api}/exception/ErrorDTO.java | 2 +- .../api}/exception/ForbiddenException.java | 4 +- .../api}/exception/GlobalThrowableMapper.java | 4 +- .../api}/exception/NotFoundException.java | 6 +- .../OperationConfigurationException.java | 2 +- .../ParameterValidationException.java | 6 +- .../UnexpectedServerErrorException.java | 6 +- .../DeviceManagementAdminService.java | 17 ++-- .../services/DeviceManagementService.java | 8 +- .../DeviceTypeConfigurationService.java | 8 +- .../api}/services/EventReceiverService.java | 8 +- .../DeviceManagementAdminServiceImpl.java | 78 +++++++++---------- .../impl/DeviceManagementServiceImpl.java | 28 +++---- .../DeviceTypeConfigurationServiceImpl.java | 19 ++--- .../impl/EventReceiverServiceImpl.java | 19 ++--- .../android/api}/util/AndroidAPIUtils.java | 2 +- .../android/api}/util/AndroidConstants.java | 2 +- .../android/api}/util/AndroidDeviceUtils.java | 10 +-- .../android/api}/util/ApiOriginFilter.java | 2 +- .../android/api}/util/DeviceIDHolder.java | 2 +- .../mobile/android/api}/util/Message.java | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 16 ++-- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../DeviceManagementAdminServiceTests.java | 10 +-- .../api}/DeviceManagementServiceTests.java | 20 ++--- ...licationManagementProviderServiceMock.java | 2 +- .../DeviceInformationManagerServiceMock.java | 2 +- .../DeviceManagementProviderServiceMock.java | 4 +- .../NotificationManagementServiceMock.java | 2 +- .../api}/mocks/PolicyManagerServiceMock.java | 2 +- .../mobile/android/api}/utils/TestUtils.java | 41 ++-------- .../src/test/resources/testng.xml | 4 +- .../pom.xml | 2 +- .../mobile/android/emulator}/Constants.java | 2 +- .../mobile/android/emulator}/TryIt.java | 2 +- .../android/emulator}/TryItEmulator.java | 2 +- .../impl/AndroidDeviceManagementService.java | 6 +- .../android/impl/AndroidDeviceManager.java | 20 ++--- .../android/impl/AndroidFeatureManager.java | 14 ++-- .../impl/AndroidPolicyMonitoringManager.java | 2 +- .../MobileDeviceConfigurationManager.java | 4 +- .../config/MobileDeviceManagementConfig.java | 2 +- .../MobileDeviceManagementRepository.java | 6 +- .../datasource/DataSourceConfigAdapter.java | 2 +- .../datasource/JNDILookupDefinition.java | 2 +- .../datasource/MobileDataSourceConfig.java | 2 +- .../MobileDataSourceConfigurations.java | 2 +- .../impl/config/task/TaskConfiguration.java | 2 +- ...tractMobileDeviceManagementDAOFactory.java | 10 +-- .../android/impl/dao/AndroidDAOFactory.java | 6 +- .../AndroidFeatureManagementDAOException.java | 2 +- .../android/impl/dao/MobileDeviceDAO.java | 4 +- .../MobileDeviceManagementDAOException.java | 2 +- .../dao/MobileDeviceManagementDAOFactory.java | 2 +- .../android/impl/dao/MobileFeatureDAO.java | 4 +- .../impl/dao/impl/AndroidDeviceDAOImpl.java | 16 ++-- .../impl/AndroidDeviceMgtPluginException.java | 2 +- .../impl/dao/impl/AndroidFeatureDAOImpl.java | 16 ++-- .../impl/dao/impl/MobileFeatureDAOImpl.java | 10 +-- .../util/MobileDeviceManagementDAOUtil.java | 2 +- .../mobile/android/impl/dto/MobileDevice.java | 2 +- .../dto/MobileDeviceOperationMapping.java | 2 +- .../android/impl/dto/MobileFeature.java | 2 +- .../impl/dto/MobileFeatureProperty.java | 2 +- .../android/impl/dto/MobileOperation.java | 2 +- .../impl/dto/MobileOperationProperty.java | 2 +- .../impl/util/AndroidPluginConstants.java | 2 +- .../android/impl/util/AndroidPluginUtils.java | 4 +- .../android/impl/util/AndroidUtils.java | 2 +- .../impl/util/MobileDeviceManagementUtil.java | 16 ++-- .../AndroidDeviceManagementDataHolder.java | 2 +- ...droidDeviceManagementServiceComponent.java | 4 +- 127 files changed, 329 insertions(+), 364 deletions(-) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/AndroidOperation.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/AndroidPlatformConfiguration.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/AppRestriction.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/ApplicationInstallation.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/ApplicationUninstallation.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/ApplicationUpdate.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/BlacklistApplications.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/Camera.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/DeviceEncryption.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/DeviceLock.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/DeviceState.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/Disenrollment.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/ErrorListItem.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/ErrorResponse.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/FileTransfer.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/LockCode.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/Notification.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/NotifierFrequency.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/PasscodePolicy.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/UpgradeFirmware.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/Vpn.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/WebClip.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/Wifi.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/WipeData.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/AndroidApplication.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/AndroidDevice.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/AndroidDeviceInfo.java (99%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/AppRestrictionBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/ApplicationInstallationBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/ApplicationUninstallationBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/ApplicationUpdateBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/BlacklistApplicationsBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/CameraBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/DeviceEnrollmentInfo.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/DeviceLockBeanWrapper.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/DisenrollmentBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/EncryptionBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/EventBeanWrapper.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/FileTransferBeanWrapper.java (93%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/LockCodeBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/NotificationBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/PasswordPolicyBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/UpgradeFirmwareBeanWrapper.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/VpnBeanWrapper.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/WebClipBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/WifiBeanWrapper.java (91%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/bean/wrapper/WipeDataBeanWrapper.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/common/ErrorHandler.java (88%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/common/ErrorMessage.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/common/GsonMessageBodyHandler.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/common/ValidationInterceptor.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/AndroidAgentException.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/AndroidOperationException.java (89%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/BadRequestException.java (87%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/ErrorDTO.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/ForbiddenException.java (90%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/GlobalThrowableMapper.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/NotFoundException.java (87%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/OperationConfigurationException.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/ParameterValidationException.java (89%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/exception/UnexpectedServerErrorException.java (87%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/DeviceManagementAdminService.java (99%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/DeviceManagementService.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/DeviceTypeConfigurationService.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/EventReceiverService.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/impl/DeviceManagementAdminServiceImpl.java (93%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/impl/DeviceManagementServiceImpl.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/impl/DeviceTypeConfigurationServiceImpl.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/services/impl/EventReceiverServiceImpl.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/util/AndroidAPIUtils.java (99%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/util/AndroidConstants.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/util/AndroidDeviceUtils.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/util/ApiOriginFilter.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/util/DeviceIDHolder.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/util/Message.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/DeviceManagementAdminServiceTests.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/DeviceManagementServiceTests.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/mocks/ApplicationManagementProviderServiceMock.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/mocks/DeviceInformationManagerServiceMock.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/mocks/DeviceManagementProviderServiceMock.java (99%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/mocks/NotificationManagementServiceMock.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/mocks/PolicyManagerServiceMock.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/{org/wso2/carbon/mdm/services/android => io/entgra/device/mgt/plugins/mobile/android/api}/utils/TestUtils.java (89%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/{org.carbon.android.emulator => io/entgra/device/mgt/plugins/mobile/android/emulator}/Constants.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/{org.carbon.android.emulator => io/entgra/device/mgt/plugins/mobile/android/emulator}/TryIt.java (99%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/{org.carbon.android.emulator => io/entgra/device/mgt/plugins/mobile/android/emulator}/TryItEmulator.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/AndroidDeviceManagementService.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/AndroidDeviceManager.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/AndroidFeatureManager.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/AndroidPolicyMonitoringManager.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/MobileDeviceConfigurationManager.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/MobileDeviceManagementConfig.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/MobileDeviceManagementRepository.java (87%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/datasource/JNDILookupDefinition.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/datasource/MobileDataSourceConfig.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/config/task/TaskConfiguration.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java (89%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/AndroidDAOFactory.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/MobileDeviceDAO.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/MobileDeviceManagementDAOException.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java (92%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/MobileFeatureDAO.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java (98%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dto/MobileDevice.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dto/MobileDeviceOperationMapping.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dto/MobileFeature.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dto/MobileFeatureProperty.java (94%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dto/MobileOperation.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/dto/MobileOperationProperty.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/util/AndroidPluginConstants.java (97%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/util/AndroidPluginUtils.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/util/AndroidUtils.java (93%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/impl/util/MobileDeviceManagementUtil.java (95%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/internal/AndroidDeviceManagementDataHolder.java (96%) rename components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/{org/wso2/carbon/device/mgt => io/entgra/device/mgt/plugins}/mobile/android/internal/AndroidDeviceManagementServiceComponent.java (96%) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 6cc68645ff..6104b6695c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -53,7 +53,7 @@ org.jacoco jacoco-maven-plugin - ../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec @@ -69,8 +69,8 @@ report - ../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec - ../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/site + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site @@ -122,7 +122,7 @@ org.jacoco jacoco-maven-plugin - ../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec @@ -138,8 +138,8 @@ report - ../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec - ../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/site + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidOperation.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidOperation.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidOperation.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidOperation.java index 3361b90dc7..053f39fb09 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidOperation.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidOperation.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import com.google.gson.Gson; /* diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidPlatformConfiguration.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidPlatformConfiguration.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidPlatformConfiguration.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidPlatformConfiguration.java index 9832c3f035..143fa85afb 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidPlatformConfiguration.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidPlatformConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AppRestriction.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AppRestriction.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AppRestriction.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AppRestriction.java index 2c8d8c93db..79a4262b9d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AppRestriction.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AppRestriction.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationInstallation.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationInstallation.java index 4c90d42cb6..e6cf2742c0 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationInstallation.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUninstallation.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUninstallation.java index a5356ae59c..8a46282a64 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUninstallation.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUpdate.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUpdate.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUpdate.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUpdate.java index 95241b4443..aa0878fd2b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUpdate.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUpdate.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/BlacklistApplications.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/BlacklistApplications.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/BlacklistApplications.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/BlacklistApplications.java index b7db289767..d3a187bbaf 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/BlacklistApplications.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/BlacklistApplications.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Camera.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Camera.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Camera.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Camera.java index 0dad70364a..dd721b36c4 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Camera.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Camera.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceEncryption.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceEncryption.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceEncryption.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceEncryption.java index 68ab6ae947..f44deb4853 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceEncryption.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceEncryption.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceLock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceLock.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceLock.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceLock.java index e76ff6f1a1..c5dad6cce1 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceLock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceLock.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceState.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceState.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceState.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceState.java index fb23b0fcc9..92f813e4d7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/DeviceState.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceState.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Disenrollment.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Disenrollment.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Disenrollment.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Disenrollment.java index c591d2ae0a..05250e27ce 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Disenrollment.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Disenrollment.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ErrorListItem.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorListItem.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ErrorListItem.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorListItem.java index 1e48b01833..f01ca8c393 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ErrorListItem.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorListItem.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ErrorResponse.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorResponse.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ErrorResponse.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorResponse.java index 457782adea..46b32e227a 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ErrorResponse.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorResponse.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/FileTransfer.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/FileTransfer.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/FileTransfer.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/FileTransfer.java index 2e8af23a7c..910ce52641 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/FileTransfer.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/FileTransfer.java @@ -15,11 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.AndroidOperation; import java.io.Serializable; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/LockCode.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/LockCode.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/LockCode.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/LockCode.java index 4c2764dade..403b614188 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/LockCode.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/LockCode.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Notification.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Notification.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Notification.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Notification.java index 7cc4d46273..c5d29cd60a 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Notification.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Notification.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/NotifierFrequency.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/NotifierFrequency.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/NotifierFrequency.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/NotifierFrequency.java index e7061ae915..79963a69e4 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/NotifierFrequency.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/NotifierFrequency.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/PasscodePolicy.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/PasscodePolicy.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/PasscodePolicy.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/PasscodePolicy.java index c2e48ce70c..37bb4d72f7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/PasscodePolicy.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/PasscodePolicy.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/UpgradeFirmware.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/UpgradeFirmware.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/UpgradeFirmware.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/UpgradeFirmware.java index 748ee0e598..340209a12e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/UpgradeFirmware.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/UpgradeFirmware.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Vpn.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Vpn.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Vpn.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Vpn.java index 188d44f8fc..a18c27657e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Vpn.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Vpn.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/WebClip.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WebClip.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/WebClip.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WebClip.java index cf39b10703..605ad70e06 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/WebClip.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WebClip.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Wifi.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Wifi.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Wifi.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Wifi.java index 8cdf3c58bb..c74959c0a1 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/Wifi.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Wifi.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/WipeData.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WipeData.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/WipeData.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WipeData.java index 83efddc126..aed8f36b00 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/WipeData.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WipeData.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean; +package io.entgra.device.mgt.plugins.mobile.android.api.bean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidApplication.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidApplication.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidApplication.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidApplication.java index 8dee1a60d0..1765ec4140 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidApplication.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidApplication.java @@ -1,4 +1,4 @@ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDevice.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDevice.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDevice.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDevice.java index 6c5fcec34d..ffbfdec362 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDevice.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDevice.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.device.mgt.common.Device; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDeviceInfo.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDeviceInfo.java similarity index 99% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDeviceInfo.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDeviceInfo.java index 41fbb58570..c5924104bb 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDeviceInfo.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDeviceInfo.java @@ -1,4 +1,4 @@ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AppRestrictionBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AppRestrictionBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AppRestrictionBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AppRestrictionBeanWrapper.java index 64412336e0..c18a35091a 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AppRestrictionBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AppRestrictionBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.AppRestriction; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.AppRestriction; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationInstallationBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationInstallationBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationInstallationBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationInstallationBeanWrapper.java index b0bd54cf30..a47d0c8178 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationInstallationBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationInstallationBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.ApplicationInstallation; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationInstallation; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationUninstallationBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUninstallationBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationUninstallationBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUninstallationBeanWrapper.java index 28c72c6cd0..b0fc5dcbc7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationUninstallationBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUninstallationBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.ApplicationUninstallation; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUninstallation; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationUpdateBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUpdateBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationUpdateBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUpdateBeanWrapper.java index b202bf8833..127bd4c4e8 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/ApplicationUpdateBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUpdateBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.ApplicationUpdate; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUpdate; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/BlacklistApplicationsBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/BlacklistApplicationsBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/BlacklistApplicationsBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/BlacklistApplicationsBeanWrapper.java index 32b107bf46..008efa5de4 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/BlacklistApplicationsBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/BlacklistApplicationsBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.BlacklistApplications; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.BlacklistApplications; import javax.validation.Valid; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/CameraBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/CameraBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/CameraBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/CameraBeanWrapper.java index 9f9a014f2c..33a340406e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/CameraBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/CameraBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Camera; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.Camera; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DeviceEnrollmentInfo.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceEnrollmentInfo.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DeviceEnrollmentInfo.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceEnrollmentInfo.java index b2f77cc31b..91428aab4c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DeviceEnrollmentInfo.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceEnrollmentInfo.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DeviceLockBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceLockBeanWrapper.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DeviceLockBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceLockBeanWrapper.java index bd668fabaf..13c9774fe7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DeviceLockBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceLockBeanWrapper.java @@ -16,11 +16,11 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.DeviceLock; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceLock; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DisenrollmentBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DisenrollmentBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DisenrollmentBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DisenrollmentBeanWrapper.java index fdcab01203..da14cc6541 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/DisenrollmentBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DisenrollmentBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.Disenrollment; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Disenrollment; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/EncryptionBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EncryptionBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/EncryptionBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EncryptionBeanWrapper.java index aeb01400aa..c3a1461374 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/EncryptionBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EncryptionBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceEncryption; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.DeviceEncryption; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/EventBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EventBeanWrapper.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/EventBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EventBeanWrapper.java index c4fb13e07b..ddfaa1bf4f 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/EventBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EventBeanWrapper.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/FileTransferBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/FileTransferBeanWrapper.java similarity index 93% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/FileTransferBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/FileTransferBeanWrapper.java index d34b00e664..b4394709b0 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/FileTransferBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/FileTransferBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.FileTransfer; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.FileTransfer; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/LockCodeBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/LockCodeBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/LockCodeBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/LockCodeBeanWrapper.java index 364fd39d28..aca8c5f794 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/LockCodeBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/LockCodeBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.LockCode; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.LockCode; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/NotificationBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/NotificationBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/NotificationBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/NotificationBeanWrapper.java index eb82e49ee7..9c595a3d2c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/NotificationBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/NotificationBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Notification; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.Notification; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/PasswordPolicyBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/PasswordPolicyBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/PasswordPolicyBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/PasswordPolicyBeanWrapper.java index e47ece1c5a..5b9071a605 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/PasswordPolicyBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/PasswordPolicyBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.PasscodePolicy; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.PasscodePolicy; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/UpgradeFirmwareBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/UpgradeFirmwareBeanWrapper.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/UpgradeFirmwareBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/UpgradeFirmwareBeanWrapper.java index b881422c29..8569a60966 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/UpgradeFirmwareBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/UpgradeFirmwareBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.UpgradeFirmware; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.UpgradeFirmware; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/VpnBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/VpnBeanWrapper.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/VpnBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/VpnBeanWrapper.java index e71270d229..10e311ea6d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/VpnBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/VpnBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.Vpn; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Vpn; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WebClipBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WebClipBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WebClipBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WebClipBeanWrapper.java index fb2edc239b..5c59d982be 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WebClipBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WebClipBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.WebClip; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.WebClip; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WifiBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WifiBeanWrapper.java similarity index 91% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WifiBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WifiBeanWrapper.java index 2d63a27d9c..bfc4dfb952 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WifiBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WifiBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Wifi; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.Wifi; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WipeDataBeanWrapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WipeDataBeanWrapper.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WipeDataBeanWrapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WipeDataBeanWrapper.java index b7ebb2903c..20c12edadf 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/WipeDataBeanWrapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WipeDataBeanWrapper.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.bean.wrapper; +package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.WipeData; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.mdm.services.android.bean.WipeData; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ErrorHandler.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorHandler.java similarity index 88% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ErrorHandler.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorHandler.java index 542cd6078b..c5015d004c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ErrorHandler.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorHandler.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.common; +package io.entgra.device.mgt.plugins.mobile.android.api.common; -import org.wso2.carbon.mdm.services.android.exception.AndroidAgentException; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.AndroidAgentException; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ErrorMessage.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorMessage.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ErrorMessage.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorMessage.java index fd880c04ce..a2f2ce3e0b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ErrorMessage.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorMessage.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.common; +package io.entgra.device.mgt.plugins.mobile.android.api.common; public class ErrorMessage { diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/GsonMessageBodyHandler.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/GsonMessageBodyHandler.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/GsonMessageBodyHandler.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/GsonMessageBodyHandler.java index 2976300290..80ce6fe9bc 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/GsonMessageBodyHandler.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/GsonMessageBodyHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.common; +package io.entgra.device.mgt.plugins.mobile.android.api.common; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ValidationInterceptor.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ValidationInterceptor.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ValidationInterceptor.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ValidationInterceptor.java index a563f09d11..c1555e58b0 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/common/ValidationInterceptor.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ValidationInterceptor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.common; +package io.entgra.device.mgt.plugins.mobile.android.api.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/AndroidAgentException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidAgentException.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/AndroidAgentException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidAgentException.java index c12d035383..648b2799d3 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/AndroidAgentException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidAgentException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; /** * diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/AndroidOperationException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidOperationException.java similarity index 89% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/AndroidOperationException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidOperationException.java index 8c68866d83..8ca3ff722e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/AndroidOperationException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidOperationException.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; -import org.wso2.carbon.mdm.services.android.util.Message; +import io.entgra.device.mgt.plugins.mobile.android.api.util.Message; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/BadRequestException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/BadRequestException.java similarity index 87% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/BadRequestException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/BadRequestException.java index 5fa5ededc6..5b5f185efc 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/BadRequestException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/BadRequestException.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ErrorDTO.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ErrorDTO.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ErrorDTO.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ErrorDTO.java index ebd5ec8fc9..1c80621d35 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ErrorDTO.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ErrorDTO.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; import java.util.ArrayList; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ForbiddenException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ForbiddenException.java similarity index 90% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ForbiddenException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ForbiddenException.java index 75113f8501..577b0a6160 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ForbiddenException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ForbiddenException.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/GlobalThrowableMapper.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/GlobalThrowableMapper.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/GlobalThrowableMapper.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/GlobalThrowableMapper.java index 31370bd88e..3bccee14a1 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/GlobalThrowableMapper.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/GlobalThrowableMapper.java @@ -16,12 +16,12 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; import com.google.gson.JsonParseException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils; import javax.naming.AuthenticationException; import javax.validation.ConstraintViolationException; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/NotFoundException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/NotFoundException.java similarity index 87% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/NotFoundException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/NotFoundException.java index 53863c3acd..3a66e15176 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/NotFoundException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/NotFoundException.java @@ -16,10 +16,10 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/OperationConfigurationException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/OperationConfigurationException.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/OperationConfigurationException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/OperationConfigurationException.java index 1300b14812..b51ad40093 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/OperationConfigurationException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/OperationConfigurationException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; /** * diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ParameterValidationException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ParameterValidationException.java similarity index 89% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ParameterValidationException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ParameterValidationException.java index efb38a3d7a..761a761ade 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/ParameterValidationException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ParameterValidationException.java @@ -16,10 +16,10 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; -import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils; import javax.validation.ConstraintViolation; import javax.ws.rs.WebApplicationException; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/UnexpectedServerErrorException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/UnexpectedServerErrorException.java similarity index 87% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/UnexpectedServerErrorException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/UnexpectedServerErrorException.java index a66c2f506c..384ea3013c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/exception/UnexpectedServerErrorException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/UnexpectedServerErrorException.java @@ -16,10 +16,10 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.exception; +package io.entgra.device.mgt.plugins.mobile.android.api.exception; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java similarity index 99% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java index 0f59e06668..5542c9459e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java @@ -16,8 +16,11 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services; +package io.entgra.device.mgt.plugins.mobile.android.api.services; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*; import io.swagger.annotations.SwaggerDefinition; import io.swagger.annotations.Info; import io.swagger.annotations.ExtensionProperty; @@ -32,8 +35,6 @@ import io.swagger.annotations.ResponseHeader; import org.wso2.carbon.apimgt.annotations.api.Scope; import org.wso2.carbon.apimgt.annotations.api.Scopes; import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; -import org.wso2.carbon.mdm.services.android.bean.wrapper.*; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; import javax.validation.Valid; import javax.ws.rs.Consumes; @@ -866,7 +867,7 @@ public interface DeviceManagementAdminService { value = "Provide the the passcode, which is the passcode that the Android agent prompts the device owner to set at the time of device enrollment, " + "to enable the factory reset operation, and the ID of the Android device. Multiple device IDs can be added by using comma separated values. ", required = true) - WipeDataBeanWrapper wipeDataBeanWrapper); + WipeDataBeanWrapper wipeDataBeanWrapper); @POST @Path("/applications") @@ -1301,7 +1302,7 @@ public interface DeviceManagementAdminService { "URL and name of the application, the date and time for the scheduled installation, and the ID of the" + "Android device. Multiple device IDs can be added by using comma separated values.", required = true) - ApplicationUninstallationBeanWrapper applicationUninstallationBeanWrapper); + ApplicationUninstallationBeanWrapper applicationUninstallationBeanWrapper); @POST @Path("/blacklist-applications") @@ -1491,7 +1492,7 @@ public interface DeviceManagementAdminService { name = "vpnBean", value = "VPN configuration and DeviceIds", required = true) - VpnBeanWrapper vpnBeanWrapper); + VpnBeanWrapper vpnBeanWrapper); @POST @Path("/send-notification") @@ -1614,7 +1615,7 @@ public interface DeviceManagementAdminService { "the ssid or the name of the Wi-Fi network that you wish to configure and the ID of the Android device." + " Multiple device IDs can be added by using comma separated values.", required = true) - WifiBeanWrapper wifiBeanWrapper); + WifiBeanWrapper wifiBeanWrapper); @POST @Path("/encrypt-storage") @@ -1676,7 +1677,7 @@ public interface DeviceManagementAdminService { "true as the value or do not encrypt the storage on the device by assigning false as the value and " + "provide the ID of the Android device. Multiple device IDs can be added by using comma separated values.", required = true) - EncryptionBeanWrapper encryptionBeanWrapper); + EncryptionBeanWrapper encryptionBeanWrapper); @POST @Path("/change-lock-code") diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementService.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java index 48cf3ee0a4..ab28260278 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java @@ -16,16 +16,16 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services; +package io.entgra.device.mgt.plugins.mobile.android.api.services; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import io.swagger.annotations.*; import org.wso2.carbon.apimgt.annotations.api.Scope; import org.wso2.carbon.apimgt.annotations.api.Scopes; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidApplication; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java index dc7bc1262a..a46457b784 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java @@ -16,8 +16,10 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services; +package io.entgra.device.mgt.plugins.mobile.android.api.services; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.AndroidAgentException; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import io.swagger.annotations.SwaggerDefinition; import io.swagger.annotations.Info; import io.swagger.annotations.ExtensionProperty; @@ -32,9 +34,7 @@ import io.swagger.annotations.ResponseHeader; import org.wso2.carbon.apimgt.annotations.api.Scope; import org.wso2.carbon.apimgt.annotations.api.Scopes; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; -import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration; -import org.wso2.carbon.mdm.services.android.exception.AndroidAgentException; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.AndroidPlatformConfiguration; import javax.validation.Valid; import javax.ws.rs.*; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/EventReceiverService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/EventReceiverService.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java index e76e76e0f6..40c831e0fd 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/EventReceiverService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java @@ -16,8 +16,9 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services; +package io.entgra.device.mgt.plugins.mobile.android.api.services; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import io.swagger.annotations.SwaggerDefinition; import io.swagger.annotations.Info; import io.swagger.annotations.ExtensionProperty; @@ -31,9 +32,8 @@ import io.swagger.annotations.ApiResponses; import io.swagger.annotations.ResponseHeader; import org.wso2.carbon.apimgt.annotations.api.Scope; import org.wso2.carbon.apimgt.annotations.api.Scopes; -import org.wso2.carbon.mdm.services.android.bean.DeviceState; -import org.wso2.carbon.mdm.services.android.bean.wrapper.EventBeanWrapper; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceState; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EventBeanWrapper; import javax.validation.Valid; import javax.validation.constraints.Size; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementAdminServiceImpl.java similarity index 93% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementAdminServiceImpl.java index 3aed2ce483..e670acab0c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementAdminServiceImpl.java @@ -16,8 +16,13 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services.impl; +package io.entgra.device.mgt.plugins.mobile.android.api.services.impl; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.plugins.mobile.android.api.services.DeviceManagementAdminService; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; @@ -28,44 +33,39 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; -import org.wso2.carbon.mdm.services.android.bean.ApplicationInstallation; -import org.wso2.carbon.mdm.services.android.bean.ApplicationUninstallation; -import org.wso2.carbon.mdm.services.android.bean.ApplicationUpdate; -import org.wso2.carbon.mdm.services.android.bean.BlacklistApplications; -import org.wso2.carbon.mdm.services.android.bean.Camera; -import org.wso2.carbon.mdm.services.android.bean.DeviceEncryption; -import org.wso2.carbon.mdm.services.android.bean.DeviceLock; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.bean.FileTransfer; -import org.wso2.carbon.mdm.services.android.bean.LockCode; -import org.wso2.carbon.mdm.services.android.bean.Notification; -import org.wso2.carbon.mdm.services.android.bean.PasscodePolicy; -import org.wso2.carbon.mdm.services.android.bean.UpgradeFirmware; -import org.wso2.carbon.mdm.services.android.bean.Vpn; -import org.wso2.carbon.mdm.services.android.bean.WebClip; -import org.wso2.carbon.mdm.services.android.bean.Wifi; -import org.wso2.carbon.mdm.services.android.bean.WipeData; -import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationInstallationBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUninstallationBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUpdateBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.BlacklistApplicationsBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.CameraBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.DeviceLockBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.EncryptionBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.FileTransferBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.LockCodeBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.NotificationBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.PasswordPolicyBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.UpgradeFirmwareBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.VpnBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.WebClipBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.WifiBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.WipeDataBeanWrapper; -import org.wso2.carbon.mdm.services.android.exception.BadRequestException; -import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException; -import org.wso2.carbon.mdm.services.android.services.DeviceManagementAdminService; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; -import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationInstallation; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUninstallation; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUpdate; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.BlacklistApplications; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Camera; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceEncryption; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceLock; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.FileTransfer; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.LockCode; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Notification; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.PasscodePolicy; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.UpgradeFirmware; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Vpn; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.WebClip; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.Wifi; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.WipeData; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.ApplicationInstallationBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.ApplicationUninstallationBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.ApplicationUpdateBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.BlacklistApplicationsBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.CameraBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.DeviceLockBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EncryptionBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.FileTransferBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.LockCodeBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.NotificationBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.PasswordPolicyBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.UpgradeFirmwareBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.VpnBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.WebClipBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.WifiBeanWrapper; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.WipeDataBeanWrapper; import javax.validation.Valid; import javax.ws.rs.Consumes; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementServiceImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementServiceImpl.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementServiceImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementServiceImpl.java index 9b3a0aec6b..cf6f75211b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementServiceImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementServiceImpl.java @@ -16,8 +16,16 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services.impl; +package io.entgra.device.mgt.plugins.mobile.android.api.services.impl; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.NotFoundException; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.plugins.mobile.android.api.services.DeviceManagementService; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.util.Message; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Device; @@ -35,15 +43,9 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceExce import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException; import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager; import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice; -import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException; -import org.wso2.carbon.mdm.services.android.services.DeviceManagementService; -import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; -import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils; -import org.wso2.carbon.mdm.services.android.util.Message; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidApplication; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice; import org.wso2.carbon.policy.mgt.common.PolicyManagementException; import org.wso2.carbon.policy.mgt.core.PolicyManagerService; @@ -249,7 +251,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { if (androidDevice == null) { String errorMessage = "The payload of the android device enrollment is incorrect."; log.error(errorMessage); - throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException( + throw new BadRequestException( new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build()); } try { @@ -398,13 +400,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { if (androidDevice == null) { String errorMessage = "The payload of the android device enrollment is incorrect."; log.error(errorMessage); - throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException( + throw new BadRequestException( new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build()); } if (device == null) { String errorMessage = "The device to be modified doesn't exist."; log.error(errorMessage); - throw new org.wso2.carbon.mdm.services.android.exception.NotFoundException( + throw new NotFoundException( new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage(errorMessage).build()); } if(androidDevice.getEnrolmentInfo() != null){ diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceTypeConfigurationServiceImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceTypeConfigurationServiceImpl.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceTypeConfigurationServiceImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceTypeConfigurationServiceImpl.java index 7c813b2fcb..50f7fcf226 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceTypeConfigurationServiceImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceTypeConfigurationServiceImpl.java @@ -16,8 +16,13 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services.impl; +package io.entgra.device.mgt.plugins.mobile.android.api.services.impl; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.plugins.mobile.android.api.services.DeviceTypeConfigurationService; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Device; @@ -31,13 +36,9 @@ import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; -import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.bean.NotifierFrequency; -import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException; -import org.wso2.carbon.mdm.services.android.services.DeviceTypeConfigurationService; -import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.AndroidPlatformConfiguration; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.NotifierFrequency; import javax.validation.Valid; import javax.ws.rs.Consumes; @@ -104,7 +105,7 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati if (androidPlatformConfiguration == null) { String errorMessage = "The payload of the android platform configuration is incorrect."; log.error(errorMessage); - throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException( + throw new BadRequestException( new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build()); } configuration.setConfiguration(androidPlatformConfiguration.getConfiguration()); diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/EventReceiverServiceImpl.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/EventReceiverServiceImpl.java index 8ac4301838..0367340b8f 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/EventReceiverServiceImpl.java @@ -16,10 +16,13 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.services.impl; +package io.entgra.device.mgt.plugins.mobile.android.api.services.impl; import com.google.gson.Gson; import com.google.gson.JsonObject; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.plugins.mobile.android.api.services.EventReceiverService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Device; @@ -27,17 +30,8 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; -import org.wso2.carbon.mdm.services.android.bean.DeviceState; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.bean.wrapper.EventBeanWrapper; -import org.wso2.carbon.mdm.services.android.exception.BadRequestException; -import org.wso2.carbon.mdm.services.android.exception.NotFoundException; -import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException; -import org.wso2.carbon.mdm.services.android.services.EventReceiverService; -import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; -import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils; -import org.wso2.carbon.mdm.services.android.util.Message; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EventBeanWrapper; import javax.validation.Valid; import javax.validation.constraints.Size; @@ -47,7 +41,6 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; -import java.util.List; @Path("/events") public class EventReceiverServiceImpl implements EventReceiverService { diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidAPIUtils.java similarity index 99% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidAPIUtils.java index 15928d80ee..7f98083212 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidAPIUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.util; +package io.entgra.device.mgt.plugins.mobile.android.api.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidConstants.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidConstants.java index d7491c916c..9f9ea2b3f4 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidConstants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.util; +package io.entgra.device.mgt.plugins.mobile.android.api.util; /** * Defines constants used in Android-REST API bundle. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidDeviceUtils.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidDeviceUtils.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidDeviceUtils.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidDeviceUtils.java index 542875b98b..01b4c7dccc 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidDeviceUtils.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidDeviceUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.util; +package io.entgra.device.mgt.plugins.mobile.android.api.util; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -45,16 +45,14 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceExce import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException; import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager; import org.wso2.carbon.device.mgt.core.search.mgt.impl.Utils; -import org.wso2.carbon.mdm.services.android.bean.DeviceState; -import org.wso2.carbon.mdm.services.android.bean.ErrorListItem; -import org.wso2.carbon.mdm.services.android.bean.ErrorResponse; -import org.wso2.carbon.mdm.services.android.exception.BadRequestException; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorListItem; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse; +import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException; import javax.validation.ConstraintViolation; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; /** diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/ApiOriginFilter.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/ApiOriginFilter.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/ApiOriginFilter.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/ApiOriginFilter.java index 455d582bb2..fa91e898ee 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/ApiOriginFilter.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/ApiOriginFilter.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.mdm.services.android.util; +package io.entgra.device.mgt.plugins.mobile.android.api.util; import javax.servlet.*; import javax.servlet.http.HttpServletResponse; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/DeviceIDHolder.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/DeviceIDHolder.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/DeviceIDHolder.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/DeviceIDHolder.java index 7b09fc7008..f917148d27 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/DeviceIDHolder.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/DeviceIDHolder.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.util; +package io.entgra.device.mgt.plugins.mobile.android.api.util; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/Message.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/Message.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/Message.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/Message.java index 34cafd064e..2fb2ff754b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/Message.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/Message.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.util; +package io.entgra.device.mgt.plugins.mobile.android.api.util; import javax.ws.rs.core.MediaType; import javax.xml.bind.annotation.XmlElement; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 4f0e65511a..adb11f8be7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -43,8 +43,8 @@ - - + + @@ -59,12 +59,12 @@ - - - - - - + + + + + + diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/web.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/web.xml index b624104319..6d3125afbe 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/web.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/web.xml @@ -76,7 +76,7 @@ ApiOriginFilter - org.wso2.carbon.mdm.services.android.util.ApiOriginFilter + io.entgra.device.mgt.plugins.mobile.android.api.util.ApiOriginFilter ApiOriginFilter diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/DeviceManagementAdminServiceTests.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/DeviceManagementAdminServiceTests.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java index 30e5474d78..8880cf6161 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/DeviceManagementAdminServiceTests.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java @@ -16,8 +16,10 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android; +package io.entgra.device.mgt.plugins.mobile.android.api; +import io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceManagementAdminServiceImpl; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; @@ -31,10 +33,8 @@ import org.testng.annotations.Test; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; -import org.wso2.carbon.mdm.services.android.mocks.DeviceManagementProviderServiceMock; -import org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementAdminServiceImpl; -import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils; -import org.wso2.carbon.mdm.services.android.utils.TestUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceManagementProviderServiceMock; +import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils; import javax.ws.rs.core.Response; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/DeviceManagementServiceTests.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementServiceTests.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/DeviceManagementServiceTests.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementServiceTests.java index 8c6e0afd1b..8ea0c558fb 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/DeviceManagementServiceTests.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementServiceTests.java @@ -16,8 +16,11 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android; +package io.entgra.device.mgt.plugins.mobile.android.api; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice; +import io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceManagementServiceImpl; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; @@ -32,15 +35,12 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice; -import org.wso2.carbon.mdm.services.android.mocks.ApplicationManagementProviderServiceMock; -import org.wso2.carbon.mdm.services.android.mocks.DeviceInformationManagerServiceMock; -import org.wso2.carbon.mdm.services.android.mocks.DeviceManagementProviderServiceMock; -import org.wso2.carbon.mdm.services.android.mocks.NotificationManagementServiceMock; -import org.wso2.carbon.mdm.services.android.mocks.PolicyManagerServiceMock; -import org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementServiceImpl; -import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils; -import org.wso2.carbon.mdm.services.android.utils.TestUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.mocks.ApplicationManagementProviderServiceMock; +import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceInformationManagerServiceMock; +import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceManagementProviderServiceMock; +import io.entgra.device.mgt.plugins.mobile.android.api.mocks.NotificationManagementServiceMock; +import io.entgra.device.mgt.plugins.mobile.android.api.mocks.PolicyManagerServiceMock; +import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils; import javax.ws.rs.core.Response; import java.util.ArrayList; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/ApplicationManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/ApplicationManagementProviderServiceMock.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/ApplicationManagementProviderServiceMock.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/ApplicationManagementProviderServiceMock.java index 1fe39c7312..2f7bb13ae9 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/ApplicationManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/ApplicationManagementProviderServiceMock.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.mocks; +package io.entgra.device.mgt.plugins.mobile.android.api.mocks; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceInformationManagerServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceInformationManagerServiceMock.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceInformationManagerServiceMock.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceInformationManagerServiceMock.java index 04c9946678..8c3d813474 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceInformationManagerServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceInformationManagerServiceMock.java @@ -1,4 +1,4 @@ -package org.wso2.carbon.mdm.services.android.mocks; +package io.entgra.device.mgt.plugins.mobile.android.api.mocks; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java similarity index 99% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java index 8c5da59d0c..4765433acd 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java @@ -33,7 +33,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.mocks; +package io.entgra.device.mgt.plugins.mobile.android.api.mocks; import org.wso2.carbon.device.mgt.common.ActivityPaginationRequest; import org.wso2.carbon.device.mgt.common.Device; @@ -77,7 +77,7 @@ import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo; -import org.wso2.carbon.mdm.services.android.utils.TestUtils; +import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils; import org.apache.commons.collections.map.SingletonMap; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/NotificationManagementServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/NotificationManagementServiceMock.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/NotificationManagementServiceMock.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/NotificationManagementServiceMock.java index bb5418b21d..7f8a74e6b8 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/NotificationManagementServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/NotificationManagementServiceMock.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.mocks; +package io.entgra.device.mgt.plugins.mobile.android.api.mocks; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/PolicyManagerServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/PolicyManagerServiceMock.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/PolicyManagerServiceMock.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/PolicyManagerServiceMock.java index b15f50a02c..f53cdb05cf 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/PolicyManagerServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/PolicyManagerServiceMock.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.mdm.services.android.mocks; +package io.entgra.device.mgt.plugins.mobile.android.api.mocks; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/utils/TestUtils.java similarity index 89% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/utils/TestUtils.java index cff3d8ca21..d946471fb7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/utils/TestUtils.java @@ -16,8 +16,12 @@ * under the License. */ -package org.wso2.carbon.mdm.services.android.utils; +package io.entgra.device.mgt.plugins.mobile.android.api.utils; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.*; +import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants; +import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; @@ -26,40 +30,7 @@ import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation; import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; -import org.wso2.carbon.mdm.services.android.bean.ApplicationInstallation; -import org.wso2.carbon.mdm.services.android.bean.ApplicationUninstallation; -import org.wso2.carbon.mdm.services.android.bean.ApplicationUpdate; -import org.wso2.carbon.mdm.services.android.bean.BlacklistApplications; -import org.wso2.carbon.mdm.services.android.bean.Camera; -import org.wso2.carbon.mdm.services.android.bean.DeviceEncryption; -import org.wso2.carbon.mdm.services.android.bean.DeviceLock; -import org.wso2.carbon.mdm.services.android.bean.LockCode; -import org.wso2.carbon.mdm.services.android.bean.Notification; -import org.wso2.carbon.mdm.services.android.bean.PasscodePolicy; -import org.wso2.carbon.mdm.services.android.bean.UpgradeFirmware; -import org.wso2.carbon.mdm.services.android.bean.Vpn; -import org.wso2.carbon.mdm.services.android.bean.WebClip; -import org.wso2.carbon.mdm.services.android.bean.Wifi; -import org.wso2.carbon.mdm.services.android.bean.WipeData; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication; -import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice; -import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationInstallationBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUninstallationBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUpdateBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.BlacklistApplicationsBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.CameraBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.DeviceLockBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.EncryptionBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.LockCodeBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.NotificationBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.PasswordPolicyBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.UpgradeFirmwareBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.VpnBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.WebClipBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.WifiBeanWrapper; -import org.wso2.carbon.mdm.services.android.bean.wrapper.WipeDataBeanWrapper; -import org.wso2.carbon.mdm.services.android.util.AndroidConstants; -import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils; + import java.util.ArrayList; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/resources/testng.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/resources/testng.xml index 865a1e85b4..46e9646d99 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/resources/testng.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/resources/testng.xml @@ -23,8 +23,8 @@ - - + + diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index 7ebced9bc3..28ea5a011a 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -42,7 +42,7 @@ true lib/ - org.carbon.android.emulator.TryIt + io.entgra.device.mgt.plugins.mobile.android.emulator.TryIt diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/Constants.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/Constants.java index d522c9f6a7..6fb4ee97f9 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/Constants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.carbon.android.emulator; +package io.entgra.device.mgt.plugins.mobile.android.emulator; import java.io.File; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryIt.java similarity index 99% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryIt.java index 31d60e46bc..08352d7c61 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryIt.java @@ -16,7 +16,7 @@ * under the License. */ -package org.carbon.android.emulator; +package io.entgra.device.mgt.plugins.mobile.android.emulator; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryItEmulator.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryItEmulator.java index d4ddd22652..9888157bfe 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryItEmulator.java @@ -16,7 +16,7 @@ * under the License. */ -package org.carbon.android.emulator; +package io.entgra.device.mgt.plugins.mobile.android.emulator; import java.io.BufferedReader; import java.io.File; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManagementService.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManagementService.java index 0965e014ed..216dd8832d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManagementService.java @@ -16,8 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManager; @@ -38,8 +39,7 @@ import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubsc import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypePlatformDetails; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginConstants; -import org.wso2.carbon.device.mgt.mobile.android.internal.AndroidDeviceManagementDataHolder; +import io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementDataHolder; import java.util.HashMap; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManager.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManager.java index b62390275b..e2cc81b876 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManager.java @@ -16,8 +16,14 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.mobile.android.impl; - +package io.entgra.device.mgt.plugins.mobile.android.impl; + +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AbstractMobileDeviceManagementDAOFactory; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidDAOFactory; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDevice; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Device; @@ -32,14 +38,8 @@ import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager; import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AbstractMobileDeviceManagementDAOFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidDAOFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileDevice; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginConstants; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginUtils; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.MobileDeviceManagementUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil; import org.wso2.carbon.registry.api.RegistryException; import org.wso2.carbon.registry.api.Resource; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidFeatureManager.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidFeatureManager.java index 1c9f3538db..087d7895c2 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidFeatureManager.java @@ -16,19 +16,19 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.mobile.android.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidDAOFactory; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOFactory; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileFeatureDAO; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Feature; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidDAOFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileFeatureDAO; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileFeature; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.MobileDeviceManagementUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil; import java.util.ArrayList; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringManager.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringManager.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java index 11d2f53325..1cbf90313f 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringManager.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java @@ -17,7 +17,7 @@ */ -package org.wso2.carbon.device.mgt.mobile.android.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceConfigurationManager.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceConfigurationManager.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java index ded87ad710..815ff8b47c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceConfigurationManager.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java @@ -16,11 +16,11 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config; +package io.entgra.device.mgt.plugins.mobile.android.impl.config; import org.w3c.dom.Document; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.MobileDeviceManagementUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil; import org.wso2.carbon.utils.CarbonUtils; import javax.xml.bind.JAXBContext; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementConfig.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementConfig.java index 2c65375c7b..591aec536d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config; +package io.entgra.device.mgt.plugins.mobile.android.impl.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementRepository.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementRepository.java similarity index 87% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementRepository.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementRepository.java index e40202acfe..aaee49a967 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementRepository.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementRepository.java @@ -16,10 +16,10 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config; +package io.entgra.device.mgt.plugins.mobile.android.impl.config; -import org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource.DataSourceConfigAdapter; -import org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource.MobileDataSourceConfig; +import io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource.DataSourceConfigAdapter; +import io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource.MobileDataSourceConfig; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java index 75a95c7c78..40b55119d6 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource; +package io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource; import javax.xml.bind.annotation.adapters.XmlAdapter; import java.util.HashMap; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/JNDILookupDefinition.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/JNDILookupDefinition.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/JNDILookupDefinition.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/JNDILookupDefinition.java index d98022058d..45fa84e0de 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/JNDILookupDefinition.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/JNDILookupDefinition.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource; +package io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource; import javax.xml.bind.annotation.*; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/MobileDataSourceConfig.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/MobileDataSourceConfig.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/MobileDataSourceConfig.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/MobileDataSourceConfig.java index cb0e78fb28..1476091670 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/MobileDataSourceConfig.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/MobileDataSourceConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource; +package io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java index c698e78004..536dba2494 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/MobileDataSourceConfigurations.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource; +package io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/task/TaskConfiguration.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/task/TaskConfiguration.java index 9c98306fbd..fb5837cfa9 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/task/TaskConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.config.task; +package io.entgra.device.mgt.plugins.mobile.android.impl.config.task; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java similarity index 89% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java index c96b603a8d..e04ed50484 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AbstractMobileDeviceManagementDAOFactory.java @@ -16,14 +16,14 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource.JNDILookupDefinition; -import org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource.MobileDataSourceConfig; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource.JNDILookupDefinition; +import io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource.MobileDataSourceConfig; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; import javax.sql.DataSource; import java.util.HashMap; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java index e3949b16a4..3238a20dfc 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl.AndroidDeviceDAOImpl; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl.AndroidFeatureDAOImpl; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceDAOImpl; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidFeatureDAOImpl; import javax.sql.DataSource; import java.sql.Connection; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java index 61db0cc049..acb0f02665 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; public class AndroidFeatureManagementDAOException extends MobileDeviceManagementDAOException { diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceDAO.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceDAO.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceDAO.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceDAO.java index d9209a1cb7..0dc4373602 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceDAO.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceDAO.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileDevice; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDevice; import java.util.List; /** diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceManagementDAOException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceManagementDAOException.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceManagementDAOException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceManagementDAOException.java index f87ddbfec9..0acc19a531 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceManagementDAOException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceManagementDAOException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; /** * Custom exception class for mobile device specific data access related exceptions. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java similarity index 92% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java index 1b28ac2854..2b74f5494b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileDeviceManagementDAOFactory.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; public interface MobileDeviceManagementDAOFactory { diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileFeatureDAO.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileFeatureDAO.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileFeatureDAO.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileFeatureDAO.java index b9a4d72af6..f04d9dda67 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/MobileFeatureDAO.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/MobileFeatureDAO.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileFeature; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java index 416a4d90dd..d689dce3aa 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java @@ -16,16 +16,16 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidDAOFactory; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceDAO; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDevice; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidDAOFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceDAO; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileDevice; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginConstants; import java.sql.Connection; import java.sql.PreparedStatement; @@ -39,7 +39,7 @@ import java.util.Map; /** * Implements MobileDeviceDAO for Android Devices. */ -public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ +public class AndroidDeviceDAOImpl implements MobileDeviceDAO { private static final Log log = LogFactory.getLog(AndroidDeviceDAOImpl.class); diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java index 4a0b6a1c73..ad6bfa214a 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidDeviceMgtPluginException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl; public class AndroidDeviceMgtPluginException extends Exception{ diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java index 7a6de77b5d..35478e43b5 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java @@ -16,18 +16,18 @@ * under the License. * */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidDAOFactory; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidFeatureManagementDAOException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileFeatureDAO; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature; +import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidDAOFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidFeatureManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileFeatureDAO; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileFeature; -import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginConstants; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java index eeade1e6a8..91e59c0fa7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/MobileFeatureDAOImpl.java @@ -16,14 +16,14 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileFeatureDAO; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileFeatureDAO; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.util.MobileDeviceManagementDAOUtil; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileFeature; import javax.sql.DataSource; import java.sql.Connection; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java similarity index 98% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java index 1892ddecb0..ed9c5fb2b4 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/util/MobileDeviceManagementDAOUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dao.util; +package io.entgra.device.mgt.plugins.mobile.android.impl.dao.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileDevice.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileDevice.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileDevice.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileDevice.java index daadfa8249..d3e256fa82 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileDevice.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileDevice.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dto; +package io.entgra.device.mgt.plugins.mobile.android.impl.dto; import java.io.Serializable; import java.util.Date; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileDeviceOperationMapping.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileDeviceOperationMapping.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileDeviceOperationMapping.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileDeviceOperationMapping.java index ae855e2ab2..672ada9121 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileDeviceOperationMapping.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileDeviceOperationMapping.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dto; +package io.entgra.device.mgt.plugins.mobile.android.impl.dto; /** * DTO of Mobile Device Operation Mappings. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileFeature.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileFeature.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileFeature.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileFeature.java index 6568c9d5c9..fe05a43904 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileFeature.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileFeature.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dto; +package io.entgra.device.mgt.plugins.mobile.android.impl.dto; import java.io.Serializable; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileFeatureProperty.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileFeatureProperty.java similarity index 94% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileFeatureProperty.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileFeatureProperty.java index fb226d107c..2f8261cd7d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileFeatureProperty.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileFeatureProperty.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dto; +package io.entgra.device.mgt.plugins.mobile.android.impl.dto; /** * DTO of Mobile feature property. Represents a property of a mobile feature. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileOperation.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileOperation.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileOperation.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileOperation.java index fa97234844..5c8d04cd65 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileOperation.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileOperation.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dto; +package io.entgra.device.mgt.plugins.mobile.android.impl.dto; import java.util.List; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileOperationProperty.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileOperationProperty.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileOperationProperty.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileOperationProperty.java index 5147bb004f..29324f418c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dto/MobileOperationProperty.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dto/MobileOperationProperty.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.dto; +package io.entgra.device.mgt.plugins.mobile.android.impl.dto; /** * DTO of Mobile Operation property. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginConstants.java similarity index 97% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginConstants.java index 09b278e2c3..5facf22465 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginConstants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.util; +package io.entgra.device.mgt.plugins.mobile.android.impl.util; /** * Defines constants used by android plugin. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java index 40ea3c18bf..211c871326 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java @@ -16,10 +16,10 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.util; +package io.entgra.device.mgt.plugins.mobile.android.impl.util; import org.wso2.carbon.device.mgt.common.license.mgt.License; -import org.wso2.carbon.device.mgt.mobile.android.impl.AndroidDeviceManagementService; +import io.entgra.device.mgt.plugins.mobile.android.impl.AndroidDeviceManagementService; /** * Contains utility methods used by Android plugin. diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidUtils.java similarity index 93% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidUtils.java index 583a6cef0b..b37f4a152d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.util; +package io.entgra.device.mgt.plugins.mobile.android.impl.util; import java.util.Map; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/MobileDeviceManagementUtil.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java similarity index 95% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/MobileDeviceManagementUtil.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java index 1637639190..462753098a 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/MobileDeviceManagementUtil.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java @@ -16,8 +16,12 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.impl.util; +package io.entgra.device.mgt.plugins.mobile.android.impl.util; +import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDevice; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; @@ -27,13 +31,9 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.Feature; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; -import org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileDevice; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileDeviceOperationMapping; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileFeature; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileOperation; -import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileOperationProperty; -import org.wso2.carbon.device.mgt.mobile.android.internal.AndroidDeviceManagementDataHolder; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDeviceOperationMapping; +import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileOperationProperty; +import io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementDataHolder; import org.wso2.carbon.registry.api.RegistryException; import org.wso2.carbon.registry.api.Resource; import org.wso2.carbon.registry.core.Registry; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java index 94efdfbf7c..d84753628e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.internal; +package io.entgra.device.mgt.plugins.mobile.android.internal; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import org.wso2.carbon.registry.core.service.RegistryService; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java similarity index 96% rename from components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java rename to components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java index 84fbb3c17c..165b152f40 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.mobile.android.internal; +package io.entgra.device.mgt.plugins.mobile.android.internal; +import io.entgra.device.mgt.plugins.mobile.android.impl.AndroidDeviceManagementService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; -import org.wso2.carbon.device.mgt.mobile.android.impl.AndroidDeviceManagementService; import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.registry.core.service.RegistryService;