diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 82c82aa5c2..5679fee65e 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -652,8 +652,8 @@ selected_rendering_engines=Selected Rendering Engines configure_rendering_engines_step1_desc=Upload rendering engine template and specify the extension to use for its generated assets. rendering_engine_file=Rendering Engine Template File rendering_engine_type=Rendering Engine Type -extension_for_generated_assets=Extension For Generated Assets -mimetype_for_generated_assets=Mimetype For Generated Assets +extension_for_renditions=Extension for renditions +mimetype_for_renditions=Mimetype for renditions file_extension=Extension schema=Schema schema_root_element_name=Root Element diff --git a/project-build.xml b/project-build.xml index 1ecf12e851..3851b3824e 100644 --- a/project-build.xml +++ b/project-build.xml @@ -43,7 +43,7 @@ - + diff --git a/source/java/org/alfresco/web/forms/XSLFORenderingEngine.java b/source/java/org/alfresco/web/forms/XSLFORenderingEngine.java index c4b1926e29..dded5102b5 100644 --- a/source/java/org/alfresco/web/forms/XSLFORenderingEngine.java +++ b/source/java/org/alfresco/web/forms/XSLFORenderingEngine.java @@ -56,38 +56,30 @@ public class XSLFORenderingEngine super(nodeRef, nodeService, contentService); } - public void generate(final Document xmlContent, - final Map parameters, - final OutputStream out) + public void render(final Document xmlContent, + final Map parameters, + final OutputStream out) throws IOException, RenderingEngine.RenderingException { + Result result = null; try { final FopFactory fopFactory = FopFactory.newInstance(); final FOUserAgent foUserAgent = fopFactory.newFOUserAgent(); - final Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, out); - + final Fop fop = fopFactory.newFop(this.getMimetypeForRendition(), + foUserAgent, + out); // Resulting SAX events (the generated FO) must be piped through to FOP - final Result result = new SAXResult(fop.getDefaultHandler()); + result = new SAXResult(fop.getDefaultHandler()); - super.render(new DOMSource(xmlContent), parameters, result); - - // Result processing - FormattingResults foResults = fop.getResults(); - java.util.List pageSequences = foResults.getPageSequences(); - for (java.util.Iterator it = pageSequences.iterator(); it.hasNext();) - { - PageSequenceResults pageSequenceResults = (PageSequenceResults)it.next(); - System.out.println("PageSequence " - + (String.valueOf(pageSequenceResults.getID()).length() > 0 - ? pageSequenceResults.getID() : "") - + " generated " + pageSequenceResults.getPageCount() + " pages."); - } - System.out.println("Generated " + foResults.getPageCount() + " pages in total."); } catch (FOPException fope) { + throw new RenderingEngine.RenderingException(fope); } + + super.render(new DOMSource(xmlContent), parameters, result); + } } \ No newline at end of file diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.fo b/source/test-resources/xforms/unit-tests/simple-test/simple-test.fo new file mode 100644 index 0000000000..7425694203 --- /dev/null +++ b/source/test-resources/xforms/unit-tests/simple-test/simple-test.fo @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + Generated by simple-test.fo + + Captured string value: + + + + + + + diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl b/source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl index 75e06f2e6d..ef98b6ead8 100644 --- a/source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl +++ b/source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl @@ -21,7 +21,7 @@
Generated by simple-test.ftl
Captured string value: - ${doc.simple.string} + ${simple.string}
diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl b/source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl index 0d3fcc1d1d..dc5b19d3d5 100644 --- a/source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl +++ b/source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl @@ -39,7 +39,7 @@ body
Captured string value: - +
diff --git a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp index 1f76054d8c..d4aabc277e 100644 --- a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp +++ b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp @@ -87,7 +87,7 @@ else + value="#{msg.mimetype_for_renditions}:"/> + value="#{msg.extension_for_renditions}:"/> diff --git a/source/web/jsp/wcm/create-form-wizard/details.jsp b/source/web/jsp/wcm/create-form-wizard/details.jsp index 0a8db02c82..3aa50ae497 100644 --- a/source/web/jsp/wcm/create-form-wizard/details.jsp +++ b/source/web/jsp/wcm/create-form-wizard/details.jsp @@ -101,7 +101,8 @@ if (upload == null || upload.getFile() == null) - +