From d90c9ab68a7d406e6fa9f033ca2376a7e3833a53 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Mon, 28 Nov 2016 11:33:16 +0530
Subject: [PATCH 1/3] Data table fix when list view

---
 .../cdmf.unit.ui.theme/public/css/custom-desktop.css   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index 1a89379d3f..0f440ddf2a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -6510,4 +6510,14 @@ select > option:hover {
 /* Adding style for required fields */
 .required:before {
   content: "*";
+}
+
+.table.list-table:not(.grid-view){
+  margin: 0px !important;
+}
+.table.list-table:not(.grid-view) > thead, .table.list-table:not(.grid-view) > tbody, .table.list-table:not(.grid-view) > tfoot{
+  margin-bottom: 10px !important;
+}
+.table.list-table:not(.grid-view) tbody{
+  margin: 0px !important;
 }
\ No newline at end of file

From a56b953fcb71818ee82bc0256fee2cb295309d49 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Tue, 29 Nov 2016 13:32:29 +0530
Subject: [PATCH 2/3] Validation error fix

---
 .../pages/cdmf.page.group.create/create.hbs   |  6 +-
 .../public/js/group-add.js                    | 61 +++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
index 8ae4393a8f..9d9edd0c53 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
@@ -36,9 +36,11 @@
             <div class="form-login-box">
                 <label class="wr-input-label">Group Name</label>
 
-                <div class="wr-input-control">
+                <div class="form-group wr-input-control">
                     <input type="text right" id="name" placeholder="Group Name" data-regex="{{groupNameJSRegEx}}"
-                           data-errormsg="{{groupNameRegExViolationErrorMsg}}">
+                           data-errormsg="{{groupNameRegExViolationErrorMsg}}" class="form-control">
+                    <span class="groupNameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
+                    <label class="error groupNameEmpty hidden" for="summary"></label>
                 </div>
 
                 <label class="wr-input-label">Description</label>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
index b2a5598c0f..a4fcc5ab25 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
@@ -35,12 +35,10 @@ $(function () {
         var description = $("input#description").val();
 
         if (!name) {
-            $('.wr-validation-summary strong').text("Group Name is a required field. It cannot be empty.");
-            $('.wr-validation-summary').removeClass("hidden");
+            triggerError($("input#name"),"Group Name is a required field. It cannot be empty.");
             return false;
         } else if (!inputIsValid($("input#name").data("regex"), name)) {
-            $('.wr-validation-summary strong').text($("input#name").data("errormsg"));
-            $('.wr-validation-summary').removeClass("hidden");
+            triggerError($("input#name"),$("input#name").data("errormsg"));
             return false;
         } else {
             var group = {"name": name, "description": description};
@@ -69,6 +67,61 @@ $(function () {
     });
 });
 
+/**
+ * @param el
+ * @param errorMsg
+ *
+ * Triggers validation error for provided element.
+ * Note : the basic jQuery validation elements should be present in the markup
+ *
+ */
+function triggerError(el,errorMsg){
+    var parent = el.parents('.form-group'),
+        errorSpan = parent.find('span'),
+        errorMsgContainer = parent.find('label');
+
+    errorSpan.on('click',function(event){
+        event.stopPropagation();
+        removeErrorStyling($(this));
+        el.unbind('.errorspace');
+    });
+
+    el.bind('focusin.errorspace',function(){
+        removeErrorStyling($(this))
+    }).bind('focusout.errorspace',function(){
+        addErrorStyling($(this));
+    }).bind('keypress.errorspace',function(){
+        $(this).unbind('.errorspace');
+        removeErrorStyling($(this));
+    });
+
+    errorMsgContainer.text(errorMsg);
+
+    parent.addClass('has-error has-feedback');
+    errorSpan.removeClass('hidden');
+    errorMsgContainer.removeClass('hidden');
+
+    function removeErrorStyling(el){
+        var parent = el.parents('.form-group'),
+            errorSpan = parent.find('span'),
+            errorMsgContainer = parent.find('label');
+
+        parent.removeClass('has-error has-feedback');
+        errorSpan.addClass('hidden');
+        errorMsgContainer.addClass('hidden');
+    }
+
+    function addErrorStyling(el){
+        var parent = el.parents('.form-group'),
+            errorSpan = parent.find('span'),
+            errorMsgContainer = parent.find('label');
+
+        parent.addClass('has-error has-feedback');
+        errorSpan.removeClass('hidden');
+        errorMsgContainer.removeClass('hidden');
+    }
+}
+
 function displayErrors(message) {
     $('#error-msg').html(message.responseText);
     modalDialog.header('Unexpected error occurred!');

From e9e4c1a3d2e67dd8b700c592569ae86eea6188fe Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 30 Nov 2016 11:26:15 +0530
Subject: [PATCH 3/3] Fixing osgi exports and swagger.io.annotations issue

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7f0b6e4112..f4398752bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -920,6 +920,10 @@
                         <groupId>xerces</groupId>
                         <artifactId>xercesImpl</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-annotations</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>