svn commit: r1621953 - in /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp: control/ControlServlet.java ftl/FreeMarkerViewHandler.java view/HttpViewHandler.java

[jacopoc]

Author: jacopoc
Date: Tue Sep  2 09:38:50 2014
New Revision: 1621953

URL: http://svn.apache.org/r1621953
Log:
Minor cleanups; no functional changes.

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1621953&r1=1621952&r2=1621953&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Tue Sep  2 09:38:50 2014
@@ -38,7 +38,6 @@ import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilJ2eeCompat;
 import org.ofbiz.base.util.UtilTimer;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.template.FreeMarkerWorker;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
@@ -50,8 +49,6 @@ import org.ofbiz.service.LocalDispatcher
 import org.ofbiz.webapp.stats.ServerHitBin;
 import org.ofbiz.webapp.stats.VisitHandler;
 
-import freemarker.ext.servlet.ServletContextHashModel;
-
 /**
  * ControlServlet.java - Master servlet for the web application.
  */

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java?rev=1621953&r1=1621952&r2=1621953&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java Tue Sep  2 09:38:50 2014
@@ -45,11 +45,9 @@ import freemarker.template.TemplateExcep
 public class FreeMarkerViewHandler extends AbstractViewHandler {
 
     public static final String module = FreeMarkerViewHandler.class.getName();
-    protected ServletContext servletContext = null;
     protected Configuration config = (Configuration) FreeMarkerWorker.getDefaultOfbizConfig().clone();
 
     public void init(ServletContext context) throws ViewHandlerException {
-        this.servletContext = context;
         config.setCacheStorage(new OfbizCacheStorage("unknown"));
         config.setServletContextForTemplateLoading(context, "/");
     }

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java?rev=1621953&r1=1621952&r2=1621953&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java Tue Sep  2 09:38:50 2014
@@ -35,10 +35,7 @@ public class HttpViewHandler extends Abs
 
     public static final String module = HttpViewHandler.class.getName();
 
-    protected ServletContext context;
-
     public void init(ServletContext context) throws ViewHandlerException {
-        this.context = context;
     }
 
     public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {