community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

Browse Source
merge-requests/7/head
manoj 10 years ago
parent 465f421aa8 bf88170668
commit 71713d4baf
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -89,7 +89,7 @@ public class APIPublisherConfig {
/* Un-marshaling API publisher configuration */ /* Un-marshaling API publisher configuration */
JAXBContext ctx = JAXBContext.newInstance(APIPublisherConfig.class); JAXBContext ctx = JAXBContext.newInstance(APIPublisherConfig.class);
Unmarshaller unmarshaller = ctx.createUnmarshaller(); Unmarshaller unmarshaller = ctx.createUnmarshaller();
unmarshaller.setSchema(getSchema()); //unmarshaller.setSchema(getSchema());
config = (APIPublisherConfig) unmarshaller.unmarshal(doc); config = (APIPublisherConfig) unmarshaller.unmarshal(doc);
} catch (JAXBException e) { } catch (JAXBException e) {
throw new DeviceManagementException("Error occurred while un-marshalling API Publisher Config", 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
Unescape View File

@ -71,7 +71,7 @@ public class DeviceConfigurationManager {
/* Un-marshaling Device Management configuration */ /* Un-marshaling Device Management configuration */
JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class); JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class);
Unmarshaller unmarshaller = cdmContext.createUnmarshaller(); Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
unmarshaller.setSchema(getSchema()); //unmarshaller.setSchema(getSchema());
this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc); this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc);
} catch (JAXBException e) { } catch (JAXBException e) {
throw new DeviceManagementException("Error occurred while initializing Data Source config", e); throw new DeviceManagementException("Error occurred while initializing Data Source config", e);

2
pom.xml
Unescape View File

@ -1065,7 +1065,6 @@
<properties> <properties>
<testng.version>6.1.1</testng.version> <testng.version>6.1.1</testng.version>
<carbon.kernel.version>4.3.0</carbon.kernel.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> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-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> <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<!-- Tomcat --> <!-- Tomcat -->
<!--<orbit.version.tomcat>7.0.59.wso2v1</orbit.version.tomcat>-->
<orbit.version.tomcat>7.0.52.wso2v5</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> <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> <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>

Write Preview
Loading…
Cancel
Save