X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fxml%2FDomContentProvider.java;h=a5abe8dd47f165f170d98154ee559d80987bec97;hb=5724ab347ddfba8f2b21cdcc2fa0b8e1e2b4e527;hp=54013e2ad1301deb66235671fcce278e6be64b58;hpb=da9d144b6b241e1526a3bd255dff905a7969a5bc;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java
index 54013e2ad..a5abe8dd4 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java
@@ -8,6 +8,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import javax.xml.namespace.NamespaceContext;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
@@ -15,6 +16,7 @@ import javax.xml.xpath.XPathFactory;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentNotFoundException;
+import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
@@ -31,12 +33,17 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 	// TODO centralise in some executor?
 	private final ThreadLocal<XPath> xPath;
 
+	private TransformerFactory transformerFactory;
+
 	private String mountPath;
 
 	public DomContentProvider(String mountPath, Document document) {
 		this.mountPath = mountPath;
 		this.document = document;
 		this.document.normalizeDocument();
+
+		transformerFactory = TransformerFactory.newInstance();
+
 		XPathFactory xPathFactory = XPathFactory.newInstance();
 		xPath = new ThreadLocal<>() {
 
@@ -50,16 +57,6 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		};
 	}
 
-//	@Override
-//	public Content get() {
-//		return new DomContent(this, document.getDocumentElement());
-//	}
-
-//	public Element createElement(String name) {
-//		return document.createElementNS(null, name);
-//
-//	}
-
 	@Override
 	public ProvidedContent get(ProvidedSession session, String relativePath) {
 		if ("".equals(relativePath))
@@ -69,7 +66,8 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		if (nodes.getLength() > 1)
 			throw new IllegalArgumentException("Multiple content found for " + relativePath + " under " + mountPath);
 		if (nodes.getLength() == 0)
-			throw new ContentNotFoundException("Path " + relativePath + " under " + mountPath + " was not found");
+			throw new ContentNotFoundException(session, mountPath + "/" + relativePath,
+					"Path " + relativePath + " under " + mountPath + " was not found");
 		Element element = (Element) nodes.item(0);
 		return new DomContent(session, this, element);
 	}
@@ -78,8 +76,8 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		if (relativePath.startsWith("/"))
 			throw new IllegalArgumentException("Relative path cannot start with /");
 		String xPathExpression = '/' + relativePath;
-		if ("/".equals(mountPath))
-			xPathExpression = "/cr:root" + xPathExpression;
+		if (Content.ROOT_PATH.equals(mountPath)) // repository root
+			xPathExpression = "/" + CrName.root.qName() + xPathExpression;
 		try {
 			NodeList nodes = (NodeList) xPath.get().evaluate(xPathExpression, document, XPathConstants.NODESET);
 			return nodes;
@@ -97,6 +95,7 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		return nodes.getLength() != 0;
 	}
 
+	@Override
 	public void persist(ProvidedSession session) {
 		if (mountPath != null) {
 			Content mountPoint = session.getMountPoint(mountPath);
@@ -144,4 +143,8 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		return Collections.unmodifiableList(res).iterator();
 	}
 
+	TransformerFactory getTransformerFactory() {
+		return transformerFactory;
+	}
+
 }