From 7837c9809269c554296d33478b9685ab1e62cfd0 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Fri, 11 Dec 2015 09:38:31 +0530
Subject: [PATCH] digital display plugin updates

---
 .../pom.xml                                      |  3 +--
 .../api/DigitalDisplayManagerService.java        |  7 ++++---
 .../constants/DigitalDisplayConstants.java       |  2 +-
 pom.xml                                          | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/pom.xml b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/pom.xml
index 4b4a374a07..4c1d9f0032 100644
--- a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/pom.xml
+++ b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/pom.xml
@@ -102,7 +102,6 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay</artifactId>
-            <version>1.9.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -232,5 +231,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>
\ No newline at end of file
diff --git a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayManagerService.java b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayManagerService.java
index 5b869f0726..e745f5dc09 100644
--- a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayManagerService.java
+++ b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayManagerService.java
@@ -22,9 +22,9 @@ import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.iot.common.DeviceManagement;
-import org.wso2.carbon.device.mgt.iot.common.util.ZipArchive;
-import org.wso2.carbon.device.mgt.iot.common.util.ZipUtil;
+import org.wso2.carbon.device.mgt.iot.DeviceManagement;
+import org.wso2.carbon.device.mgt.iot.util.ZipArchive;
+import org.wso2.carbon.device.mgt.iot.util.ZipUtil;
 import org.wso2.carbon.device.mgt.iot.digitaldisplay.constants.DigitalDisplayConstants;
 
 import javax.servlet.http.HttpServletResponse;
@@ -49,6 +49,7 @@ public class DigitalDisplayManagerService {
 	public boolean register(@QueryParam("deviceId") String deviceId,
 	                        @QueryParam("name") String name, @QueryParam("owner") String owner ) {
 
+		log.info("Register call from " + owner);
 		DeviceManagement deviceManagement = new DeviceManagement(SUPER_TENANT);
 
 		DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
diff --git a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/constants/DigitalDisplayConstants.java b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/constants/DigitalDisplayConstants.java
index d73335ca73..4701e6433d 100644
--- a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/constants/DigitalDisplayConstants.java
+++ b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/constants/DigitalDisplayConstants.java
@@ -18,7 +18,7 @@ package org.wso2.carbon.device.mgt.iot.digitaldisplay.constants;
 
 public class DigitalDisplayConstants {
 
-    public final static String DEVICE_TYPE = "digital_display";
+    public final static String DEVICE_TYPE = "digitaldisplay";
     public final static String DEVICE_PLUGIN_DEVICE_NAME = "DEVICE_NAME";
     public final static String DEVICE_PLUGIN_DEVICE_ID = "DIGITAL_DISPLAY_DEVICE_ID";
 
diff --git a/pom.xml b/pom.xml
index 87185f33c9..0dbd0cc31f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,6 +407,22 @@
                 <type>war</type>
             </dependency>
 
+            <!--+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
+            <!--+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
+            <!--Android sense DeviceType Impl, API and Agent-->
+            <!--+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay.api</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+
             <!--+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
             <dependency>
                 <groupId>org.json.wso2</groupId>