community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily disabling schema enforcement upon reading configuration files

Browse Source
This commit is contained in:
prabathabey 2015-04-06 14:49:54 +05:30
parent 7b99fb5f9d
commit 97a303e495
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java
View File

@ -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);

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java
View File

@ -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);

2
pom.xml
View File

@ -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>