import org.argeo.api.acr.CrAttributeType;
import org.argeo.api.acr.NamespaceUtils;
import org.argeo.api.acr.RuntimeNamespaceContext;
+import org.argeo.api.acr.spi.ContentNamespace;
import org.argeo.api.cms.CmsLog;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
}
- public synchronized void init() {
-// prefixes.put(CrName.CR_DEFAULT_PREFIX, CrName.CR_NAMESPACE_URI);
-// prefixes.put("basic", CrName.CR_NAMESPACE_URI);
-// prefixes.put("owner", CrName.CR_NAMESPACE_URI);
-// prefixes.put("posix", CrName.CR_NAMESPACE_URI);
-
- for (CmsContentTypes cs : CmsContentTypes.values()) {
- StreamSource source = new StreamSource(cs.getResource().toExternalForm());
- sources.add(source);
-// if (prefixes.containsKey(cs.getDefaultPrefix()))
-// throw new IllegalStateException("Prefix " + cs.getDefaultPrefix() + " is already mapped with "
-// + prefixes.get(cs.getDefaultPrefix()));
-// prefixes.put(cs.getDefaultPrefix(), cs.getNamespace());
- RuntimeNamespaceContext.register(cs.getNamespace(), cs.getDefaultPrefix());
- }
+ public void init() {
+// for (CmsContentTypes cs : CmsContentTypes.values()) {
+// if (cs.getSchemaResource() != null) {
+// StreamSource source = new StreamSource(cs.getSchemaResource().toExternalForm());
+// sources.add(source);
+// }
+// RuntimeNamespaceContext.register(cs.getNamespace(), cs.getDefaultPrefix());
+// }
- reload();
+ registerTypes(CmsContentNamespace.values());
+// reload();
}
- public synchronized void registerTypes(String defaultPrefix, String namespace, String xsdSystemId) {
+ public void registerTypes(ContentNamespace... namespaces) {
// if (prefixes.containsKey(defaultPrefix))
// throw new IllegalStateException(
// "Prefix " + defaultPrefix + " is already mapped with " + prefixes.get(defaultPrefix));
// prefixes.put(defaultPrefix, namespace);
- RuntimeNamespaceContext.register(namespace, defaultPrefix);
+ for (ContentNamespace contentNamespace : namespaces) {
+ RuntimeNamespaceContext.register(contentNamespace.getNamespaceURI(), contentNamespace.getDefaultPrefix());
- sources.add(new StreamSource(xsdSystemId));
+ if (contentNamespace.getSchemaResource() != null) {
+ sources.add(new StreamSource(contentNamespace.getSchemaResource().toExternalForm()));
+ log.debug(() -> "Registered types " + contentNamespace.getNamespaceURI() + " from "
+ + contentNamespace.getSchemaResource().toExternalForm());
+ }
+ }
reload();
}
try {
validator.validate(source);
} catch (SAXException e) {
- throw new IllegalArgumentException("Provided source is not valid", e);
+ log.error(source + " is not valid " + e);
+ // throw new IllegalArgumentException("Provided source is not valid", e);
}
}