Merge pull request #9 from NuwanSameera/IoTS-1.0.0-M1

rename files and folders to digital_display

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 = "digitaldisplay";
+    public final static String DEVICE_TYPE = "digital_display";
     public final static String DEVICE_PLUGIN_DEVICE_NAME = "DEVICE_NAME";
     public final static String DEVICE_PLUGIN_DEVICE_ID = "DIGITAL_DISPLAY_DEVICE_ID";
 

features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/configs/digitaldisplay.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015, 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
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<DeviceTypeConfigurations type="digitaldisplay">
-  <DatasourceName>jdbc/DigitalDisplayDM_DB</DatasourceName>
-</DeviceTypeConfigurations>

features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/private/conf/device-type.json

@@ -0,0 +1,7 @@
+{
+  "deviceType": {
+    "label": "Digital Display",
+    "category": "iot"
+  }
+}
+

features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs

@@ -45,12 +45,12 @@
                                    name="deviceName" size="60" required>
                             <br/>
                             <input type="hidden" class="deviceType" name="deviceType"
-                                   value="digitaldisplay"/>
+                                   value="digital_display"/>
                             <input type="hidden" class="sketchType" name="sketchType"
-                                   value="digitaldisplay"/>
+                                   value="digital_display"/>
                             <div class="sketchTypes" style="  padding-top: 20px; padding-bottom: 5px; font-size: 18px;">
-                                    <input type="radio" name="sketchType" id="digitaldisplay"
+                                    <input type="radio" name="sketchType" id="digital_display"
-                                           value="digitaldisplay"><label for="digitaldisplay">digitaldisplay</label>
+                                           value="digital_display"><label for="digital_display">digitaldisplay</label>
                             </div>
                         </div>
                     </div>

features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/private/conf/device-type.json

@@ -1,6 +0,0 @@
-{
-  "deviceType": {
-    "displayName": "Digital Display",
-    "category" : "iot"
-  }
-}

features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf

@@ -2,12 +2,10 @@ instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/digitaldisplay/);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/digital_display/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/agent/,target:${installFolder}/../../resources/sketches/digitaldisplay/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/agent/,target:${installFolder}/../../resources/sketches/digital_display/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/digitaldisplay,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/digital_display,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/datasources/devicemgt/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/devicemgt,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/devicetype-conf/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/configs/,target:${installFolder}/../../conf/devicetype-conf/,overwrite:true);\

features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml

@@ -8,7 +8,7 @@
     <IotDeviceTypeConfig type="android_sense">
         <DatasourceName>jdbc/AndroidSenseDM_DB</DatasourceName>
     </IotDeviceTypeConfig>
-    <IotDeviceTypeConfig type="digitaldisplay">
+    <IotDeviceTypeConfig type="digital_display">
         <DatasourceName>jdbc/DigitalDisplayDM_DB</DatasourceName>
     </IotDeviceTypeConfig>
 </IoTDeviceTypeConfigManager>

features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/store/extensions/app/store-device-type/modules/operation.js

@@ -35,20 +35,6 @@ var operationModule = function () {
         switch (deviceType) {
             case "virtual_firealarm":
                 return [{name: "Alarm Status", description: "0:off 1:on", operation: "bulb"}];
-            case "digital_display":
-                return [
-                    {name: "Restart Browser", description: "0:faild 1:sucess", operation: "bulb"},
-                    {name: "Close Browser", description: "0:faild 1:sucess"},
-                    {name: "Terminate Display", description: "0:faild 1:sucess"},
-                    {name: "Restart Display", description: "0:faild 1:sucess"},
-                    {name: "Edit Content", description: "0:faild 1:sucess"},
-                    {name: "Add New Resource", description: "0:faild 1:sucess"},
-                    {name: "Remove Resource", description: "0:faild 1:sucess"},
-                    {name: "Remove Directory", description: "0:faild 1:sucess"},
-                    {name: "Remove Content", description: "0:faild 1:sucess"},
-                    {name: "Shutdown Display", description: "0:faild 1:sucess"}
-                ];
-
             default:
                 return [];
         }