From d39e9d8cd86ff1059a95c4fc769b829c132d2dd9 Mon Sep 17 00:00:00 2001 From: charithag Date: Tue, 24 Nov 2015 11:29:12 +0530 Subject: [PATCH] Refactor before adding IoT stuffs --- .../pom.xml | 2 +- .../pom.xml | 4 +-- .../impl/AndroidDeviceManagementService.java | 0 .../android/impl/AndroidDeviceManager.java | 0 .../android/impl/AndroidFeatureManager.java | 0 .../impl/AndroidPolicyMonitoringService.java | 0 .../android/impl/dao/AndroidDAOFactory.java | 0 .../AndroidFeatureManagementDAOException.java | 0 .../impl/dao/impl/AndroidDeviceDAOImpl.java | 0 .../impl/dao/impl/AndroidFeatureDAOImpl.java | 0 .../mobile/android/impl/gcm/GCMResult.java | 0 .../mobile/android/impl/gcm/GCMService.java | 0 .../mgt/mobile/android/impl/gcm/GCMUtil.java | 0 .../impl/util/AndroidPluginConstants.java | 0 .../android/impl/util/AndroidPluginUtils.java | 0 .../android/impl/util/AndroidUtils.java | 0 .../AndroidDeviceManagementDataHolder.java | 0 ...droidDeviceManagementServiceComponent.java | 0 components/device-mgt-mdm-android/pom.xml | 2 +- .../pom.xml | 4 +-- .../impl/WindowsDeviceManagementService.java | 0 .../windows/impl/WindowsDeviceManager.java | 0 .../windows/impl/WindowsFeatureManager.java | 0 .../impl/WindowsPolicyMonitoringService.java | 0 .../windows/impl/dao/WindowsDAOFactory.java | 0 .../WindowsFeatureManagementDAOException.java | 0 .../impl/dao/impl/WindowsDeviceDAOImpl.java | 0 .../impl/dao/impl/WindowsFeatureDAOImpl.java | 0 .../impl/util/WindowsPluginConstants.java | 0 .../windows/impl/util/WindowsPluginUtils.java | 0 .../windows/impl/util/WindowsUtils.java | 0 .../WindowsDeviceManagementDataHolder.java | 0 ...ndowsDeviceManagementServiceComponent.java | 0 components/device-mgt-mdm-windows/pom.xml | 2 +- .../pom.xml | 2 +- .../wso2/carbon/mdm/api/Authentication.java | 0 .../wso2/carbon/mdm/api/Configuration.java | 0 .../carbon/mdm/api/DeviceNotification.java | 0 .../java/org/wso2/carbon/mdm/api/Feature.java | 0 .../java/org/wso2/carbon/mdm/api/License.java | 0 .../org/wso2/carbon/mdm/api/MobileDevice.java | 0 .../org/wso2/carbon/mdm/api/Operation.java | 0 .../java/org/wso2/carbon/mdm/api/Policy.java | 0 .../java/org/wso2/carbon/mdm/api/Profile.java | 0 .../java/org/wso2/carbon/mdm/api/Role.java | 0 .../java/org/wso2/carbon/mdm/api/User.java | 0 .../carbon/mdm/api/common/ErrorHandler.java | 0 .../carbon/mdm/api/common/ErrorMessage.java | 0 .../mdm/api/common/MDMAPIException.java | 0 .../api/context/DeviceOperationContext.java | 0 .../wso2/carbon/mdm/api/util/MDMAPIUtils.java | 0 .../mdm/api/util/MDMAndroidOperationUtil.java | 0 .../carbon/mdm/api/util/MDMAppConstants.java | 0 .../mdm/api/util/MDMIOSOperationUtil.java | 0 .../carbon/mdm/api/util/ResponsePayload.java | 0 .../carbon/mdm/beans/ApplicationWrapper.java | 0 .../org/wso2/carbon/mdm/beans/MobileApp.java | 0 .../wso2/carbon/mdm/beans/MobileAppTypes.java | 0 .../wso2/carbon/mdm/beans/PolicyWrapper.java | 0 .../beans/PriorityUpdatedPolicyWrapper.java | 0 .../org/wso2/carbon/mdm/beans/Profile.java | 0 .../wso2/carbon/mdm/beans/ProfileFeature.java | 0 .../wso2/carbon/mdm/beans/RoleWrapper.java | 0 .../mdm/beans/UserCredentialWrapper.java | 0 .../wso2/carbon/mdm/beans/UserWrapper.java | 0 .../beans/android/AppStoreApplication.java | 0 .../beans/android/EnterpriseApplication.java | 0 .../mdm/beans/android/WebApplication.java | 0 .../mdm/beans/ios/AppStoreApplication.java | 0 .../mdm/beans/ios/EnterpriseApplication.java | 0 .../mdm/beans/ios/RemoveApplication.java | 0 .../wso2/carbon/mdm/beans/ios/WebClip.java | 0 .../org/wso2/carbon/mdm/util/Constants.java | 0 .../org/wso2/carbon/mdm/util/MDMUtil.java | 0 .../mdm/util/SetReferenceTransformer.java | 0 .../java/org/wso2/mdm/common/Application.java | 0 .../mdm/common/GsonMessageBodyHandler.java | 0 .../src/main/webapp/META-INF/permissions.xml | 0 .../webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../pom.xml | 3 +- .../url/printer/URLPrinterStartupHandler.java | 0 .../internal/URLPrinterDataHolder.java | 0 ...PrinterStartupHandlerServiceComponent.java | 0 .../pom.xml | 7 ++-- .../AbstractMobileOperationManager.java | 0 .../device/mgt/mobile/DataSourceListener.java | 0 .../DataSourceNotAvailableException.java | 0 .../MobileDeviceMgtPluginException.java | 0 .../mobile/common/MobilePluginConstants.java | 0 .../MobileDeviceConfigurationManager.java | 0 .../config/MobileDeviceManagementConfig.java | 0 .../MobileDeviceManagementRepository.java | 0 .../datasource/DataSourceConfigAdapter.java | 0 .../datasource/JNDILookupDefinition.java | 0 .../datasource/MobileDataSourceConfig.java | 0 .../MobileDataSourceConfigurations.java | 0 ...tractMobileDeviceManagementDAOFactory.java | 0 .../mgt/mobile/dao/MobileDeviceDAO.java | 0 .../MobileDeviceManagementDAOException.java | 0 .../dao/MobileDeviceManagementDAOFactory.java | 0 .../mgt/mobile/dao/MobileFeatureDAO.java | 0 .../mobile/dao/impl/MobileFeatureDAOImpl.java | 0 .../util/MobileDeviceManagementDAOUtil.java | 0 .../device/mgt/mobile/dto/MobileDevice.java | 0 .../dto/MobileDeviceOperationMapping.java | 0 .../device/mgt/mobile/dto/MobileFeature.java | 0 .../mgt/mobile/dto/MobileFeatureProperty.java | 0 .../mgt/mobile/dto/MobileOperation.java | 0 .../mobile/dto/MobileOperationProperty.java | 0 .../MobileDeviceManagementDataHolder.java | 0 ...obileDeviceManagementServiceComponent.java | 0 ...bileDeviceManagementSchemaInitializer.java | 0 .../util/MobileDeviceManagementUtil.java | 0 .../MobileDeviceManagementConfigTests.java | 0 .../mgt/mobile/impl/common/DBTypes.java | 0 .../impl/common/TestDBConfiguration.java | 0 .../impl/common/TestDBConfigurations.java | 0 .../impl/dao/util/MobileDatabaseUtils.java | 0 .../malformed-mobile-config-no-api-config.xml | 0 ...-mobile-config-no-api-publisher-config.xml | 0 ...malformed-mobile-config-no-apis-config.xml | 0 .../malformed-mobile-config-no-ds-config.xml | 0 ...malformed-mobile-config-no-jndi-config.xml | 0 .../malformed-mobile-config-no-mgt-repo.xml | 0 .../MobileDeviceManagementConfigSchema.xsd | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/sql/h2.sql | 0 .../src/test/resources/testdbconfig.xml | 0 .../src/test/resources/testng.xml | 0 .../{device-mgt => device-mgt-mdm}/pom.xml | 4 +-- .../pom.xml | 4 +-- .../pom.xml | 4 +-- features/device-mgt-mdm-windows/pom.xml | 32 +++++++++---------- .../pom.xml | 4 +-- .../src/main/resources/build.properties | 0 .../src/main/resources/conf/mobile-config.xml | 0 .../resources/dbscripts/plugins/ios/h2.sql | 0 .../resources/dbscripts/plugins/ios/mssql.sql | 0 .../resources/dbscripts/plugins/ios/mysql.sql | 0 .../dbscripts/plugins/ios/oracle.sql | 0 .../dbscripts/plugins/ios/postgresql.sql | 0 .../src/main/resources/p2.inf | 0 .../{device-mgt => device-mgt-mdm}/pom.xml | 0 pom.xml | 10 +++--- 146 files changed, 41 insertions(+), 43 deletions(-) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/pom.xml (98%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringService.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMResult.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMService.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMUtil.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java (100%) rename components/device-mgt-mdm-android/{org.wso2.carbon.device.mgt.mobile.android.impl => org.wso2.carbon.device.mgt.mobile.android}/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/pom.xml (98%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsFeatureManager.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsPolicyMonitoringService.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsFeatureManagementDAOException.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsDeviceDAOImpl.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsFeatureDAOImpl.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginConstants.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginUtils.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsUtils.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementDataHolder.java (100%) rename components/device-mgt-mdm-windows/{org.wso2.carbon.device.mgt.mobile.windows.impl => org.wso2.carbon.device.mgt.mobile.windows}/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementServiceComponent.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/pom.xml (99%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Authentication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Configuration.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/DeviceNotification.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Feature.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/License.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/MobileDevice.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Operation.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Policy.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Profile.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Role.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/User.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorHandler.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorMessage.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/MDMAPIException.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/context/DeviceOperationContext.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAPIUtils.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAndroidOperationUtil.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAppConstants.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMIOSOperationUtil.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/ResponsePayload.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ApplicationWrapper.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileApp.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileAppTypes.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PolicyWrapper.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PriorityUpdatedPolicyWrapper.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/Profile.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ProfileFeature.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/RoleWrapper.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserCredentialWrapper.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserWrapper.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/AppStoreApplication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/EnterpriseApplication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/WebApplication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/AppStoreApplication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/EnterpriseApplication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/RemoveApplication.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/WebClip.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/Constants.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/MDMUtil.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/SetReferenceTransformer.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/Application.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/GsonMessageBodyHandler.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/permissions.xml (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/cxf-servlet.xml (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/web.xml (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml (96%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/URLPrinterStartupHandler.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterDataHolder.java (100%) rename components/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterStartupHandlerServiceComponent.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/pom.xml (96%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceListener.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceNotAvailableException.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobileDeviceMgtPluginException.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementConfig.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementRepository.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/DataSourceConfigAdapter.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/JNDILookupDefinition.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfigurations.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/AbstractMobileDeviceManagementDAOFactory.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceDAO.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOException.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileFeatureDAOImpl.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDeviceOperationMapping.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeature.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeatureProperty.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperation.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperationProperty.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementDataHolder.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementSchemaInitializer.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/MobileDeviceManagementConfigTests.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/DBTypes.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfiguration.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfigurations.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/util/MobileDatabaseUtils.java (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/malformed-mobile-config-no-api-config.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/malformed-mobile-config-no-api-publisher-config.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/malformed-mobile-config-no-apis-config.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/malformed-mobile-config-no-ds-config.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/malformed-mobile-config-no-jndi-config.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/malformed-mobile-config-no-mgt-repo.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/config/schema/MobileDeviceManagementConfigSchema.xsd (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/log4j.properties (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/sql/h2.sql (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/testdbconfig.xml (100%) rename components/{device-mgt/org.wso2.carbon.device.mgt.mobile.impl => device-mgt-mdm/org.wso2.carbon.device.mgt.mobile}/src/test/resources/testng.xml (100%) rename components/{device-mgt => device-mgt-mdm}/pom.xml (95%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/pom.xml (97%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/build.properties (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/h2.sql (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mssql.sql (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mysql.sql (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql (100%) rename features/{device-mgt => device-mgt-mdm}/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf (100%) rename features/{device-mgt => device-mgt-mdm}/pom.xml (100%) diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml index 9fe85ce7cc..73a39f763a 100644 --- a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml +++ b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml @@ -162,7 +162,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.android.impl + org.wso2.carbon.device.mgt.mobile.android provided diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/pom.xml similarity index 98% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/pom.xml index 928b346770..3462204208 100644 --- a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml +++ b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.mobile.android.impl + org.wso2.carbon.device.mgt.mobile.android 1.9.2-SNAPSHOT bundle WSO2 Carbon - Mobile Device Management Android Impl @@ -106,7 +106,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.impl + org.wso2.carbon.device.mgt.mobile org.eclipse.osgi diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringService.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringService.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringService.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidPolicyMonitoringService.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidDAOFactory.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/AndroidFeatureManagementDAOException.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMResult.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMResult.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMResult.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMResult.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMService.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMService.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMService.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMService.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMUtil.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMUtil.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMUtil.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/gcm/GCMUtil.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginConstants.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidPluginUtils.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/util/AndroidUtils.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementDataHolder.java diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java similarity index 100% rename from components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java rename to components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/internal/AndroidDeviceManagementServiceComponent.java diff --git a/components/device-mgt-mdm-android/pom.xml b/components/device-mgt-mdm-android/pom.xml index 989bcc7697..2c78e3e947 100644 --- a/components/device-mgt-mdm-android/pom.xml +++ b/components/device-mgt-mdm-android/pom.xml @@ -36,8 +36,8 @@ http://wso2.org + org.wso2.carbon.device.mgt.mobile.android org.wso2.carbon.device.mgt.mobile.android.api - org.wso2.carbon.device.mgt.mobile.android.impl diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/pom.xml similarity index 98% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/pom.xml index ddbbe4bc24..a17bd8664a 100644 --- a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml +++ b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.mobile.windows.impl + org.wso2.carbon.device.mgt.mobile.windows 1.9.2-SNAPSHOT bundle WSO2 Carbon - Mobile Device Management Windows Impl @@ -106,7 +106,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.impl + org.wso2.carbon.device.mgt.mobile org.eclipse.osgi diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsFeatureManager.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsFeatureManager.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsFeatureManager.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsFeatureManager.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsPolicyMonitoringService.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsPolicyMonitoringService.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsPolicyMonitoringService.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsPolicyMonitoringService.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsFeatureManagementDAOException.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsFeatureManagementDAOException.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsFeatureManagementDAOException.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsFeatureManagementDAOException.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsDeviceDAOImpl.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsDeviceDAOImpl.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsDeviceDAOImpl.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsDeviceDAOImpl.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsFeatureDAOImpl.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsFeatureDAOImpl.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsFeatureDAOImpl.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/impl/WindowsFeatureDAOImpl.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginConstants.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginConstants.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginConstants.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginConstants.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginUtils.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginUtils.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginUtils.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsPluginUtils.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsUtils.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsUtils.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsUtils.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/util/WindowsUtils.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementDataHolder.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementDataHolder.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementDataHolder.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementDataHolder.java diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementServiceComponent.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementServiceComponent.java similarity index 100% rename from components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementServiceComponent.java rename to components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/internal/WindowsDeviceManagementServiceComponent.java diff --git a/components/device-mgt-mdm-windows/pom.xml b/components/device-mgt-mdm-windows/pom.xml index 7f09bf2efe..8f4a1a69e4 100644 --- a/components/device-mgt-mdm-windows/pom.xml +++ b/components/device-mgt-mdm-windows/pom.xml @@ -36,8 +36,8 @@ http://wso2.org + org.wso2.carbon.device.mgt.mobile.windows org.wso2.carbon.device.mgt.mobile.windows.api - org.wso2.carbon.device.mgt.mobile.windows.impl diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/pom.xml similarity index 99% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/pom.xml index ae9fe11847..f1c096bd6f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml +++ b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - device-mgt + device-mgt-mdm org.wso2.carbon.devicemgt-plugins 1.9.2-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Authentication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Authentication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Authentication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Authentication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Configuration.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Configuration.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Configuration.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Configuration.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/DeviceNotification.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/DeviceNotification.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/DeviceNotification.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/DeviceNotification.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Feature.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Feature.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Feature.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Feature.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/License.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/License.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/License.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/License.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/MobileDevice.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/MobileDevice.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/MobileDevice.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/MobileDevice.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Operation.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Operation.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Operation.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Operation.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Policy.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Policy.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Policy.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Policy.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Profile.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Profile.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Profile.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Profile.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Role.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Role.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Role.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/Role.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/User.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/User.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/User.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/User.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorHandler.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorHandler.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorHandler.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorHandler.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorMessage.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorMessage.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorMessage.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/ErrorMessage.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/MDMAPIException.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/MDMAPIException.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/MDMAPIException.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/common/MDMAPIException.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/context/DeviceOperationContext.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/context/DeviceOperationContext.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/context/DeviceOperationContext.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/context/DeviceOperationContext.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAPIUtils.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAPIUtils.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAPIUtils.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAPIUtils.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAndroidOperationUtil.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAndroidOperationUtil.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAndroidOperationUtil.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAndroidOperationUtil.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAppConstants.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAppConstants.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAppConstants.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMAppConstants.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMIOSOperationUtil.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMIOSOperationUtil.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMIOSOperationUtil.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/MDMIOSOperationUtil.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/ResponsePayload.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/ResponsePayload.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/ResponsePayload.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/api/util/ResponsePayload.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ApplicationWrapper.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ApplicationWrapper.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ApplicationWrapper.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ApplicationWrapper.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileApp.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileApp.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileApp.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileApp.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileAppTypes.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileAppTypes.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileAppTypes.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/MobileAppTypes.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PolicyWrapper.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PolicyWrapper.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PolicyWrapper.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PolicyWrapper.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PriorityUpdatedPolicyWrapper.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PriorityUpdatedPolicyWrapper.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PriorityUpdatedPolicyWrapper.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/PriorityUpdatedPolicyWrapper.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/Profile.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/Profile.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/Profile.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/Profile.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ProfileFeature.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ProfileFeature.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ProfileFeature.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ProfileFeature.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/RoleWrapper.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/RoleWrapper.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/RoleWrapper.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/RoleWrapper.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserCredentialWrapper.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserCredentialWrapper.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserCredentialWrapper.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserCredentialWrapper.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserWrapper.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserWrapper.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserWrapper.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/UserWrapper.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/AppStoreApplication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/AppStoreApplication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/AppStoreApplication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/AppStoreApplication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/EnterpriseApplication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/EnterpriseApplication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/EnterpriseApplication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/EnterpriseApplication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/WebApplication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/WebApplication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/WebApplication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/android/WebApplication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/AppStoreApplication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/AppStoreApplication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/AppStoreApplication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/AppStoreApplication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/EnterpriseApplication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/EnterpriseApplication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/EnterpriseApplication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/EnterpriseApplication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/RemoveApplication.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/RemoveApplication.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/RemoveApplication.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/RemoveApplication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/WebClip.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/WebClip.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/WebClip.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/beans/ios/WebClip.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/Constants.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/Constants.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/Constants.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/Constants.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/MDMUtil.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/MDMUtil.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/MDMUtil.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/MDMUtil.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/SetReferenceTransformer.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/SetReferenceTransformer.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/SetReferenceTransformer.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/carbon/mdm/util/SetReferenceTransformer.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/Application.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/Application.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/Application.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/Application.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/GsonMessageBodyHandler.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/GsonMessageBodyHandler.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/GsonMessageBodyHandler.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/java/org/wso2/mdm/common/GsonMessageBodyHandler.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/permissions.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/permissions.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/web.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/web.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.api/src/main/webapp/WEB-INF/web.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml similarity index 96% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml index af83029f12..6b88339843 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml +++ b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml @@ -3,14 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - device-mgt + device-mgt-mdm org.wso2.carbon.devicemgt-plugins 1.9.2-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon.devicemgt-plugins org.wso2.carbon.device.mgt.mobile.url.printer 1.9.2-SNAPSHOT bundle diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/URLPrinterStartupHandler.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/URLPrinterStartupHandler.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/URLPrinterStartupHandler.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/URLPrinterStartupHandler.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterDataHolder.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterDataHolder.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterDataHolder.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterDataHolder.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterStartupHandlerServiceComponent.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterStartupHandlerServiceComponent.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterStartupHandlerServiceComponent.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/internal/URLPrinterStartupHandlerServiceComponent.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/pom.xml similarity index 96% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/pom.xml index d0c0f376e5..fdc9defc71 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml +++ b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/pom.xml @@ -21,19 +21,18 @@ - device-mgt + device-mgt-mdm org.wso2.carbon.devicemgt-plugins 1.9.2-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.impl + org.wso2.carbon.device.mgt.mobile 1.9.2-SNAPSHOT bundle WSO2 Carbon - Mobile Device Management Impl - WSO2 Carbon - Mobile Device Management Impl + WSO2 Carbon - Mobile Device Management Implementation http://wso2.org diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceListener.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceListener.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceListener.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceListener.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceNotAvailableException.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceNotAvailableException.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceNotAvailableException.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/DataSourceNotAvailableException.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobileDeviceMgtPluginException.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobileDeviceMgtPluginException.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobileDeviceMgtPluginException.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobileDeviceMgtPluginException.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementConfig.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementConfig.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementConfig.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementConfig.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementRepository.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementRepository.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementRepository.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceManagementRepository.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/DataSourceConfigAdapter.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/DataSourceConfigAdapter.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/DataSourceConfigAdapter.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/DataSourceConfigAdapter.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/JNDILookupDefinition.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/JNDILookupDefinition.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/JNDILookupDefinition.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/JNDILookupDefinition.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfigurations.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfigurations.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfigurations.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfigurations.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/AbstractMobileDeviceManagementDAOFactory.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/AbstractMobileDeviceManagementDAOFactory.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/AbstractMobileDeviceManagementDAOFactory.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/AbstractMobileDeviceManagementDAOFactory.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceDAO.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceDAO.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceDAO.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceDAO.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOException.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOException.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOException.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOException.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileFeatureDAOImpl.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileFeatureDAOImpl.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileFeatureDAOImpl.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileFeatureDAOImpl.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDeviceOperationMapping.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDeviceOperationMapping.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDeviceOperationMapping.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDeviceOperationMapping.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeature.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeature.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeature.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeature.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeatureProperty.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeatureProperty.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeatureProperty.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileFeatureProperty.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperation.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperation.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperation.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperation.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperationProperty.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperationProperty.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperationProperty.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileOperationProperty.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementDataHolder.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementDataHolder.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementDataHolder.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementDataHolder.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementSchemaInitializer.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementSchemaInitializer.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementSchemaInitializer.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementSchemaInitializer.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/MobileDeviceManagementConfigTests.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/MobileDeviceManagementConfigTests.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/MobileDeviceManagementConfigTests.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/MobileDeviceManagementConfigTests.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/DBTypes.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/DBTypes.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/DBTypes.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/DBTypes.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfiguration.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfiguration.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfiguration.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfiguration.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfigurations.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfigurations.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfigurations.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfigurations.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/util/MobileDatabaseUtils.java b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/util/MobileDatabaseUtils.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/util/MobileDatabaseUtils.java rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/util/MobileDatabaseUtils.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-api-config.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-api-config.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-api-config.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-api-config.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-api-publisher-config.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-api-publisher-config.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-api-publisher-config.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-api-publisher-config.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-apis-config.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-apis-config.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-apis-config.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-apis-config.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-ds-config.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-ds-config.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-ds-config.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-ds-config.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-jndi-config.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-jndi-config.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-jndi-config.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-jndi-config.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-mgt-repo.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-mgt-repo.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/malformed-mobile-config-no-mgt-repo.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/malformed-mobile-config-no-mgt-repo.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/schema/MobileDeviceManagementConfigSchema.xsd b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/schema/MobileDeviceManagementConfigSchema.xsd similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/config/schema/MobileDeviceManagementConfigSchema.xsd rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/config/schema/MobileDeviceManagementConfigSchema.xsd diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/log4j.properties b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/log4j.properties similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/log4j.properties rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/log4j.properties diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/sql/h2.sql b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/sql/h2.sql similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/sql/h2.sql rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/sql/h2.sql diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/testdbconfig.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/testdbconfig.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/testdbconfig.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/testdbconfig.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/testng.xml b/components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/testng.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/testng.xml rename to components/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile/src/test/resources/testng.xml diff --git a/components/device-mgt/pom.xml b/components/device-mgt-mdm/pom.xml similarity index 95% rename from components/device-mgt/pom.xml rename to components/device-mgt-mdm/pom.xml index a7cb44bfca..1ef3e71390 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt-mdm/pom.xml @@ -29,15 +29,15 @@ 4.0.0 - device-mgt + device-mgt-mdm 1.9.2-SNAPSHOT pom WSO2 Carbon - Mobile Device Management Component http://wso2.org + org.wso2.carbon.device.mgt.mobile org.wso2.carbon.device.mgt.mobile.api - org.wso2.carbon.device.mgt.mobile.impl org.wso2.carbon.device.mgt.mobile.url.printer diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml index 54a8a13665..fb537f11c0 100644 --- a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml +++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml @@ -41,7 +41,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.android.impl + org.wso2.carbon.device.mgt.mobile.android @@ -123,7 +123,7 @@ - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.impl:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android:${carbon.mobile.device.mgt.version} diff --git a/features/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml b/features/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml index 25c777b9e5..b8fd970b33 100644 --- a/features/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml +++ b/features/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml @@ -41,7 +41,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.windows.impl + org.wso2.carbon.device.mgt.mobile.windows @@ -123,7 +123,7 @@ - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.impl:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows:${carbon.mobile.device.mgt.version} diff --git a/features/device-mgt-mdm-windows/pom.xml b/features/device-mgt-mdm-windows/pom.xml index 35cb3018df..583013b8f6 100644 --- a/features/device-mgt-mdm-windows/pom.xml +++ b/features/device-mgt-mdm-windows/pom.xml @@ -1,21 +1,21 @@ + ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ + ~ WSO2 Inc. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/pom.xml similarity index 97% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/pom.xml index a6ccc2dcfc..d94fddad4c 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml +++ b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/pom.xml @@ -41,7 +41,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.impl + org.wso2.carbon.device.mgt.mobile org.wso2.carbon.devicemgt @@ -139,7 +139,7 @@ - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.impl:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile:${carbon.mobile.device.mgt.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.url.printer:${carbon.mobile.device.mgt.version} diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/build.properties b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/build.properties rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/build.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/h2.sql b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/h2.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/h2.sql rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/h2.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mssql.sql b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mssql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mssql.sql rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mssql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mysql.sql b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mysql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mysql.sql rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/mysql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf b/features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf rename to features/device-mgt-mdm/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf diff --git a/features/device-mgt/pom.xml b/features/device-mgt-mdm/pom.xml similarity index 100% rename from features/device-mgt/pom.xml rename to features/device-mgt-mdm/pom.xml diff --git a/pom.xml b/pom.xml index 85835f9c4d..4f5a97dbc4 100644 --- a/pom.xml +++ b/pom.xml @@ -37,10 +37,10 @@ - components/device-mgt + components/device-mgt-mdm components/device-mgt-mdm-android components/device-mgt-mdm-windows - features/device-mgt + features/device-mgt-mdm features/device-mgt-mdm-android features/device-mgt-mdm-windows @@ -262,7 +262,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.impl + org.wso2.carbon.device.mgt.mobile ${carbon.mobile.device.mgt.version} @@ -274,7 +274,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.android.impl + org.wso2.carbon.device.mgt.mobile.android ${carbon.mobile.device.mgt.version} @@ -286,7 +286,7 @@ org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.mobile.windows.impl + org.wso2.carbon.device.mgt.mobile.windows ${carbon.mobile.device.mgt.version}