X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fxml%2FDomContentProvider.java;h=d569350975ff1c5fa8597ebe6962f8bbdf95e13a;hb=be6d2dbdf3ccafc9b8ac8820a68a3eb7de859b06;hp=d6e246df53fb9282c9171cc8e2fd977b12a07b4b;hpb=f3ea14abccc33b1c3326417a87c91145be776c72;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 d6e246df5..d56935097 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;
@@ -21,6 +22,7 @@ import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.acr.CmsContentRepository;
+import org.argeo.cms.acr.ContentUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -32,12 +34,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<>() {
 
@@ -51,16 +58,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))
@@ -70,7 +67,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);
 	}
@@ -79,7 +77,7 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		if (relativePath.startsWith("/"))
 			throw new IllegalArgumentException("Relative path cannot start with /");
 		String xPathExpression = '/' + relativePath;
-		if ("/".equals(mountPath))
+		if (ContentUtils.SLASH_STRING.equals(mountPath)) // repository root
 			xPathExpression = "/" + CrName.root.qName() + xPathExpression;
 		try {
 			NodeList nodes = (NodeList) xPath.get().evaluate(xPathExpression, document, XPathConstants.NODESET);
@@ -145,4 +143,8 @@ public class DomContentProvider implements ContentProvider, NamespaceContext {
 		return Collections.unmodifiableList(res).iterator();
 	}
 
+	TransformerFactory getTransformerFactory() {
+		return transformerFactory;
+	}
+
 }