From 431c86ae0e6fca29b30260fbaed8d3e16e97409a Mon Sep 17 00:00:00 2001 From: prabathabey Date: Mon, 6 Jul 2015 11:50:38 +0530 Subject: [PATCH] Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console --- .../common/app/mgt/ApplicationManager.java | 3 + .../org.wso2.carbon.device.mgt.core/pom.xml | 2 + ...ApplicationManagerProviderServiceImpl.java | 6 ++ .../device/mgt/core/dao/ApplicationDAO.java | 2 + .../carbon/device/mgt/core/dao/DeviceDAO.java | 18 +----- .../mgt/core/dao/impl/ApplicationDAOImpl.java | 40 ++++++++++++ .../mgt/core/dao/impl/DeviceDAOImpl.java | 46 -------------- .../internal/DeviceManagementDataHolder.java | 10 +++ .../DeviceManagementServiceComponent.java | 24 ++++++++ .../DeviceManagementProviderService.java | 21 ------- .../DeviceManagementProviderServiceImpl.java | 32 +--------- .../handler/URLPrinterStartupHandler.java | 61 +++++++++++++++++++ .../mgt/core/TestDeviceManagementService.java | 6 ++ .../core/dao/DeviceManagementDAOTests.java | 1 - pom.xml | 9 +-- 15 files changed, 162 insertions(+), 119 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/startup/handler/URLPrinterStartupHandler.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java index a341768d17f..747dc681040 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java @@ -69,5 +69,8 @@ public interface ApplicationManager { void installApplication(Operation operation, List deviceIdentifiers) throws ApplicationManagementException; + void updateInstalledApplicationListOfDevice(DeviceIdentifier deviceIdentifier, + List applications) throws ApplicationManagementException; + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 1031b7c57a4..71fea6c747a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -83,6 +83,8 @@ org.wso2.carbon.identity.oauth.stub, org.wso2.carbon.identity.oauth.stub.dto, org.wso2.carbon.ndatasource.core, + org.wso2.carbon.base, + org.wso2.carbon.base.api !org.wso2.carbon.device.mgt.core.internal, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java index 01b344aea4b..f2f6102fd68 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java @@ -116,6 +116,12 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem } } + @Override + public void updateInstalledApplicationListOfDevice( + DeviceIdentifier deviceIdentifier, List applications) throws ApplicationManagementException { + + } + private OAuthConsumerAppDTO getAppInfo() throws ApplicationManagementException { OAuthConsumerAppDTO appInfo = null; try { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/ApplicationDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/ApplicationDAO.java index ea95d26148b..aea92929b78 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/ApplicationDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/ApplicationDAO.java @@ -32,4 +32,6 @@ public interface ApplicationDAO { Application getApplication(String identifier, int tenantId) throws DeviceManagementDAOException; + List getInstalledApplications(int deviceId) throws DeviceManagementDAOException; + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java index ac28c97b596..ad87c15096b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java @@ -60,21 +60,5 @@ public interface DeviceDAO { EnrolmentInfo getEnrolment(DeviceIdentifier deviceId, String currentUser, int tenantId) throws DeviceManagementDAOException; - /** - * Get the list of devices that matches with the given device name. - * - * @param id Name of the device - * @param applications List of applications - * @throws DeviceManagementDAOException - */ - void addDeviceApplications(int id, Object applications) throws DeviceManagementDAOException; - - /** - * Get the list of devices that matches with the given device name. - * - * @param deviceId device id of the device - * @return List of Applications that are installed on the given device. - * @throws DeviceManagementDAOException - */ - List getInstalledApplications(int deviceId) throws DeviceManagementDAOException; } + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java index 2b87a239374..3568fc29e0d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java @@ -26,6 +26,9 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; import java.sql.*; import java.util.ArrayList; import java.util.List; @@ -165,6 +168,43 @@ public class ApplicationDAOImpl implements ApplicationDAO { } } + @Override + public List getInstalledApplications(int deviceId) throws DeviceManagementDAOException { + Connection conn; + PreparedStatement stmt = null; + List applications = new ArrayList(); + Application application; + ByteArrayInputStream bais; + ObjectInputStream ois; + + try { + conn = this.getConnection(); + stmt = conn.prepareStatement( + "SELECT DEVICE_ID, APPLICATIONS FROM DM_DEVICE_APPLICATIONS WHERE DEVICE_ID = ?"); + stmt.setInt(1, deviceId); + ResultSet rs = stmt.executeQuery(); + + while (rs.next()) { + byte[] applicationDetails = rs.getBytes("APPLICATIONS"); + bais = new ByteArrayInputStream(applicationDetails); + ois = new ObjectInputStream(bais); + application = (Application) ois.readObject(); + applications.add(application); + } + } catch (IOException e) { + throw new DeviceManagementDAOException("IO Error occurred while de serialize the Application object", e); + } catch (ClassNotFoundException e) { + throw new DeviceManagementDAOException("Class not found error occurred while de serialize the " + + "Application object", e); + } catch (SQLException e) { + throw new DeviceManagementDAOException("SQL Error occurred while retrieving the list of Applications " + + "installed in device id '" + deviceId, e); + } finally { + DeviceManagementDAOUtil.cleanupResources(stmt, null); + } + return applications; + } + private Connection getConnection() throws DeviceManagementDAOException { return DeviceManagementDAOFactory.getConnection(); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java index d7224162e7c..4d9c85ee3b9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java @@ -24,15 +24,11 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.EnrolmentInfo.Status; -import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.core.dao.DeviceDAO; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.ObjectInputStream; import java.sql.*; import java.util.ArrayList; import java.util.Date; @@ -425,48 +421,6 @@ public class DeviceDAOImpl implements DeviceDAO { } } - @Override - public void addDeviceApplications(int id, Object applications) throws DeviceManagementDAOException { - - } - - @Override - public List getInstalledApplications(int deviceId) throws DeviceManagementDAOException { - Connection conn; - PreparedStatement stmt = null; - List applications = new ArrayList(); - Application application; - ByteArrayInputStream bais; - ObjectInputStream ois; - - try { - conn = this.getConnection(); - stmt = conn.prepareStatement( - "SELECT DEVICE_ID, APPLICATIONS FROM DM_DEVICE_APPLICATIONS WHERE DEVICE_ID = ?"); - stmt.setInt(1, deviceId); - ResultSet rs = stmt.executeQuery(); - - while (rs.next()) { - byte[] applicationDetails = rs.getBytes("APPLICATIONS"); - bais = new ByteArrayInputStream(applicationDetails); - ois = new ObjectInputStream(bais); - application = (Application) ois.readObject(); - applications.add(application); - } - } catch (IOException e) { - throw new DeviceManagementDAOException("IO Error occurred while de serialize the Application object", e); - } catch (ClassNotFoundException e) { - throw new DeviceManagementDAOException("Class not found error occurred while de serialize the " + - "Application object", e); - } catch (SQLException e) { - throw new DeviceManagementDAOException("SQL Error occurred while retrieving the list of Applications " + - "installed in device id '" + deviceId, e); - } finally { - DeviceManagementDAOUtil.cleanupResources(stmt, null); - } - return applications; - } - private Device loadDevice(ResultSet rs) throws SQLException { Device device = new Device(); device.setId(rs.getInt("DEVICE_ID")); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java index c7b10f63040..3533ea96c42 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java @@ -29,6 +29,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.tenant.TenantManager; +import org.wso2.carbon.utils.ConfigurationContextService; public class DeviceManagementDataHolder { @@ -42,6 +43,7 @@ public class DeviceManagementDataHolder { private ApplicationManager appManager; private AppManagementConfig appManagerConfig; private OperationManager operationManager; + private ConfigurationContextService configurationContextService; private static DeviceManagementDataHolder thisInstance = new DeviceManagementDataHolder(); @@ -136,4 +138,12 @@ public class DeviceManagementDataHolder { this.operationManager = operationManager; } + public ConfigurationContextService getConfigurationContextService() { + return configurationContextService; + } + + public void setConfigurationContextService(ConfigurationContextService configurationContextService) { + this.configurationContextService = configurationContextService; + } + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java index d9a60f28115..48b695f2e96 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java @@ -51,10 +51,12 @@ import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl; import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl; +import org.wso2.carbon.device.mgt.core.startup.handler.URLPrinterStartupHandler; import org.wso2.carbon.device.mgt.core.util.DeviceManagementSchemaInitializer; import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; +import org.wso2.carbon.utils.ConfigurationContextService; import java.util.ArrayList; import java.util.List; @@ -91,6 +93,12 @@ import java.util.List; * policy="dynamic" * bind="setDataSourceService" * unbind="unsetDataSourceService" + * @scr.reference name="config.context.service" + * interface="org.wso2.carbon.utils.ConfigurationContextService" + * cardinality="0..1" + * policy="dynamic" + * bind="setConfigurationContextService" + * unbind="unsetConfigurationContextService" */ public class DeviceManagementServiceComponent { @@ -197,6 +205,8 @@ public class DeviceManagementServiceComponent { } catch (ApplicationManagementException appMgtEx) { log.error("Application management service not registered."); } + + bundleContext.registerService(ServerStartupObserver.class, new URLPrinterStartupHandler(), null); } private void setupDeviceManagementSchema(DataSourceConfig config) throws DeviceManagementException { @@ -329,4 +339,18 @@ public class DeviceManagementServiceComponent { //do nothing } + protected void setConfigurationContextService(ConfigurationContextService configurationContextService) { + if (log.isDebugEnabled()) { + log.debug("Setting ConfigurationContextService"); + } + DeviceManagementDataHolder.getInstance().setConfigurationContextService(configurationContextService); + } + + protected void unsetConfigurationContextService(ConfigurationContextService configurationContextService) { + if (log.isDebugEnabled()) { + log.debug("Un-setting ConfigurationContextService"); + } + DeviceManagementDataHolder.getInstance().setConfigurationContextService(null); + } + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java index fbe5dfd957e..9c72e0323c8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java @@ -78,26 +78,5 @@ public interface DeviceManagementProviderService extends DeviceManager, LicenseM */ List getDevicesByName(String deviceName) throws DeviceManagementException; - /** - * The method to get application list installed for the device. - * - * @param deviceIdentifier - * @return List of applications installed on the device - * @throws DeviceManagementException - */ - List getApplicationListForDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException; - - - /** - * The method to get application list installed for the device. - * - * @param deviceIdentifier device identifier of the device - * @param applications List of installed Applications - * - * @throws DeviceManagementException - */ - void updateInstalledApplicationListOfDevice(DeviceIdentifier deviceIdentifier, List applications) - throws DeviceManagementException; - void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status active) throws DeviceManagementException; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index c67aa18cffc..150287fdbda 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -46,7 +46,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -public class DeviceManagementProviderServiceImpl implements DeviceManagementProviderService, PluginInitializationListener { +public class DeviceManagementProviderServiceImpl implements DeviceManagementProviderService, + PluginInitializationListener { private DeviceDAO deviceDAO; private DeviceTypeDAO deviceTypeDAO; @@ -650,35 +651,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } - @Override - public List getApplicationListForDevice(DeviceIdentifier deviceIdentifier) - throws DeviceManagementException { - Device device = null; - try { - device = this.getDevice(deviceIdentifier); - return deviceDAO.getInstalledApplications(device.getId()); - }catch (DeviceManagementDAOException deviceDaoEx){ - String errorMsg = "Error occured while fetching the Application List of device : " + device.getId(); - log.error(errorMsg, deviceDaoEx); - throw new DeviceManagementException(errorMsg, deviceDaoEx); - } - } - - @Override - public void updateInstalledApplicationListOfDevice(DeviceIdentifier deviceIdentifier, - List applications) - throws DeviceManagementException { - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - try { - Device device = deviceDAO.getDevice(deviceIdentifier, tenantId); - deviceDAO.addDeviceApplications(device.getId(), applications); - }catch (DeviceManagementDAOException deviceDaoEx){ - String errorMsg = "Error occurred saving application list to the device"; - log.error(errorMsg+":"+deviceIdentifier.toString()); - throw new DeviceManagementException(errorMsg, deviceDaoEx); - } - } - @Override public void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status status) throws DeviceManagementException { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/startup/handler/URLPrinterStartupHandler.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/startup/handler/URLPrinterStartupHandler.java new file mode 100644 index 00000000000..17a5b0dc172 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/startup/handler/URLPrinterStartupHandler.java @@ -0,0 +1,61 @@ +/* + * 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. + * + */ +package org.wso2.carbon.device.mgt.core.startup.handler; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.core.ServerStartupObserver; +import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; +import org.wso2.carbon.utils.CarbonUtils; +import org.wso2.carbon.utils.ConfigurationContextService; +import org.wso2.carbon.utils.NetworkUtils; + +public class URLPrinterStartupHandler implements ServerStartupObserver { + + private static final Log log = LogFactory.getLog(URLPrinterStartupHandler.class); + + @Override + public void completingServerStartup() { + + } + + @Override + public void completedServerStartup() { + log.info("EMM Console URL : " + this.getEmmUrl()); + } + + private String getEmmUrl() { + // Hostname + String hostName = "localhost"; + try { + hostName = NetworkUtils.getMgtHostName(); + } catch (Exception ignored) { + } + // HTTPS port + String mgtConsoleTransport = CarbonUtils.getManagementTransport(); + ConfigurationContextService configContextService = + DeviceManagementDataHolder.getInstance().getConfigurationContextService(); + int httpsPort = CarbonUtils.getTransportPort(configContextService, mgtConsoleTransport); + int httpsProxyPort = + CarbonUtils.getTransportProxyPort(configContextService.getServerConfigContext(), + mgtConsoleTransport); + return "https://" + hostName + ":" + httpsPort + "/mdm"; + } + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java index f074adc2e50..e320327524a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java @@ -123,4 +123,10 @@ public class TestDeviceManagementService implements DeviceManagementService { throws ApplicationManagementException { } + + @Override + public void updateInstalledApplicationListOfDevice(DeviceIdentifier deviceIdentifier, + List applications) throws ApplicationManagementException { + + } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java index 464bcfa0a32..10d77ee3ab7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java @@ -191,7 +191,6 @@ public class DeviceManagementDAOTests extends BaseDeviceManagementDAOTest { @Test(dependsOnMethods = "testAddDeviceTest") public void testSetEnrolmentStatus() { - System.out.println("ENROLLLLLLLLLLLLLL"); Device device = this.loadDummyDevice(); try { DeviceManagementDAOFactory.openConnection(); diff --git a/pom.xml b/pom.xml index 2aee3e9fbbb..7f20b4d6add 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,8 @@ ~ under the License. --> - + 4.0.0 org.wso2.carbon.devicemgt @@ -37,8 +38,8 @@ components/device-mgt components/policy-mgt - components/webapp-authenticator-framework - components/oauth-extensions + components/webapp-authenticator-framework + components/oauth-extensions features/device-mgt features/policy-mgt features/webapp-authenticator-framework @@ -1155,7 +1156,7 @@ 0.9.2-SNAPSHOT - + 4.4.0