Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-38

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-04 11:47:24 +02:00
parent 54845f014e 84e23b3bf0
commit 0bd2ec8d5f
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scm-webapp/src/main/java/sonia/scm/template/FreemarkerTemplateHandler.java
View File

@@ -42,9 +42,11 @@ import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.ConfigurationException;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
@@ -57,7 +59,6 @@ import java.util.Locale;
import java.util.Map;
import javax.servlet.ServletContext;
import org.slf4j.Logger;
/**
*
@@ -91,20 +92,10 @@ public class FreemarkerTemplateHandler implements TemplateHandler
@Inject
public FreemarkerTemplateHandler(ServletContext servletContext)
{
try
{
configuration = new Configuration();
String path = servletContext.getRealPath(DIRECTORY_TEMPLATES);
configuration.setDirectoryForTemplateLoading(new File(path));
configuration.setEncoding(Locale.ENGLISH, ENCODING);
}
catch (IOException ex)
{
throw new ConfigurationException(
"could not create FreemarkerTemplateHandler", ex);
}
configuration = new Configuration();
configuration.setServletContextForTemplateLoading(servletContext,
DIRECTORY_TEMPLATES);
configuration.setEncoding(Locale.ENGLISH, ENCODING);
}
//~--- methods --------------------------------------------------------------