- fixing a bug in jsf usage in create form details screen

- adding a sample of pdf renditioning
- adding all necessary jars for fop
- specifying xerces version in jar file name
- fixing error in simple-test.ftl

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

project-build.xml

@@ -43,7 +43,7 @@
          <fileset dir="${dir.common.lib}/swarmcache" includes="*.jar" />
          <fileset dir="${dir.common.lib}/jbpm" includes="*.jar" />
          <fileset dir="${dir.common.lib}/chiba" includes="*.jar" />
-	 <fileset dir="${dir.common.lib}/xerces-2.8.0" includes="*.jar"/>
+	 <fileset dir="${dir.common.lib}/fop" includes="*.jar"/>
          <fileset dir="${dir.project.core}/build/dist" includes="${dir.name.core}.jar" />
          <fileset dir="${dir.project.dependency}/build/dist" includes="${dir.name.dependency}.jar" />
          <fileset dir="${dir.project.repository}/build/dist" includes="${dir.name.repository}.jar" />

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,
+   public void render(final Document xmlContent,
                       final Map<String, String> 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() : "<no id>") 
-                               + " 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);
+
    }
 }

source/test-resources/xforms/unit-tests/simple-test/simple-test.fo

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.1"
+		xmlns:fo="http://www.w3.org/1999/XSL/Format"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		exclude-result-prefixes="fo">
+
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"
+		omit-xml-declaration="no"/>
+    <xsl:param name="versionParam" select="'1.0'"/> 
+
+    <xsl:template match="/simple/string">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<fo:layout-master-set>
+          <fo:simple-page-master master-name="simpleA4" 
+				 page-height="21cm" 
+				 page-width="21cm" 
+				 margin-top="2cm" 
+				 margin-bottom="2cm" 
+				 margin-left="2cm" 
+				 margin-right="2cm">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="simpleA4">
+        <fo:flow flow-name="xsl-region-body">
+	  <fo:block font-size="11pt" line-height="25px">Generated by simple-test.fo</fo:block>
+	  <fo:block font-size="11pt" line-height="25px">
+            <fo:inline color="#003366" font-weight="bold">Captured string value: </fo:inline>
+	    <fo:inline><xsl:value-of select="."/></fo:inline>
+	  </fo:block>
+	</fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+    </xsl:template>
+</xsl:stylesheet>

source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl

@@ -21,7 +21,7 @@
     <div>Generated by simple-test.ftl</div>
     <div style="line-height: 25px;">
       <span class="name">Captured string value:</span> 
-      <span>${doc.simple.string}</span>
+      <span>${simple.string}</span>
     </div>
   </body>
 </html>

source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl

@@ -39,7 +39,7 @@ body
     <xsl:template match="/simple/string">
       <div style="line-height: 25px;">
 	<span class="name">Captured string value:</span>
-	<span><xsl:value-of select="/simple/string"/></span>
+	<span><xsl:value-of select="."/></span>
       </div>
     </xsl:template>
 </xsl:stylesheet>

source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp

@@ -87,7 +87,7 @@ else
     <h:graphicImage id="required-image-mimetype"
                     value="/images/icons/required_field.gif" alt="Required Field" />
     <h:outputText id="mimetype-output-text"
-		  value="#{msg.mimetype_for_generated_assets}:"/>
+		  value="#{msg.mimetype_for_renditions}:"/>
     <h:selectOneMenu id="mimetype"
 		     value="#{WizardManager.bean.mimetype}">
       <f:selectItems id="mimetype-choices"
@@ -97,7 +97,7 @@ else
     <h:graphicImage id="required-image-file-extension"
                     value="/images/icons/required_field.gif" alt="Required Field" />
     <h:outputText id="file-extension-output-text"
-                  value="#{msg.extension_for_generated_assets}:"/>
+                  value="#{msg.extension_for_renditions}:"/>
     <h:inputText id="file-extension" 
 		 value="#{WizardManager.bean.fileExtension}"
                  maxlength="10" size="10"/>

source/web/jsp/wcm/create-form-wizard/details.jsp

@@ -101,7 +101,8 @@ if (upload == null || upload.getFile() == null)
    <h:outputText id="output_text_root_element_name" value="#{msg.schema_root_element_name}:"/>
    <h:selectOneMenu id="schema-root-element-name" 
                     value="#{WizardManager.bean.schemaRootElementName}">
-     <f:selectItems value="#{WizardManager.bean.schemaRootElementNameChoices}"/>
+     <f:selectItems id="schema-root-element-name-choices"
+		    value="#{WizardManager.bean.schemaRootElementNameChoices}"/>
    </h:selectOneMenu>
    <h:graphicImage id="graphic_image_name" value="/images/icons/required_field.gif" alt="Required Field" />