Merge pull request #20 from rasika90/master

carbon-analytics version upgrading

modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ you may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!-- This file contains the list of permissions that are associated with URL end points
+    of the web app. Each permission should contain the name, permission path ,API path
+    (URL) , HTTP method and OAUTH2 authorization scope (not-required).
+    When defining dynamic paths for APIs, path variables are denoted by '*' notation.
+    For ex:
+    Actual API endpoint: mdm-admin/1.0.0/devices/{device-id}
+    URL to be represented here: /devices/*
+    NOTE: All the endpoints of the web app should be available in this file. Otherwise
+    it will result 403 error at the runtime.
+-->
+<ResourceConfiguration>
+    <!-- Device related APIs -->
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>PUT</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device/register</Uri>
+        <UriTemplate>/manager/device/register/*</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>DELETE</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device/remove</Uri>
+        <UriTemplate>/manager/device/remove/*</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>POST</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device/update</Uri>
+        <UriTemplate>/manager/device/update/*</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>GET</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device</Uri>
+        <UriTemplate>/manager/device/*</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>GET</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/devices</Uri>
+        <UriTemplate>/manager/devices/*</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>GET</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device/{sketch_type}/download</Uri>
+        <UriTemplate>/manager/device/{sketch_type}/download</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>GET</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device/{sketch_type}/generate_link</Uri>
+        <UriTemplate>/manager/device/{sketch_type}/generate_link</UriTemplate>
+    </Resource>
+
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>POST</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/controller/register/{owner}/{deviceId}/{ip}/{port}</Uri>
+        <UriTemplate>/controller/register/{owner}/{deviceId}/{ip}/{port}</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>POST</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/controller/controller/bulb/{state}</Uri>
+        <UriTemplate>/controller/bulb/{state}</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>GET</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/controller/controller/readsonar</Uri>
+        <UriTemplate>/controller/readsonar</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>GET</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/controller/controller/readtemperature</Uri>
+        <UriTemplate>/controller/readtemperature</UriTemplate>
+    </Resource>
+    <Resource>
+        <AuthType>Any</AuthType>
+        <HttpVerb>POST</HttpVerb>
+        <Uri>http://localhost:9763/virtual_firealarm/controller/controller/push_temperature</Uri>
+        <UriTemplate>/controller/push_temperature</UriTemplate>
+    </Resource>
+</ResourceConfiguration>

pom.xml

@@ -917,11 +917,11 @@
         <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
 
         <!--DAS-->
-        <carbon.analytics.version>1.0.4-SNAPSHOT</carbon.analytics.version>
-        <carbon.analytics.common.version>5.0.5</carbon.analytics.common.version>
+        <carbon.analytics.version>1.0.4</carbon.analytics.version>
+        <carbon.analytics.common.version>5.0.6</carbon.analytics.common.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
-        <carbon.event-processing.version>2.0.8</carbon.event-processing.version>
+        <carbon.event-processing.version>2.0.9</carbon.event-processing.version>
         <carbon.data.version>4.3.2</carbon.data.version>