From ff6b1e32b2b2c8741079341198064e4a42d76b0f Mon Sep 17 00:00:00 2001 From: sinthuja Date: Thu, 4 May 2017 21:41:34 +0530 Subject: [PATCH] Fixing the virtual fire alarm device types. --- .../src/main/resources/p2.inf | 4 +- .../pom.xml | 150 +++++++++++++++ .../src/main/resources/build.properties | 0 .../src/main/resources/p2.inf | 6 + .../pom.xml | 173 ++++++++++++++++++ .../src/main/resources/build.properties | 1 + .../src/main/resources/certs/wso2certs.jks | Bin .../virtual_firealarm-datasources.xml | 0 .../src/main/resources/dbscripts/h2.sql | 0 .../src/main/resources/dbscripts/mssql.sql | 0 .../src/main/resources/dbscripts/mysql.sql | 0 .../src/main/resources/dbscripts/oracle.sql | 0 .../main/resources/dbscripts/postgresql.sql | 0 .../devicetypes/virtual_firealarm.xml | 0 .../src/main/resources/p2.inf | 25 +++ .../pom.xml | 74 +------- .../resources/advanced_agent/cep_query.txt | 0 .../advanced_agent/deviceConfig.properties | 0 .../advanced_agent/sketch.properties | 0 .../resources/advanced_agent/start-device.sh | 0 .../resources/agent/deviceConfig.properties | 0 .../main/resources/agent/sketch.properties | 0 .../src/main/resources/agent/start-device.sh | 0 .../resources/agent/virtual_firealarm.jks | Bin .../src/main/resources/build.properties | 1 + .../src/main/resources/certs/wso2certs.jks | Bin 0 -> 11731 bytes .../virtual_firealarm-datasources.xml | 48 +++++ .../src/main/resources/dbscripts/h2.sql | 8 + .../src/main/resources/dbscripts/mssql.sql | 8 + .../src/main/resources/dbscripts/mysql.sql | 12 ++ .../src/main/resources/dbscripts/oracle.sql | 8 + .../main/resources/dbscripts/postgresql.sql | 8 + .../devicetypes/virtual_firealarm.xml | 67 +++++++ .../src/main/resources/p2.inf | 27 +-- .../virtual-fire-alarm-plugin-feature/pom.xml | 4 +- 35 files changed, 533 insertions(+), 91 deletions(-) create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature}/src/main/resources/build.properties (100%) create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/src/main/resources/p2.inf create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/build.properties rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/certs/wso2certs.jks (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/datasources/virtual_firealarm-datasources.xml (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/dbscripts/h2.sql (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/dbscripts/mssql.sql (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/dbscripts/mysql.sql (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/dbscripts/oracle.sql (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/dbscripts/postgresql.sql (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature}/src/main/resources/devicetypes/virtual_firealarm.xml (100%) create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/p2.inf rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/pom.xml (72%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/advanced_agent/cep_query.txt (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/advanced_agent/deviceConfig.properties (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/advanced_agent/sketch.properties (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/advanced_agent/start-device.sh (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/agent/deviceConfig.properties (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/agent/sketch.properties (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/agent/start-device.sh (100%) rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/agent/virtual_firealarm.jks (100%) create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/build.properties create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/certs/wso2certs.jks create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/h2.sql create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mssql.sql create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mysql.sql create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/oracle.sql create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/postgresql.sql create mode 100644 features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml rename features/device-types-feature/virtual-fire-alarm-plugin-feature/{org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature => org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature}/src/main/resources/p2.inf (66%) diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/p2.inf b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/p2.inf index 8f06fe31a7..ae6c92537e 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/p2.inf +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/p2.inf @@ -1,3 +1,3 @@ instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/carbonapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/resources/devicetypes/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../analytics/repository/deployment/server/carbonapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics_${feature.version}/carbonapps/,target:${installFolder}/../../analytics/repository/deployment/server/carbonapps/,overwrite:true);\ diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml new file mode 100644 index 0000000000..dadfdc49d3 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml @@ -0,0 +1,150 @@ + + + + + + + + org.wso2.carbon.devicemgt-plugins + virtual-fire-alarm-plugin-feature + 3.0.32-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature + pom + WSO2 Carbon - IoT Server VirtualFireAlarm Analytics Feature + http://wso2.org + This feature contains the VirtualFireAlarm Device type specific analytics implementations for the IoT Server + + + + + + + maven-resources-plugin + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + package + + unpack + + + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics + + ${project.version} + zip + true + + ${project.build.directory}/maven-shared-archive-resources/carbonapps + + **/* + + + + + + unpack-analytics + package + + unpack + + + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot.analytics + ${project.version} + zip + true + + ${project.build.directory}/maven-shared-archive-resources/carbonapps + + **/* + + + + + + + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics + ../../../features/etc/feature.properties + + + org.wso2.carbon.p2.category.type:server + org.eclipse.equinox.p2.type.group:true + + + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.devicemgt.plugins.version} + + + + + + + + + + diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/build.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/src/main/resources/build.properties similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/build.properties rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/src/main/resources/build.properties diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/src/main/resources/p2.inf b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..f65b61a171 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/src/main/resources/p2.inf @@ -0,0 +1,6 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../analytics/repository/deployment/server/carbonapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics_${feature.version}/carbonapps/,target:${installFolder}/../../analytics/repository/deployment/server/carbonapps/,overwrite:true);\ + +instructions.unconfigure = \ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/carbonapps/virtualfirealarm.car);\ \ No newline at end of file diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml new file mode 100644 index 0000000000..c54d1cdd51 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml @@ -0,0 +1,173 @@ + + + + + + + + org.wso2.carbon.devicemgt-plugins + virtual-fire-alarm-plugin-feature + 3.0.32-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature + pom + WSO2 Carbon - IoT Server VirtualFireAlarm Backend Feature + http://wso2.org + This feature contains the VirtualFireAlarm Device type specific backend implementations for the IoT Server + + + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot.virtualfirealarm.api + war + + + com.h2database.wso2 + h2-database-engine + + + + + + + maven-resources-plugin + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy-jaxrs-war + package + + copy + + + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot.virtualfirealarm.api + + war + true + ${project.build.directory}/maven-shared-archive-resources/webapps/ + virtual_firealarm.war + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + create-virtual-firealarm-plugin-mgt-schema + package + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend + ../../../features/etc/feature.properties + + + org.wso2.carbon.p2.category.type:server + org.eclipse.equinox.p2.type.group:true + + + + org.wso2.carbon.core.server:${carbon.kernel.version} + + org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version} + + + + + + + + + + diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/build.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/build.properties new file mode 100644 index 0000000000..9c86577d76 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/certs/wso2certs.jks b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/certs/wso2certs.jks similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/certs/wso2certs.jks rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/certs/wso2certs.jks diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/h2.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/h2.sql rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/h2.sql diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mssql.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mssql.sql rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/mssql.sql diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mysql.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mysql.sql rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/mysql.sql diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/oracle.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/oracle.sql rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/oracle.sql diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/postgresql.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/postgresql.sql similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/postgresql.sql rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/dbscripts/postgresql.sql diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/devicetypes/virtual_firealarm.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/devicetypes/virtual_firealarm.xml rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/p2.inf b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..fc574d82f8 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/p2.inf @@ -0,0 +1,25 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/devicetypes/);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/virtual_firealarm,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/security/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend_${feature.version}/certs/,target:${installFolder}/../../../repository/resources/security/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/device-types/);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/devicetypes/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend_${feature.version}/devicetypes/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,overwrite:true);\ + +instructions.unconfigure = \ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm.war);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm_scep.war);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm_scep);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/virtual_firealarm);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/virtual_firealarm-datasources.xml);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/virtualfirealarmDM_DB.h2.db);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/resources/security/wso2certs.jks);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/devicetypes/virtual_firealarm.xml);\ \ No newline at end of file diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml similarity index 72% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml index e045ac5f57..fe66630fe8 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml @@ -28,19 +28,14 @@ 4.0.0 - org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature + org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature pom - WSO2 Carbon - IoT Server VirtualFireAlarm Feature + WSO2 Carbon - IoT Server VirtualFireAlarm UI Feature http://wso2.org - This feature contains the VirtualFireAlarm Device type specific implementations for the IoT Server + This feature contains the VirtualFireAlarm Device type specific UI implementations for the IoT Server - - org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.iot.virtualfirealarm.api - war - com.h2database.wso2 h2-database-engine @@ -87,18 +82,6 @@ - - org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics - - ${project.version} - zip - true - - ${project.build.directory}/maven-shared-archive-resources/carbonapps - - **/* - org.wso2.carbon.devicemgt-plugins org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui @@ -114,27 +97,6 @@ - - copy-jaxrs-war - package - - copy - - - - - org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.iot.virtualfirealarm.api - - war - true - ${project.build.directory}/maven-shared-archive-resources/webapps/ - virtual_firealarm.war - - - - - copy-agent-jar package @@ -162,29 +124,6 @@ - - unpack-analytics - package - - unpack - - - - - org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.iot.analytics - ${project.version} - zip - true - - ${project.build.directory}/maven-shared-archive-resources/carbonapps - - **/* - - - - - @@ -235,7 +174,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.iot.virtualfirealarm + org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui ../../../features/etc/feature.properties @@ -249,11 +188,6 @@ org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.devicemgt.plugins.version} - - diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/cep_query.txt b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/cep_query.txt similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/cep_query.txt rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/cep_query.txt diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/deviceConfig.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/deviceConfig.properties similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/deviceConfig.properties rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/deviceConfig.properties diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/sketch.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/sketch.properties similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/sketch.properties rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/sketch.properties diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/start-device.sh b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/start-device.sh similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/advanced_agent/start-device.sh rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/advanced_agent/start-device.sh diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/deviceConfig.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/deviceConfig.properties rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/deviceConfig.properties diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/sketch.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/sketch.properties similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/sketch.properties rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/sketch.properties diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/start-device.sh b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/start-device.sh similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/start-device.sh rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/start-device.sh diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/virtual_firealarm.jks b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/virtual_firealarm.jks similarity index 100% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/agent/virtual_firealarm.jks rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/agent/virtual_firealarm.jks diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/build.properties b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/build.properties new file mode 100644 index 0000000000..9c86577d76 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/certs/wso2certs.jks b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/certs/wso2certs.jks new file mode 100644 index 0000000000000000000000000000000000000000..00589cdf0d75c0f87bdf9dc63d601d58abb3e0d1 GIT binary patch literal 11731 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 BICB61 literal 0 HcmV?d00001 diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml new file mode 100644 index 0000000000..a724d94d1f --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/datasources/virtual_firealarm-datasources.xml @@ -0,0 +1,48 @@ + + + + + org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader + + + + + VirtualFireAlarmDM_DB + The datasource used for the Virtual-Firealarm database + + jdbc/VirtualFireAlarmDM_DB + + + + jdbc:h2:repository/database/VirtualFireAlarmDM_DB;DB_CLOSE_ON_EXIT=FALSE + + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + + + + + diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/h2.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/h2.sql new file mode 100644 index 0000000000..160b437cbc --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/h2.sql @@ -0,0 +1,8 @@ + +-- ----------------------------------------------------- +-- Table `FIREALARM_DEVICE` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `VIRTUAL_FIREALARM_DEVICE` ( + `VIRTUAL_FIREALARM_DEVICE_ID` VARCHAR(45) NOT NULL , + `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (`VIRTUAL_FIREALARM_DEVICE_ID`) ); diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mssql.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mssql.sql new file mode 100644 index 0000000000..41b7e48480 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mssql.sql @@ -0,0 +1,8 @@ + +-- ----------------------------------------------------- +-- Table `FIREALARM_DEVICE` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE ( + VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL , + DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) ); diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mysql.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mysql.sql new file mode 100644 index 0000000000..432ecbb0ef --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/mysql.sql @@ -0,0 +1,12 @@ +-- ----------------------------------------------------- +-- Table `FIREALARM_DEVICE` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `VIRTUAL_FIREALARM_DEVICE` ( + `VIRTUAL_FIREALARM_DEVICE_ID` VARCHAR(45) NOT NULL , + `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (`VIRTUAL_FIREALARM_DEVICE_ID`) ) +ENGINE = InnoDB; + + + + diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/oracle.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/oracle.sql new file mode 100644 index 0000000000..5583d16941 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/oracle.sql @@ -0,0 +1,8 @@ + +-- ----------------------------------------------------- +-- Table `FIREALARM_DEVICE` +-- ----------------------------------------------------- +CREATE TABLE VIRTUAL_FIREALARM_DEVICE ( + VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL , + DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) ); diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/postgresql.sql b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/postgresql.sql new file mode 100644 index 0000000000..41b7e48480 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/dbscripts/postgresql.sql @@ -0,0 +1,8 @@ + +-- ----------------------------------------------------- +-- Table `FIREALARM_DEVICE` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE ( + VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL , + DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) ); diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml new file mode 100644 index 0000000000..1fcfec4c60 --- /dev/null +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml @@ -0,0 +1,67 @@ + + + + + + + Control buzzer + Control buzzer on Virtual Firealarm + + + state + + + + + + + true + + + + true + + + virtualfirealarm.mqtt.adapter + 0 + true + + + + + + + + + + + + + + + + + + + en_US + 1.0.0 + This is license text + + + \ No newline at end of file diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf similarity index 66% rename from features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf rename to features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf index 1f77296c29..cd5dbd62be 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf @@ -1,33 +1,25 @@ instructions.configure = \ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/devicetypes/);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/sketches/);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/sketches/virtual_firealarm/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/agent/,target:${installFolder}/../../../repository/resources/sketches/virtual_firealarm/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/agent/,target:${installFolder}/../../../repository/resources/sketches/virtual_firealarm/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/sketches/virtual_firealarm_advanced/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/advanced_agent/,target:${installFolder}/../../../repository/resources/sketches/virtual_firealarm_advanced/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/virtual_firealarm,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/advanced_agent/,target:${installFolder}/../../../repository/resources/sketches/virtual_firealarm_advanced/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/virtual_firealarm,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/security/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/certs/,target:${installFolder}/../../../repository/resources/security/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/certs/,target:${installFolder}/../../../repository/resources/security/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/device-types/);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/devicetypes/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/devicetypes/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/carbonapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/resources/devicetypes/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui_${feature.version}/devicetypes/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,overwrite:true);\ instructions.unconfigure = \ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm.war);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm_scep.war);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/virtual_firealarm_scep);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/virtual_firealarm);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/resources/sketches/virtual_firealarm);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/resources/sketches/virtual_firealarm_advanced);\ @@ -42,5 +34,4 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-wizard);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/resources/security/wso2certs.jks);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/devicetypes/virtual_firealarm.xml);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/carbonapps/virtualfirealarm.car);\ \ No newline at end of file +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/devicetypes/virtual_firealarm.xml);\ \ No newline at end of file diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 2c2d514cd8..fa95c5dcd2 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -33,7 +33,9 @@ http://wso2.org - org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature + org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature + org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature + org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature