svn commit: r486969 - in /incubator/ofbiz/trunk: .classpath framework/webapp/build.xml framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java framework/webtools/webapp/webtools/WEB-INF/controller.xml

[jonesde]

Author: jonesde
Date: Wed Dec 13 21:39:06 2006
New Revision: 486969

URL: http://svn.apache.org/viewvc?view=rev&rev=486969
Log:
Restored FreeMarkerViewHandler.java without the JPublish stuff; needed for certain JSP/Region pages in WebTools which are now working again

Modified:
    incubator/ofbiz/trunk/.classpath
    incubator/ofbiz/trunk/framework/webapp/build.xml
    incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml

Modified: incubator/ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/.classpath?view=diff&rev=486969&r1=486968&r2=486969
==============================================================================
--- incubator/ofbiz/trunk/.classpath (original)
+++ incubator/ofbiz/trunk/.classpath Wed Dec 13 21:39:06 2006
@@ -29,7 +29,7 @@
  <classpathentry kind="src" path="framework/security/src"/>
  <classpathentry kind="src" path="framework/service/src"/>
  <classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="framework/shark/src"/>
- <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java|org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java" kind="src" path="framework/webapp/src"/>
+ <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java" kind="src" path="framework/webapp/src"/>
  <classpathentry kind="src" path="framework/webtools/src"/>
  <classpathentry kind="src" path="framework/widget/src"/>
  <classpathentry kind="src" path="framework/workflow/src"/>

Modified: incubator/ofbiz/trunk/framework/webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/build.xml?view=diff&rev=486969&r1=486968&r2=486969
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/build.xml (original)
+++ incubator/ofbiz/trunk/framework/webapp/build.xml Wed Dec 13 21:39:06 2006
@@ -92,7 +92,6 @@
             <exclude name="org/ofbiz/webapp/view/JPublishViewHandler.java"/>
             <exclude name="org/ofbiz/webapp/view/JPublishWrapper.java"/>
             <exclude name="org/ofbiz/webapp/view/FopPdfViewHandler.java"/>
-     <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java"/>
      <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/>
             <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/>
         </javac>

Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java?view=diff&rev=486969&r1=486968&r2=486969
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java (original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java Wed Dec 13 21:39:06 2006
@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.jpublish.view.freemarker.JPublishTemplateLoader;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.template.FreeMarkerWorker;
 import org.ofbiz.webapp.view.ViewHandler;
@@ -56,10 +55,6 @@
         this.servletContext = context;
 
         config = new freemarker.template.Configuration();
-
-        JPublishTemplateLoader templateLoader = new JPublishTemplateLoader();
-        //templateLoader.setSiteContext(siteContext);
-        config.setTemplateLoader(templateLoader);
         config.setLocalizedLookup(false);
         
         //nice thought, but doesn't do auto reloading with this: config.setServletContextForTemplateLoading(context, "/");

Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?view=diff&rev=486969&r1=486968&r2=486969
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Wed Dec 13 21:39:06 2006
@@ -32,7 +32,8 @@
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
     <handler name="datavision" type="view" class="org.ofbiz.webapp.view.DataVisionViewHandler"/>
-
+    <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>  
+    
     <preprocessor>
         <!-- Events to run on every request before security (chains exempt) -->
         <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> -->