From 3a7bef2170221d36795c3879d87a386a1b8c5816 Mon Sep 17 00:00:00 2001
From: manoj <manojg@wwso2.com>
Date: Mon, 8 Dec 2014 17:24:29 +0530
Subject: [PATCH 1/2] DAO Implementation Layer

---
 .../device-mgt/org.wso2.carbon.device.mgt.core/pom.xml     | 7 +++++++
 .../device/mgt/core/config/DeviceConfigurationManager.java | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 0490197ae0..59aa99043e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -68,6 +68,13 @@
                     </instructions>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18</version>
+            </plugin>
+
         </plugins>
     </build>
 
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 59144523f0..d178b3342f 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
@@ -20,9 +20,8 @@ import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.dao.exception.DeviceMgtDAOFactory;
+import org.wso2.carbon.device.mgt.core.dao.DeviceMgtDAOFactory;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
-import org.wso2.carbon.device.mgt.core.util.DeviceMgtDbCreator;
 import org.wso2.carbon.utils.CarbonUtils;
 import javax.sql.DataSource;
 import javax.xml.bind.JAXBContext;

From 76e103ef003eec02e514b6885d2d4fbf4cd6fec8 Mon Sep 17 00:00:00 2001
From: manoj <manojg@wwso2.com>
Date: Mon, 8 Dec 2014 17:34:09 +0530
Subject: [PATCH 2/2] DAO Layer Implementation

---
 .../mgt/core/dao/{exception => }/DeviceMgtDAOFactory.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/{exception => }/DeviceMgtDAOFactory.java (98%)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceMgtDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceMgtDAOFactory.java
similarity index 98%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceMgtDAOFactory.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceMgtDAOFactory.java
index 94d518e808..71d5c2f313 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceMgtDAOFactory.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceMgtDAOFactory.java
@@ -12,7 +12,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.core.dao.exception;
+package org.wso2.carbon.device.mgt.core.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;