Module names

According #740, H2GIS modules have been reorganized. - rename the h2gis artifact id to h2gis-parent, - rename h2gis-functions artifact id to h2gis and h2gis-functions-osgi to h2gis-osgi - remove h2gis-ext and h2gis-ext-osgi - update the readme - remove h2gis-network. It must be in a separate repository.
orbisgis · Oct 13, 2017 · 18ed5fc · 18ed5fc
2 parents 66dc0d3 + 82407ae
commit 18ed5fc
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 293 deletions.
diff --git a/README.md b/README.md
@@ -52,20 +52,13 @@ Click Connect in the web interface
 
 #### Initialize the H2GIS extension
 
-If the user needs only the basic spatial functions it must apply the SQL syntax:
+To initialize the H2GIS extension apply the SQL syntax:
 
 ```sql
 CREATE ALIAS IF NOT EXISTS H2GIS_SPATIAL FOR "org.h2gis.functions.factory.H2GISFunctions.load";
 CALL H2GIS_SPATIAL();
 ```
 
-Otherwise please run the command:
-
-```sql
-CREATE ALIAS IF NOT EXISTS H2GIS_EXTENSION FOR "org.h2gis.ext.H2GISExtension.load";
-CALL H2GIS_EXTENSION();
-```
-
 When the functions are installed you can open a shapefile by calling the following SQL request:
 
 ```sql

diff --git a/h2gis-api/pom.xml b/h2gis-api/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>h2gis</artifactId>
+        <artifactId>h2gis-parent</artifactId>
         <groupId>org.orbisgis</groupId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>h2gis-api</artifactId>
@@ -13,7 +13,7 @@
     <description>H2GIS API define extension point of H2GIS</description>
     <organization>
         <name>CNRS</name>
-        <url>http://www.orbisgis.org</url>
+        <url>http://www.h2gis.org</url>
     </organization>
     <url>http://github.com/orbisgis/H2GIS</url>
     <licenses>

diff --git a/h2gis-dist/pom.xml b/h2gis-dist/pom.xml
@@ -3,15 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.orbisgis</groupId>
-        <artifactId>h2gis</artifactId>
-        <version>1.3.2</version>
+        <artifactId>h2gis-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>h2gis-dist</artifactId>
     <name>h2gis-dist</name>
     <organization>
         <name>CNRS</name>
-        <url>http://www.orbisgis.org</url>
+        <url>http://www.h2gis.org</url>
     </organization>
     <url>http://github.com/orbisgis/H2GIS</url>
     <licenses>
@@ -85,11 +85,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>h2gis-ext</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/h2gis-ext-osgi/pom.xml b/h2gis-ext-osgi/pom.xml
diff --git a/h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java b/h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java
diff --git a/h2gis-ext/pom.xml b/h2gis-ext/pom.xml
diff --git a/h2gis-ext/src/main/java/org/h2gis/ext/H2GISExtension.java b/h2gis-ext/src/main/java/org/h2gis/ext/H2GISExtension.java
diff --git a/h2gis-functions-osgi/pom.xml b/h2gis-functions-osgi/pom.xml
@@ -3,17 +3,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.orbisgis</groupId>
-		<artifactId>h2gis</artifactId>
-		<version>1.3.2</version>
+		<artifactId>h2gis-parent</artifactId>
+		<version>1.4.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
 	</parent>
-	<artifactId>h2gis-functions-osgi</artifactId>
+	<artifactId>h2gis-osgi</artifactId>
         <name>h2gis-functions-osgi</name>
         <description>Register H2GIS functions when a DataSource is declared as OSGi services</description>
         <packaging>bundle</packaging>
         <organization>
             <name>CNRS</name>
-            <url>http://www.orbisgis.org</url>
+            <url>http://www.h2gis.org</url>
         </organization>
         <url>http://github.com/orbisgis/H2GIS</url>
         <licenses>
@@ -25,7 +25,7 @@
 	<dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>h2gis-functions</artifactId>
+            <artifactId>h2gis</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/h2gis-functions/pom.xml b/h2gis-functions/pom.xml
@@ -3,16 +3,16 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.orbisgis</groupId>
-    <artifactId>h2gis</artifactId>
-    <version>1.3.2</version>
+    <artifactId>h2gis-parent</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
-  <artifactId>h2gis-functions</artifactId>
+  <artifactId>h2gis</artifactId>
   <name>h2gis-functions</name>
   <packaging>bundle</packaging>
   <organization>
         <name>CNRS</name>
-        <url>http://www.orbisgis.org</url>
+        <url>http://www.h2gis.org</url>
     </organization>
     <url>http://github.com/orbisgis/H2GIS</url>
     <licenses>

diff --git a/h2gis-network/pom.xml b/h2gis-network/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>h2gis</artifactId>
+        <artifactId>h2gis-parent</artifactId>
         <groupId>org.orbisgis</groupId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>h2gis-network</artifactId>
@@ -13,7 +13,7 @@
     <description>Graph functions</description>
     <organization>
         <name>CNRS</name>
-        <url>http://www.orbisgis.org</url>
+        <url>http://www.h2gis.org</url>
     </organization>
     <url>http://github.com/orbisgis/H2GIS</url>
     <licenses>
@@ -81,7 +81,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>h2gis-functions</artifactId>
+            <artifactId>h2gis</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>