Merge pull request #21 from rasika90/master

fixing invalid relative paths in pom.xml

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>

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>

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>