X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.core%2Fsrc%2Forg%2Fargeo%2Fapp%2Fcore%2FSuiteMaintenanceService.java;h=12db1525f5425e13c18de0978a9f38fa4692f0f8;hb=4c659c9e6b1329fb1b831244efc32a9767fadc4c;hp=298f96bc3e2569a252be8a6bc83219b2eb8847cd;hpb=ceda3a1e01fef2af94ab792f61de332f23ea3a85;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
index 298f96b..12db152 100644
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
@@ -1,6 +1,8 @@
 package org.argeo.app.core;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -8,24 +10,47 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.Privilege;
 
-import org.argeo.api.acr.spi.ProvidedRepository;
+import org.argeo.api.acr.spi.ContentNamespace;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.app.api.EntityType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.maintenance.AbstractMaintenanceService;
+import org.geotools.gml3.v3_2.GML;
 
 /** Initialises an Argeo Suite backend. */
 public class SuiteMaintenanceService extends AbstractMaintenanceService {
-	private ProvidedRepository contentRepository;
-
 	@Override
 	public void init() {
 		super.init();
 
-		for (SuiteContentTypes types : SuiteContentTypes.values()) {
-			contentRepository.registerTypes(types.getDefaultPrefix(), types.getNamespace(),
-					types.getResource() != null ? types.getResource().toExternalForm() : null);
-		}
+		getContentRepository().registerTypes(SuiteContentNamespace.values());
+//		for (SuiteContentTypes types : SuiteContentTypes.values()) {
+//			getContentRepository().registerTypes(types.getDefaultPrefix(), types.getNamespace(),
+//					types.getResource() != null ? types.getResource().toExternalForm() : null);
+//		}
+		
+		// GML schema import fails because of xlinks issues
+		getContentRepository().registerTypes(new ContentNamespace() {
+
+			@Override
+			public URL getSchemaResource() {
+				try {
+					return new URL(GML.getInstance().getSchemaLocation());
+				} catch (MalformedURLException e) {
+					throw new IllegalArgumentException(e);
+				}
+			}
+
+			@Override
+			public String getNamespaceURI() {
+				return GML.getInstance().getNamespaceURI();
+			}
+
+			@Override
+			public String getDefaultPrefix() {
+				return "gml";
+			}
+		});
 	}
 
 	@Override
@@ -49,8 +74,4 @@ public class SuiteMaintenanceService extends AbstractMaintenanceService {
 		// Privilege.JCR_READ);
 	}
 
-	public void setContentRepository(ProvidedRepository contentRepository) {
-		this.contentRepository = contentRepository;
-	}
-
 }