From 721e6e2321399e875f80aae947139ee82d5a9a1a Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Wed, 30 Nov 2016 19:06:27 +0530
Subject: [PATCH] Bug fixes

---
 .../iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml  | 2 +-
 .../iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml    | 3 ++-
 .../org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.iot.geo.dashboard.feature/pom.xml          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml
index 190e81a1e..1fee6c82c 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml
@@ -23,7 +23,7 @@
     <property name="target-dir" value="target/carbonapps"/>
     <property name="src-dir" value="src/main/resources/carbonapps"/>
 
-    <property name="GeoDashboard" value="org_wso2_carbon_iot_geo_dashboard-1.0.0.car"/>
+    <property name="GeoDashboard" value="org_wso2_carbon_iot_geo_dashboard-1.0.0"/>
 
     <target name="clean">
         <delete dir="${target-dir}" />
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
index 826c1b57a..0e8d3b1f4 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
@@ -27,9 +27,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.geo.dashboard</artifactId>
-    <name>WSO2 Carbon - IoT Geo Dashboard CAPP</name>
+    <name>WSO2 Carbon - IoT Geo Dashboard C-APP</name>
     <url>http://wso2.org</url>
     <description>This feature contains the IoT geo dashboard gadget</description>
+    <packaging>pom</packaging>
 
     <build>
         <plugins>
diff --git a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
index 9680a4c60..06e2c9d7f 100644
--- a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
+++ b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
@@ -94,7 +94,7 @@
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
                 <version>${carbon.p2.plugin.version}</version>
-                    <executions>
+                <executions>
                     <execution>
                         <id>p2-feature-generation</id>
                         <phase>package</phase>
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
index 1b7d7988b..02168e50f 100644
--- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
+++ b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
@@ -68,7 +68,7 @@
                                     <outputDirectory>
                                         ${project.build.directory}/maven-shared-archive-resources
                                     </outputDirectory>
-                                    <includes>org_wso2_carbon_iot_geo_dashboard-1.0.0.car</includes>
+                                    <includes>**/*</includes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>