From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 28 Aug 2011 12:52:52 +0000 (+0000)
Subject: Move JCR GIS from Commons to Connect
X-Git-Tag: argeo-commons-2.1.30~1185
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=2981b9e4a7a03d9aef775e1b9238a22119a9b078;p=lgpl%2Fargeo-commons.git

Move JCR GIS from Commons to Connect

git-svn-id: https://svn.argeo.org/commons/trunk@4702 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisJcrConstants.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisJcrConstants.java
deleted file mode 100644
index bc55174b7..000000000
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisJcrConstants.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.argeo.jcr.gis;
-
-/** Constants related to GIS in JCR, typically standard paths. */
-public class GisJcrConstants {
-
-	public final static String DATA_STORES_BASE_PATH = "/gis/dataStores";
-
-}
diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisNames.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisNames.java
deleted file mode 100644
index 3bc6db0d3..000000000
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisNames.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.argeo.jcr.gis;
-
-/** JCR names in the http://www.argeo.org/gis namespace */
-public interface GisNames {
-	public final static String GIS_NAMESPACE = "http://www.argeo.org/ns/gis";
-	public final static String GIS_ = "gis:";
-
-	public final static String GIS_ALIAS = "gis:alias";
-	
-	public final static String GIS_SRS = "gis:srs";
-	public final static String GIS_BBOX = "gis:bbox";
-	public final static String GIS_CENTROID = "gis:centroid";
-
-	public final static String GIS_X = "gis:x";
-	public final static String GIS_Y = "gis:y";
-	public final static String GIS_Z = "gis:z";
-
-	public final static String GIS_WKB = "gis:wkb";
-	public final static String GIS_WKT = "gis:wkt";
-}
diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisTypes.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisTypes.java
deleted file mode 100644
index a943c55ce..000000000
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/gis/GisTypes.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.argeo.jcr.gis;
-
-/** JCR types in the http://www.argeo.org/gis namespace */
-public interface GisTypes {
-	public final static String GIS_COORDINATE = "gis:coordinate";
-	public final static String GIS_GEOMETRY = "gis:geometry";
-	public final static String GIS_WKT = "gis:wkt";
-	public final static String GIS_POINT = "gis:point";
-	public final static String GIS_INDEXED = "gis:indexed";
-	public final static String GIS_LOCATED = "gis:located";
-
-	public final static String GIS_DATA_STORE = "gis:dataStore";
-	public final static String GIS_FEATURE_SOURCE = "gis:featureSource";
-	public final static String GIS_FEATURE = "gis:feature";
-	public final static String GIS_RELATED_FEATURE = "gis:relatedFeature";
-}
diff --git a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd
deleted file mode 100644
index de147bbc1..000000000
--- a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd
+++ /dev/null
@@ -1,46 +0,0 @@
-<gis = 'http://www.argeo.org/ns/gis'>
-
-// GEOMETRIES (based on JTS http://www.vividsolutions.com/jts/JTSHome.htm) 
-[gis:coordinate] > nt:base
-mixin
-- gis:x (DOUBLE) m
-- gis:y (DOUBLE) m
-- gis:z (DOUBLE)
-
-// marker any node that is located or has a located parent 
-[gis:indexed] > nt:unstructured, mix:lastModified
-mixin
-
-[gis:located] > gis:indexed
-abstract mixin
-// either an EPSG code (e.g. EPSG:4326 for WGS 84) or a WKT representation
-- gis:srs (STRING)
-// WKB
-- gis:bbox (BINARY)
-// WKB
-- gis:centroid (BINARY)
-// - gis:role (STRING)
-
-[gis:geometry] > nt:unstructured, gis:located
-- gis:wkb (BINARY)
-
-// GEOTOOLS
-[gis:feature] > nt:base
-mixin
-- gis:srs (STRING) m
-// WKB
-- gis:bbox (BINARY) m
-// WKB
-- gis:centroid (BINARY) m
-//- gis:relatedNode (REFERENCE) *
-
-[gis:featureSource] > nt:unstructured, mix:title
-mixin
-- gis:type (STRING)
-
-[gis:dataStore] > nt:unstructured, mix:title
-- gis:type (STRING)
-+ * (gis:featureSource) *
-// FIXME + * (gis:featureSource)
-
-[gis:relatedFeature] > nt:address, gis:located