projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract JCR in a separate bundle
[gpl/argeo-suite.git]
/
org.argeo.app.servlet.publish
/
src
/
org
/
argeo
/
app
/
servlet
/
publish
/
DbkServlet.java
diff --git
a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
index f2d38e1c0afd00c55726e9bcef5f61de05a98ab6..246a0c20f5d88b9362599a8fc2f6b0b34a51c3a0 100644
(file)
--- a/
org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
+++ b/
org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
@@
-42,11
+42,10
@@
import javax.xml.transform.stream.StreamSource;
import org.apache.commons.io.IOUtils;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.commons.io.IOUtils;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
-import org.apache.xalan.processor.TransformerFactoryImpl;
import org.argeo.api.cms.CmsLog;
import org.argeo.api.cms.ux.CmsTheme;
import org.argeo.app.docbook.DbkType;
import org.argeo.api.cms.CmsLog;
import org.argeo.api.cms.ux.CmsTheme;
import org.argeo.app.docbook.DbkType;
-import org.argeo.app.
docbook.Dbk
Utils;
+import org.argeo.app.
jcr.docbook.DbkJcr
Utils;
import org.argeo.cms.auth.RemoteAuthUtils;
import org.argeo.cms.servlet.ServletHttpRequest;
import org.argeo.jcr.Jcr;
import org.argeo.cms.auth.RemoteAuthUtils;
import org.argeo.cms.servlet.ServletHttpRequest;
import org.argeo.jcr.Jcr;
@@
-54,6
+53,8
@@
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
import org.w3c.dom.Document;
import org.argeo.jcr.JcrUtils;
import org.w3c.dom.Document;
+import net.sf.saxon.BasicTransformerFactory;
+
/**
* A servlet transforming a dbk:* JCR node into HTML, using the DocBook XSL.
*/
/**
* A servlet transforming a dbk:* JCR node into HTML, using the DocBook XSL.
*/
@@
-115,7
+116,7
@@
public class DbkServlet extends HttpServlet {
if (node.hasNode(DbkType.article.get())) {
Node dbkNode = node.getNode(DbkType.article.get());
if (node.hasNode(DbkType.article.get())) {
Node dbkNode = node.getNode(DbkType.article.get());
- if (DbkUtils.isDbk(dbkNode)) {
+ if (Dbk
Jcr
Utils.isDbk(dbkNode)) {
CmsTheme cmsTheme = null;
String themeId = req.getParameter("themeId");
if (themeId != null) {
CmsTheme cmsTheme = null;
String themeId = req.getParameter("themeId");
if (themeId != null) {
@@
-256,9
+257,10
@@
public class DbkServlet extends HttpServlet {
protected Templates createDocBookTemplates(String xsl) {
try {
if (transformerFactory == null) {
protected Templates createDocBookTemplates(String xsl) {
try {
if (transformerFactory == null) {
+ transformerFactory = new BasicTransformerFactory();
// We must explicitly use the non-XSLTC transformer, as XSLTC is not working
// with DocBook stylesheets
// We must explicitly use the non-XSLTC transformer, as XSLTC is not working
// with DocBook stylesheets
-
transformerFactory = new TransformerFactoryImpl();
+
//
transformerFactory = new TransformerFactoryImpl();
}
Source xslSource = new StreamSource(xsl);
Templates templates = transformerFactory.newTemplates(xslSource);
}
Source xslSource = new StreamSource(xsl);
Templates templates = transformerFactory.newTemplates(xslSource);