X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContentRepository.java;h=98a2fec9304699b6f09b8ac8242ae94dcc3137a9;hb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;hp=2e65e7e691dee045cdb4eb940624691a61a8f8a6;hpb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;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 2e65e7e69..98a2fec93 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java @@ -17,8 +17,10 @@ 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.ContentProvider; import org.argeo.api.acr.spi.ProvidedContent; @@ -48,9 +50,10 @@ public abstract class AbstractContentRepository implements ProvidedRepository { /** 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(); @@ -59,7 +62,8 @@ public abstract class AbstractContentRepository implements ProvidedRepository { for (QName type : types) { log.trace(type + " - " + typesManager.getAttributeTypes(type)); } - + long duration = System.currentTimeMillis() - begin; + log.debug(() -> "CMS content types available (initialisation took " + duration + " ms)"); } protected abstract CmsContentSession newSystemSession(); @@ -78,12 +82,16 @@ public abstract class AbstractContentRepository implements ProvidedRepository { /* * REPOSITORY */ - + @Override public void addProvider(ContentProvider provider) { - if (mountManager == null) + if (mountManager == null) { providersToAdd.add(provider); - else + 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) { @@ -110,7 +118,8 @@ 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 : RuntimeNamespaceContext.getPrefixes().keySet()) { // root.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE + ":" + prefix, @@ -208,4 +217,10 @@ public abstract class AbstractContentRepository implements ProvidedRepository { TypesManager getTypesManager() { return typesManager; } + + CmsContentSession getSystemSession() { + return systemSession; + } + + }