From aeaee5222fff2f57b89978804be9c9e3b57c9bbd Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Tue, 6 Dec 2016 17:19:25 +0530
Subject: [PATCH 1/2] Adding siddhi extension feature for geo dashboard

---
 modules/analytics/p2-profile-gen/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index 07a50ae0..f3dcb010 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -391,6 +391,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
                                 </featureArtifactDef>
+                                <!-- Siddhi extension feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -796,6 +800,12 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+
+                                <!-- Siddhi extension Feature -->
+                                <feature>
+                                    <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>

From 20da28f48bb3c312ecfe36bf6c919731a8831d88 Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Wed, 7 Dec 2016 09:57:30 +0530
Subject: [PATCH 2/2] Making the local copies of designer.json to be compatible
 with carbon-dashboards designer.json

---
 modules/analytics/distribution/src/ues/designer.json           | 3 +++
 .../src/repository/jaggeryapps/portal/configs/designer.json    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json
index 3cce8451..b55701c9 100644
--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@@ -62,5 +62,8 @@
         "hostname": "localhost",
         "port": "",
         "protocol": ""
+    },
+    "queryParameters" : {
+        "passBetweenPages" : ["shared"]
     }
 }
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
index ba48b0ea..7fa6049a 100644
--- a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
+++ b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
@@ -76,5 +76,8 @@
     "hostname": "localhost",
     "port": "",
     "protocol": ""
+  },
+  "queryParameters" : {
+    "passBetweenPages" : ["shared"]
   }
 }
\ No newline at end of file