Updates for n3 editing and freemarker conversion. Also fixing propDelete.jsp's reference to freemarker configuration loading to include correct method call.

This commit is contained in:
hjkhjk54 2011-10-11 15:49:19 +00:00
parent 23b55d2ae6
commit 591af24749
15 changed files with 356 additions and 112 deletions

View file

@ -130,9 +130,7 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
//map.putAll(FreemarkerHttpServlet.getDirectives());
//map.putAll(FreemarkerHttpServlet.getMethods());
ServletContext context = getServletContext();
FreemarkerConfigurationLoader loader =
FreemarkerConfigurationLoader.getFreemarkerConfigurationLoader(context);
FreemarkerConfiguration fmConfig = loader.getConfig(vreq);
FreemarkerConfiguration fmConfig = FreemarkerConfigurationLoader.getConfig(vreq, context);
fmConfig.resetRequestSpecificSharedVariables();
TemplateProcessingHelper helper = new TemplateProcessingHelper(fmConfig, vreq, context);
statementDisplay = helper.processTemplateToString(templateName, map);