From 4c07301c8caff90b251c13324a3d27ccb82da3aa Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 3 Nov 2015 11:23:38 +0530
Subject: [PATCH 1/4] upgrading carbon analytics versions

---
 .../src/main/webapp/META-INF/resources.xml    | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml

diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml
new file mode 100644
index 00000000..8f83e050
--- /dev/null
+++ b/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>
\ No newline at end of file

From f73347ac080210dc0841b9db80b6d280db58d8b9 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 3 Nov 2015 11:29:02 +0530
Subject: [PATCH 2/4] upgrading carbon analytics versions

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a00fdbe..2dac5b10 100644
--- a/pom.xml
+++ b/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>
 
 

From 44f380c8e0b32820bef51e8d8e95d8fed2e3bb15 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 3 Nov 2015 11:30:00 +0530
Subject: [PATCH 3/4] changes to the resources.xml

---
 .../src/main/webapp/META-INF/resources.xml                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml
index 8f83e050..9d04165c 100644
--- a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml
+++ b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/META-INF/resources.xml
@@ -50,14 +50,14 @@
     <Resource>
         <AuthType>Any</AuthType>
         <HttpVerb>GET</HttpVerb>
-        <Uri>http://localhost:9763/virtual_firealarm/manager/device</Uri>
-        <UriTemplate>/manager/device/*</UriTemplate>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/device/{device_id}</Uri>
+        <UriTemplate>/manager/device/{device_id}</UriTemplate>
     </Resource>
     <Resource>
         <AuthType>Any</AuthType>
         <HttpVerb>GET</HttpVerb>
-        <Uri>http://localhost:9763/virtual_firealarm/manager/devices</Uri>
-        <UriTemplate>/manager/devices/*</UriTemplate>
+        <Uri>http://localhost:9763/virtual_firealarm/manager/devices/{username}</Uri>
+        <UriTemplate>/manager/devices/{username}</UriTemplate>
     </Resource>
     <Resource>
         <AuthType>Any</AuthType>

From 29a0bf2fe23316a51839ba7b27be1260c71e8e70 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 3 Nov 2015 11:38:14 +0530
Subject: [PATCH 4/4] fixing invalid relative paths in pom.xml

---
 modules/distribution/pom.xml                           | 2 +-
 modules/distribution/src/statistics/carbonapps/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 3fda1155..7dd17cbe 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -25,7 +25,7 @@
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/statistics/carbonapps/pom.xml b/modules/distribution/src/statistics/carbonapps/pom.xml
index e96109b6..56205789 100644
--- a/modules/distribution/src/statistics/carbonapps/pom.xml
+++ b/modules/distribution/src/statistics/carbonapps/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>