From fd2e7c3ed21b3d170c31e320ecc06e39af480941 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Fri, 16 Oct 2015 16:58:39 +0530 Subject: [PATCH] DAS update --- modules/distribution/pom.xml | 6 +- .../carbonapps/Temperature_Sensor.car | Bin 8540 -> 0 bytes .../EventReceiver_temperature.xml | 8 +++ .../artifact.xml | 4 ++ .../Eventstore_temperature_1.0.0/artifact.xml | 4 ++ .../org_wso2_iot_devices_temperature.xml | 44 ++++++++++++ .../artifact.xml | 5 ++ ...rg.wso2.iot.devices.temperature_1.0.0.json | 20 ++++++ .../Temperature_Sensor_Script.xml | 13 ++++ .../Sparkscripts_1.0.0/artifact.xml | 4 ++ .../Temperature_Sensor/artifacts.xml | 11 +++ .../src/statistics/carbonapps/build.xml | 18 +++++ .../src/statistics/carbonapps/pom.xml | 68 ++++++++++++++++++ modules/p2-profile-gen/pom.xml | 23 ++++-- pom.xml | 4 +- 15 files changed, 223 insertions(+), 9 deletions(-) delete mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml create mode 100644 modules/distribution/src/statistics/carbonapps/build.xml create mode 100644 modules/distribution/src/statistics/carbonapps/pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c21efb8a..544fd8d7 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -25,7 +25,7 @@ org.wso2.iot wso2iot-parent 1.0.0-SNAPSHOT - ../../pom.xml + ../../../pom.xml 4.0.0 @@ -35,6 +35,10 @@ WSO2 IoT Server - Distribution WSO2 IoT Server Distribution + + src/statistics/carbonapps + + com.h2database.wso2 diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car deleted file mode 100644 index 44a3dbaca9cfaeb55cc6950ad3141774549a27b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8540 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 + + + false + + + + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml new file mode 100644 index 00000000..b72e1ff7 --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml @@ -0,0 +1,4 @@ + + + EventReceiver_temperature.xml + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml new file mode 100644 index 00000000..90b14c11 --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml @@ -0,0 +1,4 @@ + + + org_wso2_iot_devices_temperature.xml + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml new file mode 100644 index 00000000..13a625bd --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml @@ -0,0 +1,44 @@ + + + + org.wso2.iot.devices.temperature:1.0.0 + + EVENT_STORE + + + meta_owner + true + true + false + STRING + + + meta_deviceType + true + true + false + STRING + + + meta_deviceId + true + true + false + STRING + + + meta_time + true + true + false + LONG + + + temperature + false + false + false + FLOAT + + + \ No newline at end of file diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml new file mode 100644 index 00000000..61e7903b --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml @@ -0,0 +1,5 @@ + + + org.wso2.iot.devices.temperature_1.0.0.json + + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json new file mode 100644 index 00000000..5d94b982 --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json @@ -0,0 +1,20 @@ +{ + "name": "org.wso2.iot.devices.temperature", + "version": "1.0.0", + "nickName": "Temperature Data", + "description": "Temperature data received from the Device", + "metaData": [ + {"name":"owner","type":"STRING"}, + {"name":"deviceType","type":"STRING"}, + {"name":"deviceId","type":"STRING"}, + {"name":"time","type":"LONG"} + ], + "payloadData": [ + { + "name": "temperature","type": "FLOAT" + } + ] +} + + + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml new file mode 100644 index 00000000..b604b5ab --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml @@ -0,0 +1,13 @@ + + + IoTServer_Sensor_Script + + 0 * * * * ? + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml new file mode 100644 index 00000000..58c2dcc1 --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml @@ -0,0 +1,4 @@ + + + Temperature_Sensor_Script.xml + diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml new file mode 100644 index 00000000..b5350763 --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/distribution/src/statistics/carbonapps/build.xml b/modules/distribution/src/statistics/carbonapps/build.xml new file mode 100644 index 00000000..c9107aef --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/build.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/statistics/carbonapps/pom.xml b/modules/distribution/src/statistics/carbonapps/pom.xml new file mode 100644 index 00000000..e96109b6 --- /dev/null +++ b/modules/distribution/src/statistics/carbonapps/pom.xml @@ -0,0 +1,68 @@ + + + + + + org.wso2.iot + wso2iot-parent + 1.0.0-SNAPSHOT + ../../pom.xml + + + 4.0.0 + iot-sample-capps + WSO2 iot server sample capp + pom + + + + + maven-clean-plugin + 2.4.1 + + + auto-clean + initialize + + clean + + + + + + maven-antrun-plugin + 1.7 + + + process-resources + + + + + + + run + + + + + + + + \ No newline at end of file diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 81e75cf9..a460e1e0 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -507,7 +507,7 @@ - org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboards.version} + org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version} @@ -685,8 +685,15 @@ org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version} + + org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version} + + + org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version} + + @@ -1225,7 +1232,7 @@ org.wso2.carbon.dashboards.shindig.feature.group - ${carbon.dashboards.version} + ${carbon.dashboard.version} org.wso2.ciphertool.feature.group @@ -1260,10 +1267,10 @@ ${carbon.analytics.common.version} - - org.wso2.carbon.datasource.reader.hadoop.server.feature.group - ${carbon.data.version} - + + + + org.wso2.carbon.analytics.messageconsole.feature.group @@ -1386,6 +1393,10 @@ ${carbon.event-processing.version} + + org.wso2.carbon.dashboards.portal.feature.group + ${carbon.dashboard.version} + diff --git a/pom.xml b/pom.xml index b813b9cc..9c38dd01 100644 --- a/pom.xml +++ b/pom.xml @@ -850,7 +850,7 @@ 2.3.9-SNAPSHOT - 1.0.0 + 1.0.5 1.0.0-wso2v3 2.2 @@ -899,7 +899,7 @@ 1.0.0-SNAPSHOT - 4.4.10 + 4.4.11-SNAPSHOT 4.3.0-SNAPSHOT