Merged V3.1 to HEAD

14465: Fix for ALFCOM-195 - date added to WCM FreeMarker template model.
   14466: Fix for ETHREEOH-2075
   14469: Fix for ETHREEOH-2120

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-06-05 16:29:50 +00:00
parent 24aa28e6e0
commit 9c1d8b616d

View File

@@ -381,6 +381,10 @@ public class RenderingEngineTemplateImpl
final String webappUrl = AVMUtil.buildWebappUrl(formInstanceDataAvmPath);
final HashMap<QName, Object> model = new HashMap<QName, Object>();
// add simple scalar parameters
model.put(QName.createQName(NamespaceService.ALFRESCO_PREFIX,
"date",
namespacePrefixResolver),
new SimpleDate(new Date(), SimpleDate.DATETIME));
model.put(QName.createQName(NamespaceService.ALFRESCO_PREFIX,
"avm_sandbox_url",
namespacePrefixResolver),