From 97a303e495874204f22da15728eb97b3381655aa Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Mon, 6 Apr 2015 14:49:54 +0530
Subject: [PATCH] Temporarily disabling schema enforcement upon reading
 configuration files

---
 .../device/mgt/core/api/mgt/config/APIPublisherConfig.java      | 2 +-
 .../device/mgt/core/config/DeviceConfigurationManager.java      | 2 +-
 pom.xml                                                         | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java
index bae2f2c5d94..85ada40bb1c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java
@@ -89,7 +89,7 @@ public class APIPublisherConfig {
             /* Un-marshaling API publisher configuration */
             JAXBContext ctx = JAXBContext.newInstance(APIPublisherConfig.class);
             Unmarshaller unmarshaller = ctx.createUnmarshaller();
-            unmarshaller.setSchema(getSchema());
+            //unmarshaller.setSchema(getSchema());
             config = (APIPublisherConfig) unmarshaller.unmarshal(doc);
         } catch (JAXBException e) {
             throw new DeviceManagementException("Error occurred while un-marshalling API Publisher Config", e);
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 d2d67bc4d95..0c735ba1ff5 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
@@ -71,7 +71,7 @@ public class DeviceConfigurationManager {
             /* Un-marshaling Device Management configuration */
             JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class);
             Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
-            unmarshaller.setSchema(getSchema());
+            //unmarshaller.setSchema(getSchema());
             this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc);
         } catch (JAXBException e) {
             throw new DeviceManagementException("Error occurred while initializing Data Source config", e);
diff --git a/pom.xml b/pom.xml
index a95d74ad26d..7039e14dd36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1065,7 +1065,6 @@
     <properties>
         <testng.version>6.1.1</testng.version>
         <carbon.kernel.version>4.3.0</carbon.kernel.version>
-        <!--<carbon.kernel.version>4.4.0</carbon.kernel.version>-->
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
@@ -1096,7 +1095,6 @@
         <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
 
         <!-- Tomcat -->
-        <!--<orbit.version.tomcat>7.0.59.wso2v1</orbit.version.tomcat>-->
         <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
         <orbit.version.tomcat.servlet.api>7.0.52.wso2v1</orbit.version.tomcat.servlet.api>
         <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>