Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Module names #845

Merged
merged 12 commits into from
Oct 13, 2017
Merged

Module names #845

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
139195e
Rename the h2gis artifact id to h2gis-parent
ebocher Oct 1, 2017
ddf6113
Rename h2gis-functions artifact id to h2gis and h2gis-functions-osgi to
ebocher Oct 1, 2017
4573a92
Update readme
ebocher Oct 1, 2017
57fe4c7
Move H2GIS-Network to an internal module
ebocher Oct 1, 2017
789340d
Return of H2GIS-Network
ebocher Oct 2, 2017
41eee1e
Update version
ebocher Oct 2, 2017
5ae8c9f
Updates the poms.
SPalominos Oct 11, 2017
89fe7e2
Fix merge with master.
SPalominos Oct 11, 2017
9f487fc
Fixe merge with ebocher.
SPalominos Oct 11, 2017
d5ecedc
Merge pull request #11 from SPalominos/ebocher-moduleNames
ebocher Oct 11, 2017
66cd12c
Fixes the h2gis module name.
SPalominos Oct 13, 2017
82407ae
Merge pull request #12 from SPalominos/ebocher-moduleNames
ebocher Oct 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions README.md
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions h2gis-api/pom.xml
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<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-SNAPSHOT</version>
<relativePath>../</relativePath>
Expand All @@ -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>
Expand Down
9 changes: 2 additions & 7 deletions h2gis-dist/pom.xml
View file
Open in desktop
Expand Up @@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis</artifactId>
<artifactId>h2gis-parent</artifactId>
<version>1.3.2-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>
Expand Down Expand Up @@ -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>
Expand Down
62 changes: 0 additions & 62 deletions h2gis-ext-osgi/pom.xml
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions h2gis-ext/pom.xml
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions h2gis-ext/src/main/java/org/h2gis/ext/H2GISExtension.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions h2gis-functions-osgi/pom.xml
View file
Open in desktop
Expand Up @@ -3,17 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis</artifactId>
<artifactId>h2gis-parent</artifactId>
<version>1.3.2-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>
Expand Down
6 changes: 3 additions & 3 deletions h2gis-functions/pom.xml
View file
Open in desktop
Expand Up @@ -3,16 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis</artifactId>
<artifactId>h2gis-parent</artifactId>
<version>1.3.2-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>
Expand Down