From f55cd20a732ed893bd364c7f0de1bee88e866d5d Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Thu, 8 Dec 2016 18:27:56 +0530
Subject: [PATCH] Resolved conflicts in device type-vies files.

---
 .../type-view.hbs                             | 38 +++++++++---------
 .../type-view.hbs                             | 39 ++++++++-----------
 pom.xml                                       |  6 ---
 3 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
index 035b88b71b..3fc8f89bbb 100644
--- a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
+++ b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
@@ -1,13 +1,10 @@
 {{!
   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-
   WSO2 Inc. licenses this file to you under the Apache License,
   Version 2.0 (the "License"); you may not use this file except
   in compliance with the License.
   You may obtain a copy of the License at
-
   http://www.apache.org/licenses/LICENSE-2.0
-
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,17 +17,15 @@
     <hr>
 </div>
 
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/ardunio-icon.png" class="img-responsive">
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Arduino"
-                                  target="_blank">[ here ]</a> for latest instructions and
-                         troubleshooting.</h4>
+
 </div>
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor
@@ -40,34 +35,37 @@
     <hr>
     <ul class="list-unstyled">
         <li class="padding-top-double">
-            <span class="circle">ITEM 01</span>
+            <span class="badge">ITEM 01</span>
                Arduino UNO Board.
         </li>
-        <li class="padding-top-double">
-            <span class="circle">ITEM 02</span>
+        <li>
+            <span class="badge">ITEM 02</span>
                Adafruit Wifi Shield for Arduino.
         </li>
-        <li class="padding-top-double">
-            <span class="circle">ITEM 03</span>
+        <li>
+            <span class="badge">ITEM 03</span>
                LED bulb connected to Pin 13.
             <i>(If not available, will use the one on the board.)</i>
         </li>
-        <li class="padding-top-double">
-            <span class="circle">ITEM 04</span>
-               Resistor( e.g 330 ohms )
+        <li>
+            <span class="badge">ITEM 04</span>
+               Resister( e.g 330 ohms )
         </li>
-        <li class="padding-top-double">
-            <span class="circle">STEP 05</span>
+        <li>
+            <span class="badge">STEP 05</span>
                Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
        class="btn-operations" target="_blank">
-        <i class="fw fw-api"></i> View API
+        <i class="fw fw-api add-margin-1x"></i> View API
     </a>
     <a href="#" class="download-link btn-operations">
-        <i class="fw fw-download"></i>Download Sketch
+        <i class="fw fw-download add-margin-1x"></i>Download Sketch
     </a>
+    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Arduino"
+                                 target="_blank">here</a> for latest instructions and
+        troubleshooting.</p>
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
             <div class="row">
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
index 332e82bbe5..620bf21699 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
@@ -1,13 +1,10 @@
 {{!
   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-
   WSO2 Inc. licenses this file to you under the Apache License,
   Version 2.0 (the "License"); you may not use this file except
   in compliance with the License.
   You may obtain a copy of the License at
-
   http://www.apache.org/licenses/LICENSE-2.0
-
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,17 +17,12 @@
     <hr>
 </div>
 
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/respberry-icon.png" class="img-responsive">
 </div>
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Raspberry+Pi"
-                                  target="_blank">[ here ]</a> for latest instructions and
-                         troubleshooting.</h4>
-</div>
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect a RaspberryPi to WSO2 IoT Server and manage it.</p>
@@ -39,33 +31,36 @@
     <hr>
     <ul class="list-unstyled">
         <li class="padding-top-double">
-            <span class="circle">ITEM 01</span>
+            <span class="badge">ITEM 01</span>
                Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]).
         </li>
-        <li class="padding-top-double">
-            <span class="circle">ITEM 02</span>
+        <li>
+            <span class="badge">ITEM 02</span>
                Adafruit DHT11 Temperature Sensor.
         </li>
-        <li class="padding-top-double">
-            <span class="circle">ITEM 03</span>
+        <li>
+            <span class="badge">ITEM 03</span>
                LED Bulb.
         </li>
-        <li class="padding-top-double">
-            <span class="circle">ITEM 04</span>
-               Resistor (eg : 470 ohm).
+        <li>
+            <span class="badge">ITEM 04</span>
+               Resister (eg : 470 ohm).
         </li>
-        <li class="padding-top-double">
-            <span class="circle">STEP 05</span>
+        <li>
+            <span class="badge">STEP 05</span>
                Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
        class="btn-operations"
-       target="_blank"><i class="fw fw-api"></i> View API</i>
+       target="_blank"><i class="fw fw-api add-margin-1x"></i> View API</i>
     </a>
     <a href="#" class="download-link btn-operations">
-        <i class="fw fw-download"></i>Download Agent
+        <i class="fw fw-download add-margin-1x"></i>Download Agent
     </a>
+    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Raspberry+Pi"
+                                 target="_blank">here</a> for latest instructions and
+        troubleshooting.</p>
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
             <div class="row">
diff --git a/pom.xml b/pom.xml
index f6181f3235..d2b339309f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,11 +417,6 @@
                 <artifactId>org.wso2.carbon.device.mgt.input.adapter.xmpp</artifactId>
                 <version>${carbon.devicemgt.plugins.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.jayway.jsonpath</groupId>
-                <artifactId>json-path</artifactId>
-                <version>${jsonpath.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId>
@@ -1312,7 +1307,6 @@
         <commons-io.version>2.4</commons-io.version>
         <apache-felix.version>1.0.8</apache-felix.version>
         <googlecode.plist.version>1.8</googlecode.plist.version>
-        <jsonpath.version>0.9.1</jsonpath.version>
         <commons.lang.version>2.2</commons.lang.version>