Merge pull request #877 from charithag/master

Implemented operation response publishing to analytics
revert-dabc3590
Charitha Goonetilleke 7 years ago committed by GitHub
commit 522688bfb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -16,6 +16,6 @@
~ under the License. ~ under the License.
--> -->
<artifact name="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" type="event/receiver" serverRole="GeoDashboard"> <artifact name="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
<file>WSO2IoT-DeviceInfo-Receiver_1.0.0.xml</file> <file>WSO2IoT-DeviceInfo-Receiver_1.0.0.xml</file>
</artifact> </artifact>

@ -16,6 +16,7 @@
~ under the License. ~ under the License.
--> -->
<artifact name="WSO2IoT-DeviceOperation-Publisher" version="1.0.0" type="event/publisher" serverRole="GeoDashboard"> <artifact name="WSO2IoT-DeviceOperation-Publisher" version="1.0.0" type="event/publisher"
serverRole="DataAnalyticsServer">
<file>WSO2IoT-DeviceOperation-Publisher_1.0.0.xml</file> <file>WSO2IoT-DeviceOperation-Publisher_1.0.0.xml</file>
</artifact> </artifact>

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<eventReceiver name="WSO2IoT-OperationResponse-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
<from eventAdapterType="iot-event">
<property name="events.duplicated.in.cluster">false</property>
</from>
<mapping customMapping="disable" type="wso2event"/>
<to streamName="org.wso2.iot.OperationResponseStream" version="1.0.0"/>
</eventReceiver>

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?><!--
~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<artifact name="WSO2IoT-OperationResponse-Receiver" version="1.0.0" type="event/receiver"
serverRole="DataAnalyticsServer">
<file>WSO2IoT-OperationResponse-Receiver_1.0.0.xml</file>
</artifact>

@ -22,10 +22,14 @@
<!-- CEP Artifacts --> <!-- CEP Artifacts -->
<dependency artifact="org.wso2.iot.DeviceInfoStream" version="1.0.0" include="true" <dependency artifact="org.wso2.iot.DeviceInfoStream" version="1.0.0" include="true"
serverRole="DataAnalyticsServer"/> serverRole="DataAnalyticsServer"/>
<dependency artifact="org.wso2.iot.OperationResponseStream" version="1.0.0" include="true"
serverRole="DataAnalyticsServer"/>
<dependency artifact="org.wso2.iot.operation" version="1.0.0" include="true" <dependency artifact="org.wso2.iot.operation" version="1.0.0" include="true"
serverRole="DataAnalyticsServer"/> serverRole="DataAnalyticsServer"/>
<dependency artifact="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" include="true" <dependency artifact="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" include="true"
serverRole="DataAnalyticsServer"/> serverRole="DataAnalyticsServer"/>
<dependency artifact="WSO2IoT-OperationResponse-Receiver" version="1.0.0" include="true"
serverRole="DataAnalyticsServer"/>
<dependency artifact="WSO2IoT-DeviceOperation-Publisher" version="1.0.0" include="true" <dependency artifact="WSO2IoT-DeviceOperation-Publisher" version="1.0.0" include="true"
serverRole="DataAnalyticsServer"/> serverRole="DataAnalyticsServer"/>
</artifact> </artifact>

@ -16,6 +16,6 @@
~ under the License. ~ under the License.
--> -->
<artifact name="org.wso2.iot.DeviceInfoStream" version="1.0.0" type="event/stream" serverRole="GeoDashboard"> <artifact name="org.wso2.iot.DeviceInfoStream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
<file>org.wso2.iot.DeviceInfoStream_1.0.0.json</file> <file>org.wso2.iot.DeviceInfoStream_1.0.0.json</file>
</artifact> </artifact>

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?><!--
~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<artifact name="org.wso2.iot.OperationResponseStream" version="1.0.0" type="event/stream"
serverRole="DataAnalyticsServer">
<file>org.wso2.iot.OperationResponseStream_1.0.0.json</file>
</artifact>

@ -0,0 +1,42 @@
{
"name": "org.wso2.iot.OperationResponseStream",
"version": "1.0.0",
"nickName": "",
"description": "IoT Server Operation Response Stream",
"metaData": [
{
"name": "deviceId",
"type": "STRING"
},
{
"name": "deviceType",
"type": "STRING"
}
],
"payloadData": [
{
"name": "timeStamp",
"type": "LONG"
},
{
"name": "id",
"type": "INT"
},
{
"name": "code",
"type": "STRING"
},
{
"name": "type",
"type": "STRING"
},
{
"name": "status",
"type": "STRING"
},
{
"name": "response",
"type": "STRING"
}
]
}

@ -16,6 +16,6 @@
~ under the License. ~ under the License.
--> -->
<artifact name="org.wso2.iot.operation" version="1.0.0" type="event/stream" serverRole="GeoDashboard"> <artifact name="org.wso2.iot.operation" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
<file>org.wso2.iot.operation_1.0.0.json</file> <file>org.wso2.iot.operation_1.0.0.json</file>
</artifact> </artifact>

@ -1215,7 +1215,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>3.0.208</carbon.devicemgt.version> <carbon.devicemgt.version>3.0.215</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
<!-- Carbon App Management --> <!-- Carbon App Management -->

Loading…
Cancel
Save