Merge remote-tracking branch 'origin/unstable' into merge-to-testing

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / AbstractContentRepository.java

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
index a2d8069dd26e7c1698ca8884efe828c2c73f10a4..c1f1ef5f3ac2b3d52619f5578365253ec57558b5 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
@@ -17,10 +17,12 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.RuntimeNamespaceContext;
+import org.argeo.api.acr.spi.ContentNamespace;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedRepository;
@@ -93,8 +95,9 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
                }
        }
 
-       public void registerTypes(String prefix, String namespaceURI, String schemaSystemId) {
-               typesManager.registerTypes(prefix, namespaceURI, schemaSystemId);
+       @Override
+       public void registerTypes(ContentNamespace... namespaces) {
+               typesManager.registerTypes(namespaces);
        }
 
        /*
@@ -117,7 +120,7 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 //                             document = dBuilder.parse(inputSource);
 //                     } else {
                        document = dBuilder.newDocument();
-                       Element root = document.createElementNS(CrName.CR_NAMESPACE_URI,
+                       Element root = document.createElementNS(ArgeoNamespace.CR_NAMESPACE_URI,
                                        NamespaceUtils.toPrefixedName(CrName.root.qName()));
 
                        for (String prefix : RuntimeNamespaceContext.getPrefixes().keySet()) {