From 8fa2f38f37ab37c5e60d0a66c77715a066cd929a Mon Sep 17 00:00:00 2001 From: manoj Date: Mon, 15 Dec 2014 11:23:06 +0530 Subject: [PATCH] remove EMM DB scripts file --- .../device/mgt/core/config/DeviceConfigurationManager.java | 4 ++-- product/modules/distribution/src/assembly/bin.xml | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java index 1fb6fce60..e7e5dbe5b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java @@ -54,8 +54,8 @@ public class DeviceConfigurationManager { Document doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig); /* Un-marshaling Device Management configuration */ - JAXBContext rssContext = JAXBContext.newInstance(DeviceManagementConfig.class); - Unmarshaller unmarshaller = rssContext.createUnmarshaller(); + JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class); + Unmarshaller unmarshaller = cdmContext.createUnmarshaller(); this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc); } catch (Exception e) { throw new DeviceManagementException("Error occurred while initializing RSS config", e); diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index be12ea55a..e1448fdd3 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -304,11 +304,6 @@ wso2cdm-${project.version}/repository/conf 644 - - src/repository/database/WSO2EMM_DB.h2.db - wso2cdm-${project.version}/repository/database - 644 -