X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContentRepository.java;h=c1f1ef5f3ac2b3d52619f5578365253ec57558b5;hb=117eaabc86f6c09eff9a4b971ac137d51f45e953;hp=382c432b564f4fe1c46bd17fa49ed3166c756f31;hpb=eb4cc3db3bf141c229f0f7ff929daff108bee6d2;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 382c432b5..c1f1ef5f3 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;
@@ -16,8 +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;
@@ -35,18 +40,21 @@ import org.xml.sax.SAXException;
 public abstract class AbstractContentRepository implements ProvidedRepository {
 	private final static CmsLog log = CmsLog.getLog(AbstractContentRepository.class);
 
-	private final MountManager mountManager;
-	private final TypesManager typesManager;
+	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();
 
-	public final static String ACR_MOUNT_PATH_PROPERTY = "acr.mount.path";
+//	public final static String ACR_MOUNT_PATH_PROPERTY = "acr.mount.path";
 
 	public AbstractContentRepository() {
+		long begin = System.currentTimeMillis();
 		// types
 		typesManager = new TypesManager();
 		typesManager.init();
@@ -55,33 +63,41 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 			for (QName type : types) {
 				log.trace(type + " - " + typesManager.getAttributeTypes(type));
 			}
-
-		systemSession = newSystemSession();
-
-		// mounts
-		mountManager = new MountManager(systemSession);
-
+		long duration = System.currentTimeMillis() - begin;
+		log.debug(() -> "CMS content types available (initialisation took " + duration + " ms)");
 	}
 
 	protected abstract CmsContentSession newSystemSession();
 
 	public void start() {
+		systemSession = newSystemSession();
+		// mounts
+		mountManager = new MountManager(systemSession);
 	}
 
 	public void stop() {
-
+		systemSession.close();
+		systemSession = null;
 	}
 
 	/*
 	 * REPOSITORY
 	 */
-
+	@Override
 	public void addProvider(ContentProvider provider) {
-		mountManager.addStructuralContentProvider(provider);
+		if (mountManager == null) {
+			providersToAdd.add(provider);
+			log.debug(
+					() -> "Will add provider " + provider.getMountPath() + " (" + provider.getClass().getName() + ")");
+		} else {
+			mountManager.addStructuralContentProvider(provider);
+			log.debug(() -> "Added provider " + provider.getMountPath() + " (" + provider.getClass().getName() + ")");
+		}
 	}
 
-	public void registerTypes(String prefix, String namespaceURI, String schemaSystemId) {
-		typesManager.registerTypes(prefix, namespaceURI, schemaSystemId);
+	@Override
+	public void registerTypes(ContentNamespace... namespaces) {
+		typesManager.registerTypes(namespaces);
 	}
 
 	/*
@@ -104,12 +120,14 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 //				document = dBuilder.parse(inputSource);
 //			} else {
 			document = dBuilder.newDocument();
-			Element root = document.createElementNS(CrName.CR_NAMESPACE_URI, CrName.ROOT.get().toPrefixedString());
+			Element root = document.createElementNS(ArgeoNamespace.CR_NAMESPACE_URI,
+					NamespaceUtils.toPrefixedName(CrName.root.qName()));
 
-			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);
@@ -129,6 +147,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 {
@@ -198,4 +220,9 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 		return typesManager;
 	}
 
+	CmsContentSession getSystemSession() {
+		return systemSession;
+	}
+	
+	
 }