package org.argeo.app.core;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URL;
import java.util.Objects;
//
// ARGEO
//
- ENTITY("entity", "http://www.argeo.org/ns/entity",
- "platform:/plugin/org.argeo.app.api/org/argeo/api/app/entity.xsd", null),
+ ENTITY("entity", "http://www.argeo.org/ns/entity", "/org/argeo/app/api/entity.xsd", null),
//
ARGEO_DBK("argeodbk", "http://www.argeo.org/ns/argeodbk", 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/";
Objects.requireNonNull(namespace);
this.namespace = namespace;
if (resourceFileName != null) {
- 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) {
- throw new IllegalArgumentException("Cannot convert " + resourceFileName + " to URL");
- }
+ if (!resourceFileName.startsWith("/"))
+ 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 {