From 72f53ba55c3eb555ef1a7e2da5f9a4a4f3fbd871 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 12 Jun 2017 17:56:27 +0530
Subject: [PATCH] Fixing geo extension installer issue

---
 .../pom.xml                                   |  6 ------
 .../scripts/gpl-siddhi-geo-extention/pom.xml  | 21 ++++++++++++++++++-
 .../scripts/siddhi-geo-extention-deployer.xml | 14 ++++++++++---
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml
index 5a460b3885..c77c391634 100644
--- a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml
@@ -33,11 +33,6 @@
     <url>http://wso2.org</url>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wso2.extension.siddhi.gpl.execution.geo</groupId>
-            <artifactId>siddhi-gpl-execution-geo-feature</artifactId>
-            <version>${org.wso2.gpl.siddhi.extensions.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.wso2.orbit.org.geotools</groupId>
             <artifactId>gt-geojson</artifactId>
@@ -67,7 +62,6 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.wso2.extension.siddhi.gpl.execution.geo:siddhi-gpl-execution-geo-feature:${org.wso2.gpl.siddhi.extensions.version}</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.geotools:gt-geojson:${gt-geojson.version}</bundleDef>
                             </bundles>
                         </configuration>
diff --git a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml
index 2cec4a7171..f7d5a18d13 100644
--- a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml
@@ -261,7 +261,6 @@
     </build>
 
     <properties>
-        <org.wso2.gpl.siddhi.extensions.version>3.2.0</org.wso2.gpl.siddhi.extensions.version>
         <gt-geojson.version>13.6.0.wso2v1</gt-geojson.version>
         <siddhi.version>3.1.1</siddhi.version>
         <junit.version>4.10</junit.version>
@@ -291,6 +290,26 @@
     </mailingLists>
 
     <repositories>
+        <repository>
+            <id>wso2-nexus</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+        <repository>
+            <id>wso2.releases</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
         <repository>
             <id>osgeo</id>
             <name>Open Source Geospatial Foundation Repository</name>
diff --git a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/siddhi-geo-extention-deployer.xml b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/siddhi-geo-extention-deployer.xml
index ef06799309..641be9450f 100644
--- a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/siddhi-geo-extention-deployer.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/siddhi-geo-extention-deployer.xml
@@ -56,7 +56,10 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    org.wso2.gpl.siddhi.extensions:org.wso2.gpl.siddhi.extension.geo.feature:${org.wso2.gpl.siddhi.extensions.version}
+                                    org.wso2.extension.siddhi.gpl.execution.geo:siddhi-gpl-execution-geo-feature:${siddhi-gpl-execution-geo-feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.gpl.siddhi.extensions:org.wso2.gpl.siddhi.extension.geo.feature:${org.wso2.iot.devicemgt-plugins.gpl.siddhi.extensions.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -74,9 +77,13 @@
                             <destination>${basedir}/../repository/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
+                                <feature>
+                                    <id>siddhi-gpl-execution-geo.feature.group</id>
+                                    <version>${siddhi-gpl-execution-geo-feature.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.gpl.siddhi.extension.geo.feature.group</id>
-                                    <version>${org.wso2.gpl.siddhi.extensions.version}</version>
+                                    <version>${org.wso2.iot.devicemgt-plugins.gpl.siddhi.extensions.version}</version>
                                 </feature>
                             </features>
                         </configuration>
@@ -184,6 +191,7 @@
         </repository>
     </repositories>
     <properties>
-        <org.wso2.gpl.siddhi.extensions.version>3.1.0-SNAPSHOT</org.wso2.gpl.siddhi.extensions.version>
+        <org.wso2.iot.devicemgt-plugins.gpl.siddhi.extensions.version>3.1.0-SNAPSHOT</org.wso2.iot.devicemgt-plugins.gpl.siddhi.extensions.version>
+        <siddhi-gpl-execution-geo-feature.version>3.2.0</siddhi-gpl-execution-geo-feature.version>
     </properties>
 </project>
\ No newline at end of file