svn commit: r561239 - /myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java

[mm...@apache.org]

Author: mmarinschek
Date: Mon Jul 30 23:21:42 2007
New Revision: 561239

URL: http://svn.apache.org/viewvc?view=rev&rev=561239
Log:
https://issues.apache.org/jira/browse/TOMAHAWK-1065: DefaultTemplateEncoder used wrong directory name to lookup templates

Modified:
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java?view=diff&rev=561239&r1=561238&r2=561239
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java Mon Jul 30 23:21:42 2007
@@ -40,12 +40,12 @@
 public class DefaultTemplateEncoder implements TemplateEncoder {
 
     private static final Log log = LogFactory.getLog(DefaultTemplateEncoder.class);
-    private static final String TEMPLATE_DIRECTORY = "template/";
+    private static final String TEMPLATE_DIRECTORY = "template";
 
     public void encodeTemplate(FacesContext context, UIComponent component, Renderer renderer, String template, Object dataModel) throws IOException {
             Configuration cfg = new Configuration();
-        log.info("Encoding template : " + getClass().getResource(template));
-        TemplateLoader templateLoader = new ClassTemplateLoader(renderer.getClass(), TEMPLATE_DIRECTORY +template);
+        log.info("Encoding template : " + renderer.getClass().getResource(TEMPLATE_DIRECTORY+"/"+template));
+        TemplateLoader templateLoader = new ClassTemplateLoader(renderer.getClass(), TEMPLATE_DIRECTORY);
         cfg.setTemplateLoader(templateLoader);
         cfg.setObjectWrapper(new DefaultObjectWrapper());
         Template temp = cfg.getTemplate(template);