From c48f879205d417ec81e52d12a0bcbeffcbe3006a Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sun, 23 Oct 2016 01:24:33 +0530
Subject: [PATCH] added XmlAccessorType to root pom

---
 .../pom.xml                                                 | 6 +++++-
 .../type/deployer/config/DeviceManagementConfiguration.java | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
index 0e607a6529..a4cd448877 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
@@ -66,6 +66,10 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -85,7 +89,7 @@
                             javax.sql,
                             javax.xml.bind,
                             javax.xml.bind.annotation,
-                            javax.xml.parsers,
+                            javax.xml.parsers; version="${javax.xml.parsers.import.pkg.version}",
                             org.apache.axis2.context,
                             org.apache.axis2.deployment.*,
                             org.apache.commons.lang,
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java
index 91bced5368..e8f00310a2 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java
@@ -29,12 +29,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * 
  */
-//@XmlAccessorType(XmlAccessType.FIELD)
+
 //@XmlType(name = "DeviceManagementConfiguration", propOrder = {
 //    "deviceType",
 //    "managementRepository",
 //    "pushNotificationConfiguration"
 //})
+@XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "DeviceManagementConfiguration")
 public class DeviceManagementConfiguration {
 
@@ -45,6 +46,9 @@ public class DeviceManagementConfiguration {
     @XmlElement(name = "PushNotificationConfiguration", required = true)
     protected PushNotificationConfiguration pushNotificationConfiguration;
 
+    private DeviceManagementConfiguration() {
+    }
+
     /**
      * Gets the value of the device property.
      *