- moving generic xml parsing utilities out of FormsService and into their own class

- refactoring to generate and regenerate methods to make it easier to use project level overridden properties, and to at some point (soon) make it possible to make error handling for rendering engines more robust
- added a web project object to encapsulate web project properties and provide a central location for getting forms and rendering engines with web project level overridden properties
- made select default workflow screen match wireframes
- using the same workflowdefault type in the wcm model for web projects and forms.
- using outputpathpattern aspect consistently
- using commons.io to parse paths
- using form name rather than noderef as parameter for selected form from content forms dashlet
- fixed bug where rendition properties noderef wasn't being properly associated with renditions causing problems with regenerate
- using multivalued properties to track renditions
- remove weird registerRendition/registerFormInstanceData calls.  no longer necessary since generateRendition and regenerate are done within forminstancedata and rendition
- adding default workflow parameters as property of Form
- adding a unique name property to rendering engine templates to allow for looking one up by name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/forms/XSLFORenderingEngine.java

@@ -24,13 +24,13 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
+import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
 
 /**
  * A rendering engine which uses xsl-fo templates to generate renditions of
@@ -86,35 +86,40 @@ public class XSLFORenderingEngine
       return "fo";
    }
 
-   public void render(final Document xmlContent,
+   public void render(final FormInstanceData formInstanceData,
                       final RenderingEngineTemplate ret,
-                      final Map<String, String> parameters,
-                      final OutputStream out)
+                      final Rendition rendition)
       throws IOException,
-      RenderingEngine.RenderingException
+      RenderingEngine.RenderingException,
+      SAXException
    {
-      Result result = null;
+
       String mimetype = MIME_TYPES.get(ret.getMimetypeForRendition());
       if (mimetype == null)
       {
          throw new RenderingEngine.RenderingException("mimetype " + ret.getMimetypeForRendition() +
                                                       " is not supported by " + this.getName());
       }
+      final OutputStream out = rendition.getOutputStream();
       try
       {
          final FopFactory fopFactory = FopFactory.newInstance();
          final FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
-         final Fop fop = fopFactory.newFop(mimetype, 
-                                           foUserAgent, 
-                                           out);
+         final Fop fop = fopFactory.newFop(mimetype, foUserAgent, out);
          // Resulting SAX events (the generated FO) must be piped through to FOP
-         result = new SAXResult(fop.getDefaultHandler());
+         super.render(new DOMSource(formInstanceData.getDocument()), 
+                      ret, 
+                      this.getStandardParameters(formInstanceData, rendition), 
+                      new SAXResult(fop.getDefaultHandler()));
+
       }
       catch (FOPException fope)
       {
          throw new RenderingEngine.RenderingException(fope);
       }
-         
-      super.render(new DOMSource(xmlContent), ret, parameters, result);
+      finally
+      {
+         out.close();
+      }
    }
 }