- 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
This commit is contained in:
Ariel Backenroth
2006-12-31 08:45:42 +00:00
parent 21a73db5bd
commit a25d85ee83
43 changed files with 1546 additions and 1103 deletions

View File

@@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.web.bean.wcm.AVMConstants;
import org.alfresco.web.forms.FormsService;
import org.alfresco.web.forms.XMLUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xalan.extensions.ExpressionContext;
@@ -138,9 +138,7 @@ public class XSLTRenderingEngine
// create a root document for rooting all the results. we do this
// so that each document root element has a common parent node
// and so that xpath axes work properly
final FormsService fs = FormsService.getInstance();
final DocumentBuilder documentBuilder = fs.getDocumentBuilder();
final Document rootNodeDocument = documentBuilder.newDocument();
final Document rootNodeDocument = XMLUtil.newDocument();
final Element rootNodeDocumentEl =
rootNodeDocument.createElementNS(ALFRESCO_NS,
ALFRESCO_NS_PREFIX + ":file_list");
@@ -286,14 +284,25 @@ public class XSLTRenderingEngine
}
}
public void render(final Document formInstanceData,
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
{
this.render(new DOMSource(formInstanceData), ret, parameters, new StreamResult(out));
final OutputStream out = rendition.getOutputStream();
try
{
this.render(new DOMSource(formInstanceData.getDocument()),
ret,
this.getStandardParameters(formInstanceData, rendition),
new StreamResult(out));
}
finally
{
out.close();
}
}
protected void render(final Source formInstanceDataSource,
@@ -301,15 +310,15 @@ public class XSLTRenderingEngine
final Map<String, String> parameters,
final Result result)
throws IOException,
RenderingEngine.RenderingException
RenderingEngine.RenderingException,
SAXException
{
System.setProperty("org.apache.xalan.extensions.bsf.BSFManager",
BSFManager.class.getName());
final FormsService ts = FormsService.getInstance();
Document xslTemplate = null;
try
{
xslTemplate = ts.parseXML(ret.getInputStream());
xslTemplate = XMLUtil.parse(ret.getInputStream());
}
catch (final SAXException sax)
{
@@ -356,9 +365,9 @@ public class XSLTRenderingEngine
{
if (LOGGER.isDebugEnabled())
LOGGER.debug("loading " + uri);
final Document d = ts.parseXML(uri.toURL().openStream());
final Document d = XMLUtil.parse(uri.toURL().openStream());
if (LOGGER.isDebugEnabled())
LOGGER.debug("loaded " + ts.writeXMLToString(d));
LOGGER.debug("loaded " + XMLUtil.toString(d));
return new DOMSource(d);
}
catch (Exception e)