From 6c85ada9ac9dca66ce98f42e786e03c8c5400f8f Mon Sep 17 00:00:00 2001 From: NuwanSameera Date: Mon, 14 Dec 2015 18:25:33 +0530 Subject: [PATCH 1/4] Update digital display related files --- .../resources/carbonapps/Accelerometer.car | Bin 4184 -> 4184 bytes .../src/main/resources/carbonapps/Battery.car | Bin 3997 -> 3997 bytes .../src/main/resources/carbonapps/GPS.car | Bin 3905 -> 3905 bytes .../src/main/resources/carbonapps/Gravity.car | Bin 4014 -> 4014 bytes .../main/resources/carbonapps/Gyroscope.car | Bin 4074 -> 4074 bytes .../src/main/resources/carbonapps/Light.car | Bin 3942 -> 3942 bytes .../main/resources/carbonapps/Magnetic.car | Bin 4027 -> 4027 bytes .../main/resources/carbonapps/Pressure.car | Bin 4034 -> 4034 bytes .../main/resources/carbonapps/Proximity.car | Bin 4081 -> 4081 bytes .../main/resources/carbonapps/Rotation.car | Bin 4027 -> 4027 bytes .../main/resources/configs/digitaldisplay.xml | 22 --------- .../digitaldisplay-datasources.xml | 46 ++++++++++++++++++ .../private/conf/device-type.json | 6 ++- .../src/main/resources/p2.inf | 6 +-- .../main/resources/conf/devicetype-config.xml | 3 ++ .../store-device-type/modules/operation.js | 14 ------ .../carbonapps/Temperature_Sensor.car | Bin 4138 -> 4138 bytes 17 files changed, 56 insertions(+), 41 deletions(-) delete mode 100644 features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/configs/digitaldisplay.xml create mode 100644 features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/datasources/digitaldisplay-datasources.xml diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Accelerometer.car b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Accelerometer.car index 8de93cc85b6375c4d217d8f2c81f45ea6fc8b58c..cd5c021396fe5870be6032e48e744ce7ce1a69af 100644 GIT binary patch delta 222 zcmcbia6^GNz?+$ci-CcIfgwG#Zz8WPGl=rF0#jYqVCsY(h}!rwlo3Qv4rICqrj3}N zfauMVEE^yaXINi?1$MAGg9SGKWB(43`N4S+EOUm72_kTj+ZSwxB99lC&g1b0(|dUA u!1Q09959{38wsXQ@P>hDMZN+sJ%ukEOuyr+0MnWLv0(ZnKg2vS0Ve>aO-`f$ delta 222 zcmcbia6^GNz?+$ci-CcIf#G&?&qQ8ZW)S6T1*W>J!PE&o5Vi4VC?klT9LRJJOdByj z0nwW!SvEi<&al1&3+!NX1`BNd$Nn86^MmsuSmq2D6GY%5w=dWXMIJ9OoyX%1ruXpJ uf$6_IIbb@6Hxf*r;0*)QihKoNdJ11Sn107s0j4wgW5M)Eeu#Nu0!{!Vqg$i^ diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Battery.car b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Battery.car index 2d55b17941696b26da732d05a7806736a7c76631..09fef03b58d3302b87ad08ebb85bbef84a28fed5 100644 GIT binary patch delta 221 zcmbO$KUbbNz?+$ci-CcIfgwG#Zz8WbGl+6G0aJCRU}~Elh}!tvoe@M&He|XCrrDWq zgXqmqndd_!+F2if1+v)8!2+9?u)l@KOyN8O){@Ni4@{?UyMyU<+%91HE4M3{w&k${ u({(%vVEQ3XFqk&y4FJcIC?f(_8q$!89Mg7nqLbcLD%nZcJDJ delta 221 zcmbO$KUbbNz?+$ci-CcIf#G&?&qQ8xW)S6W0;cLr!PGWA5Vi5SJ0pmmY{+yOOtUlJ z2GN_JGS7!dw6i_{3uLjGg9SD(VSfvenZkJntRocTkQuz?+$ci-CcIfgwG#Zz8WTGl+6F08?d#U}}{fh}wADh7m+hmSQ>!re85# z0nwWeGS7ubB(mND3)rz)g9SF%uz!Te6mXsfYq8_{4W@0loxyYyw*#0y%IyfIIeF~B tv=>hVm|n``52nBK_<(6Q-WZ5DuP>PX%9{eFWB7u>^d>$pF#Vs;2>>(wOr`(; delta 221 zcmX>ocTkQuz?+$ci-CcIf#G&?&qQ8hW)S6U0H(?e!PF`}5Vi5P4I_x2EX8ydOuu5f z0-`q`WS$F=NMyYQ7O-Qp1`BMiVgCq`Dd0Q})?&x?8%*19JA>&aZU-=Zl-m(ZbMn}M tX)m4#Fujz=A54Ge@d49ryfF}QUSBZ%l{W=U$M6M%=}mlIVER9w69B8kS*8F0 diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Gravity.car b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Gravity.car index 2ffae76978003cf2ca3a6005b07afc373d6b89d6..be3e61a3b9aad26c98b6da48e32c47db73c55bff 100644 GIT binary patch delta 222 zcmZ1{zfPVvz?+$ci-CcIfgwG#Zz8V+Gl=pq0aNv+U~0P_h}!tVlMzHuHetF7rg@le zgXqn#m={1KdRZTU1q#^Azyh0BvVVZc%;7u>mdW8_h6ogKdw|W@%k2WDS$JH*v=5IR unC|6C1k)dRLcp{KZvdE{&6@(InfL<1bQoU_m_EuE4yNV#y})!1zY_o=g-Wsj delta 222 zcmZ1{zfPVvz?+$ci-CcIf#G&?&qQ7eW)S6J0;cLs!PIs=5Vi4zCnJcSY{GOEO!F|` z2GN^eF)x5f^s+tx3ly-Kfdw|NWd8t>nZtP&ER(~<3=t^e_5ho)m)iwQv+%frX&)Xt uFx|_O2&O;sgn(%e-T*K?n>PhaGw}t2=`g+=FnyFS98Amedx7a3ekTB+%vZ7i diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Gyroscope.car b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Gyroscope.car index 961cece6ebaf29baf64849878a5276d2ea7e36db..4439e6cedde21b52fc329716f13effa88626cf4a 100644 GIT binary patch delta 222 zcmaDQ|4N=Wz?+$ci-CcIfgwG#Zz8WHGl=pu15-`rU}}#Zh}!tpn-N4$wr08xrbU_W zgXqoQnU_K&=CeKl3$(G>g9SF9VE+t}*~fVfEYr`$3K5vj?FlyHF}E9-*5Ppn(`7t% uV0t@G3YeDT4TXsF27&3*ycuBHj4v2W_wW^f>HmC@U^<%L3rw%zcLD%6<4ueJ delta 222 zcmaDQ|4N=Wz?+$ci-CcIf#G&?&qQ8JW)S6R2Bw;g6ZpgUSL{<-w6P3o=V>U delta 222 zcmaDR_e_pAz?+$ci-CcIf#G&?&qQ8RW)S6S1g5Ht!PEvl5Vi546C;S8tj2T!O#fuM z0iriwVV(_LyNuOFC>=S=|9hj{(LvyzY_rMcS;To3B(u1P3&Jnu_5d4kfZG*JbMUx<=|CPk uFg=MU2~2AX5Vi4@7bA$CY|eBQO!G6} z2GN_}GB1KiOk#Zm7AR-41`BN7%Ki!>vxxI7NM>;n7ldER?EyC80Jkfc=HPJy(}6s8 uV0scy5}5wZ69T6Fcmu)oBHlDG&CM4CrW5$`!1P7F2r#X~?**nS`JDi+^;lZ~ diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Pressure.car b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Pressure.car index 7db5214b15e995f53cf2a6706995535f75d83c96..2790d34e4712efa251eca9e9122b1ae86179a938 100644 GIT binary patch delta 221 zcmX>ke@LD;z?+$ci-CcIfgwG#Zz8V+Gl=pq1yc=XU}~oxh}!tdlMzHuHeQ3skUKfdw{iW&a3~S;=`8B(u1Z3&OAA_5d4koZA&l^YgfY=?ES> uFg=qe2~7Xv2?5igyn$ePC2ty-7UBy6)9HM9VEP7M1eiAF_X5)m{7wL0D@)n{ delta 221 zcmX>ke@LD;z?+$ci-CcIf#G&?&qQ7eW)S6J3Z@#&z|>AX5Vi4@CnJcSY{qmIO!G0{ z1<{+|F)xBhOlExq7N}se0t;;3%Ki}|vy$^HNM>;*7ldEK?EyC8IJYa9=I3z((-Ay& uV0tD`5}5wS69T3~c>}@pO5QXuEyNcDrqlWI!1N8i2rzBT?**nC_?-aO@>tpc diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Proximity.car b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/carbonapps/Proximity.car index 6bf842b7e73d892294bef2f6c6d7363b130c3c91..12ca954773f8fc8cef84789f5e135e2594aee0a6 100644 GIT binary patch delta 222 zcmew;|52Vdz?+$ci-CcIfgwG#Zz8WHGl=pu15-`rU}}#Zh}!tphY>_iwqd#frp1}> zgXqmanU_K&7P3A83v{qKfCV<6X8!__ImCG$EHj0R9U?G~+Y@ZYD{eP1ZOr2irfYfZ u!1O+z6fmvI8wwHU4Fc1bcr(DXEnhI0p3GMOrrG!-!E_S87nokp?*sr*VoeeN delta 222 zcmew;|52Vdz?+$ci-CcIf#G&?&qQ8JW)S6R2Bw1&Y}$!2+AtvwwidEaE%^mMP?7gb0*!dw|V2!0igAIe6T_bRdr% un4ZLw1g5|9gn(&3-as(Dh&K&PbMpm(=>)z!Fny6P0!-`hdx7anekTB1bxT+P delta 222 zcmdljzgwO+z?+$ci-CcIf#G&?&qQ7eW)S6J3Z@#&z|>AX5Vi4@CnJcSY{qm2O!G3| z2GN^eGcSZl^s_z$3ly_if(16OXa4|^S;Tn;EK|tE2oWgd_5ho4fZG*JbMUx<=|CPk uFg=MU2~2 - - - - jdbc/DigitalDisplayDM_DB - diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/datasources/digitaldisplay-datasources.xml b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/datasources/digitaldisplay-datasources.xml new file mode 100644 index 0000000000..0f841dc50d --- /dev/null +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/datasources/digitaldisplay-datasources.xml @@ -0,0 +1,46 @@ + + + + + org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader + + + + DigitalDisplayDM_DB + The datasource used for the Digital Display database + + jdbc/DigitalDisplayDM_DB + + + + jdbc:h2:repository/database/DigitalDisplayDM_DB;DB_CLOSE_ON_EXIT=FALSE + + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + + + + diff --git a/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 b/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 index 72cc9b7eec..5abc248f05 100644 --- a/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 +++ b/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 +1,8 @@ { "deviceType": { - "displayName": "digital display", - "category" : "iot" + "label": "Digital Display", + "category": "iot", + "downloadAgentUri": "http://localhost:9763/digital_display/manager/device/device_display/download" } } + diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf index 105f5b9f9d..99794b5ab2 100644 --- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf @@ -6,6 +6,6 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../reso 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}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/digitaldisplay,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}/jaggerryapps/,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);\ +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/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);\ diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml index 0061d37641..368874ad39 100644 --- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml +++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml @@ -8,4 +8,7 @@ jdbc/AndroidSenseDM_DB + + jdbc/DigitalDisplayDM_DB + \ No newline at end of file diff --git a/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 b/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 index 79cab72166..f78650e7d1 100644 --- a/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 +++ b/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 []; } diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/carbonapps/Temperature_Sensor.car b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/carbonapps/Temperature_Sensor.car index 6ad7c091624b30cd3573dc3251a5bb60c9cb8aa9..49ade2508547637eab1329eafcc314111a3013ee 100644 GIT binary patch delta 222 zcmZ3buu6e9z?+$ci-CcIfgwG#Zz8WXGl=rG08?$2VCs+_h}!r$kP$>rc4xW`rd63A zf#}U#EUO?A+gYE31s1Y7fdw`{WB&q?xyyMTEVG`A8zQim+Z${KH;)IH4&(6z(~EfQ v!1QCD3^47-8xE#d@P>ft|GYV1I*%_DOdsPb0n@hp(O`NuzZaN(!S4hB$plTf delta 222 zcmZ3buu6e9z?+$ci-CcIf#G&?&qQ8pW)S6V0jAn4!PFr=5Vi4hAR~yL?9Ox>Osg_K z0@0hfSXMzKwzED53oK-F0t;+@#{LB&bC>fxSY|yJH$-4Bw>Q`fZXORX9meAcrWf(p vf$7IQ8DQFvHyli_;0*!O|9Nx3bRJ(Qm_Ei=0;X;GqrvoSelIZng5L=MM_O9A From 91de0977131c13a0db3a2c8ba4df124637ed53cc Mon Sep 17 00:00:00 2001 From: NuwanSameera Date: Mon, 14 Dec 2015 18:59:46 +0530 Subject: [PATCH 2/4] digital display p2.inf changes --- .../src/main/resources/p2.inf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf index d740058fce..61d1af66ba 100644 --- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf @@ -9,10 +9,3 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf 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);\ -<<<<<<< HEAD -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}/../../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);\ ->>>>>>> upstream/IoTS-1.0.0-M1 From e9bddf13d929f33206ff478e6a0461ded4d12a6b Mon Sep 17 00:00:00 2001 From: NuwanSameera Date: Mon, 14 Dec 2015 19:40:19 +0530 Subject: [PATCH 3/4] digital display p2.inf changes --- .../private/conf/device-type.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/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 b/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 index d6ed970717..5abc248f05 100644 --- a/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 +++ b/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,13 +1,8 @@ { "deviceType": { -<<<<<<< HEAD "label": "Digital Display", "category": "iot", "downloadAgentUri": "http://localhost:9763/digital_display/manager/device/device_display/download" -======= - "displayName": "Digital Display", - "category" : "iot" ->>>>>>> upstream/IoTS-1.0.0-M1 } } From cbae64d925601bb64b361121e185285b3991b38e Mon Sep 17 00:00:00 2001 From: NuwanSameera Date: Tue, 15 Dec 2015 09:39:28 +0530 Subject: [PATCH 4/4] digital display modifications --- .../constants/DigitalDisplayConstants.java | 2 +- .../device-view.hbs | 0 .../device-view.js | 0 .../device-view.json | 0 .../public/images/thumb.png | Bin .../public/js/device-detail.js | 0 .../public/js/load-map.js | 0 .../public/templates/applications-list.hbs | 0 .../public/templates/operations-log.hbs | 0 .../public/templates/policy-compliance.hbs | 0 .../private/conf/device-type.json | 7 +++++++ .../public/images/digitaldisplay.png | Bin .../public/images/schematicsGuide.png | Bin .../public/images/thumb.png | Bin .../public/js/download.js | 0 .../public/js/jquery.validate.js | 0 .../type-view.hbs | 8 ++++---- .../type-view.json | 0 .../private/conf/device-type.json | 8 -------- .../src/main/resources/p2.inf | 6 +++--- .../src/main/resources/conf/devicetype-config.xml | 8 +------- 21 files changed, 16 insertions(+), 23 deletions(-) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/device-view.hbs (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/device-view.js (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/device-view.json (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/public/images/thumb.png (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/public/js/device-detail.js (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/public/js/load-map.js (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/public/templates/applications-list.hbs (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/public/templates/operations-log.hbs (100%) rename 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.device-view => cdmf.unit.device.type.digital_display.device-view}/public/templates/policy-compliance.hbs (100%) create mode 100644 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 rename 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 => cdmf.unit.device.type.digital_display.type-view}/public/images/digitaldisplay.png (100%) rename 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 => cdmf.unit.device.type.digital_display.type-view}/public/images/schematicsGuide.png (100%) rename 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 => cdmf.unit.device.type.digital_display.type-view}/public/images/thumb.png (100%) rename 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 => cdmf.unit.device.type.digital_display.type-view}/public/js/download.js (100%) rename 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 => cdmf.unit.device.type.digital_display.type-view}/public/js/jquery.validate.js (100%) rename 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 => cdmf.unit.device.type.digital_display.type-view}/type-view.hbs (97%) rename 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 => cdmf.unit.device.type.digital_display.type-view}/type-view.json (100%) delete mode 100644 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 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 4701e6433d..d73335ca73 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 = "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"; diff --git a/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.device-view/device-view.hbs b/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.device-view/device-view.hbs similarity index 100% rename from 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.device-view/device-view.hbs rename to 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.device-view/device-view.hbs diff --git a/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.device-view/device-view.js b/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.device-view/device-view.js similarity index 100% rename from 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.device-view/device-view.js rename to 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.device-view/device-view.js diff --git a/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.device-view/device-view.json b/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.device-view/device-view.json similarity index 100% rename from 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.device-view/device-view.json rename to 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.device-view/device-view.json diff --git a/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.device-view/public/images/thumb.png b/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.device-view/public/images/thumb.png similarity index 100% rename from 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.device-view/public/images/thumb.png rename to 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.device-view/public/images/thumb.png diff --git a/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.device-view/public/js/device-detail.js b/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.device-view/public/js/device-detail.js similarity index 100% rename from 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.device-view/public/js/device-detail.js rename to 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.device-view/public/js/device-detail.js diff --git a/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.device-view/public/js/load-map.js b/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.device-view/public/js/load-map.js similarity index 100% rename from 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.device-view/public/js/load-map.js rename to 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.device-view/public/js/load-map.js diff --git a/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.device-view/public/templates/applications-list.hbs b/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.device-view/public/templates/applications-list.hbs similarity index 100% rename from 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.device-view/public/templates/applications-list.hbs rename to 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.device-view/public/templates/applications-list.hbs diff --git a/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.device-view/public/templates/operations-log.hbs b/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.device-view/public/templates/operations-log.hbs similarity index 100% rename from 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.device-view/public/templates/operations-log.hbs rename to 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.device-view/public/templates/operations-log.hbs diff --git a/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.device-view/public/templates/policy-compliance.hbs b/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.device-view/public/templates/policy-compliance.hbs similarity index 100% rename from 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.device-view/public/templates/policy-compliance.hbs rename to 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.device-view/public/templates/policy-compliance.hbs diff --git a/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 b/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 new file mode 100644 index 0000000000..58e14efa12 --- /dev/null +++ b/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" + } +} + diff --git a/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/public/images/digitaldisplay.png b/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/public/images/digitaldisplay.png similarity index 100% rename from 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/public/images/digitaldisplay.png rename to 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/public/images/digitaldisplay.png diff --git a/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/public/images/schematicsGuide.png b/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/public/images/schematicsGuide.png similarity index 100% rename from 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/public/images/schematicsGuide.png rename to 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/public/images/schematicsGuide.png diff --git a/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/public/images/thumb.png b/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/public/images/thumb.png similarity index 100% rename from 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/public/images/thumb.png rename to 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/public/images/thumb.png diff --git a/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/public/js/download.js b/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/public/js/download.js similarity index 100% rename from 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/public/js/download.js rename to 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/public/js/download.js diff --git a/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/public/js/jquery.validate.js b/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/public/js/jquery.validate.js similarity index 100% rename from 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/public/js/jquery.validate.js rename to 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/public/js/jquery.validate.js diff --git a/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/type-view.hbs b/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 similarity index 97% rename from 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/type-view.hbs rename to 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 index 586361ba27..f45e9d7842 100644 --- a/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/type-view.hbs +++ b/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>
+ value="digital_display"/> + value="digital_display"/>
- +
diff --git a/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/type-view.json b/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.json similarity index 100% rename from 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/type-view.json rename to 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.json diff --git a/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 b/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 deleted file mode 100644 index 5abc248f05..0000000000 --- a/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 +++ /dev/null @@ -1,8 +0,0 @@ -{ - "deviceType": { - "label": "Digital Display", - "category": "iot", - "downloadAgentUri": "http://localhost:9763/digital_display/manager/device/device_display/download" - } -} - diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf index 61d1af66ba..2f310af37a 100644 --- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf @@ -2,9 +2,9 @@ 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.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}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/digitaldisplay,overwrite:true);\ +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/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/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/);\ diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml index 453764060c..4af6830949 100644 --- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml +++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml @@ -8,13 +8,7 @@ jdbc/AndroidSenseDM_DB -<<<<<<< HEAD - - jdbc/DigitalDisplayDM_DB - -======= - + jdbc/DigitalDisplayDM_DB ->>>>>>> upstream/IoTS-1.0.0-M1 \ No newline at end of file