X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContentRepository.java;h=2e65e7e691dee045cdb4eb940624691a61a8f8a6;hb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;hp=6ca7b3591a8cae1d27f42755833dded275687ba3;hpb=7bffd729114825a915700bad58be5bd54a3b866a;p=lgpl%2Fargeo-commons.git

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 6ca7b3591..2e65e7e69 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashSet;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
@@ -18,11 +19,11 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.RuntimeNamespaceContext;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.acr.xml.DomContentProvider;
 import org.argeo.cms.acr.xml.DomUtils;
 import org.w3c.dom.DOMException;
@@ -36,13 +37,13 @@ import org.xml.sax.SAXException;
 public abstract class AbstractContentRepository implements ProvidedRepository {
 	private final static CmsLog log = CmsLog.getLog(AbstractContentRepository.class);
 
-	private UuidFactory uuidFactory;
-
 	private MountManager mountManager;
 	private TypesManager typesManager;
 
 	private CmsContentSession systemSession;
 
+	private Set<ContentProvider> providersToAdd = new HashSet<>();
+
 	// utilities
 	/** Should be used only to copy source and results. */
 	private TransformerFactory identityTransformerFactory = TransformerFactory.newInstance();
@@ -79,7 +80,10 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 	 */
 
 	public void addProvider(ContentProvider provider) {
-		mountManager.addStructuralContentProvider(provider);
+		if (mountManager == null)
+			providersToAdd.add(provider);
+		else
+			mountManager.addStructuralContentProvider(provider);
 	}
 
 	public void registerTypes(String prefix, String namespaceURI, String schemaSystemId) {
@@ -108,10 +112,11 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 			document = dBuilder.newDocument();
 			Element root = document.createElementNS(CrName.CR_NAMESPACE_URI, CrName.ROOT.get().toPrefixedString());
 
-			for (String prefix : typesManager.getPrefixes().keySet()) {
+			for (String prefix : RuntimeNamespaceContext.getPrefixes().keySet()) {
 //				root.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE + ":" + prefix,
 //						contentTypesManager.getPrefixes().get(prefix));
-				DomUtils.addNamespace(root, prefix, typesManager.getPrefixes().get(prefix));
+				DomUtils.addNamespace(root, prefix,
+						RuntimeNamespaceContext.getNamespaceContext().getNamespaceURI(prefix));
 			}
 
 			document.appendChild(root);
@@ -131,6 +136,10 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 			throw new IllegalStateException("Cannot init ACR root " + path, e);
 		}
 
+		// add content providers already notified
+		for (ContentProvider contentProvider : providersToAdd)
+			addProvider(contentProvider);
+		providersToAdd.clear();
 	}
 
 	public void writeDom(Document document, OutputStream out) throws IOException {
@@ -199,9 +208,4 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 	TypesManager getTypesManager() {
 		return typesManager;
 	}
-
-	public void setUuidFactory(UuidFactory uuidFactory) {
-		this.uuidFactory = uuidFactory;
-	}
-
 }