X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.core%2Fsrc%2Forg%2Fargeo%2Fapp%2Fcore%2FSuiteContentNamespace.java;h=46456493b115a81f682a14bb2b3d17e27c42b568;hb=HEAD;hp=6b5ab3c45bed02dd651c5acf76ca0871e86dd99e;hpb=57f3528fda509d840818a72ebcd38b6ab3afa435;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java
index 6b5ab3c..be4238f 100644
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentNamespace.java
@@ -46,7 +46,10 @@ public enum SuiteContentNamespace implements ContentNamespace {
 	ODK("odk", "http://www.opendatakit.org/xforms", null, null),
 	//
 	WGS84("geo", "http://www.w3.org/2003/01/geo/wgs84_pos#", null, null),
+	// Re-add XML in order to solve import issue with xlink
+	XML("xml", "http://www.w3.org/XML/1998/namespace", "xml.xsd", "http://www.w3.org/2001/xml.xsd"),
 	//
+
 	;
 
 	private final static String RESOURCE_BASE = "/org/argeo/app/core/schemas/";
@@ -66,7 +69,25 @@ public enum SuiteContentNamespace implements ContentNamespace {
 				resource = getClass().getResource(RESOURCE_BASE + resourceFileName);
 			else
 				resource = getClass().getResource(resourceFileName);
-			Objects.requireNonNull(resource);
+//			Objects.requireNonNull(resource);
+
+//			try {
+//				// FIXME workaround when in nested OSGi frameworks
+//				// we should use class path, as before
+//				if (!resourceFileName.startsWith("platform:")) {
+//					resource = URI.create("platform:/plugin/org.argeo.app.core" + RESOURCE_BASE + resourceFileName)
+//							.toURL();
+//				} else {
+//					resource = URI.create(resourceFileName).toURL();
+//				}
+//			} catch (MalformedURLException e) {
+//				resource = null;
+//				System.getLogger(CmsContentNamespace.class.getName()).log(ERROR,
+//						"Cannot load " + resourceFileName + ": " + e.getMessage());
+//				// throw new IllegalArgumentException("Cannot convert " + resourceFileName + "
+//				// to URL");
+//			}
+			// Objects.requireNonNull(resource);
 		}
 		if (publicUrl != null)
 			try {