You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/09/01 16:11:33 UTC
svn commit: r1621801 - in /ofbiz/trunk/framework:
webapp/src/org/ofbiz/webapp/control/ControlServlet.java
widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
Author: jacopoc
Date: Mon Sep 1 14:11:32 2014
New Revision: 1621801
URL: http://svn.apache.org/r1621801
Log:
Removed unused/obsolete request/screen context fields.
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.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=1621801&r1=1621800&r2=1621801&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 Mon Sep 1 14:11:32 2014
@@ -190,9 +190,6 @@ public class ControlServlet extends Http
request.setAttribute("_REQUEST_HANDLER_", requestHandler);
- ServletContextHashModel ftlServletContext = new ServletContextHashModel(this, FreeMarkerWorker.getDefaultOfbizWrapper());
- request.setAttribute("ftlServletContext", ftlServletContext);
-
// setup some things that should always be there
UtilHttp.setInitialRequestInfo(request);
VisitHandler.getVisitor(request, response);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=1621801&r1=1621800&r2=1621801&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Mon Sep 1 14:11:32 2014
@@ -62,7 +62,6 @@ import org.xml.sax.SAXException;
import freemarker.ext.jsp.TaglibFactory;
import freemarker.ext.servlet.HttpRequestHashModel;
import freemarker.ext.servlet.HttpSessionHashModel;
-import freemarker.ext.servlet.ServletContextHashModel;
/**
* Widget Library - Screen model class
@@ -246,10 +245,6 @@ public class ScreenRenderer {
context.put("JspTaglibs", JspTaglibs);
context.put("requestParameters", UtilHttp.getParameterMap(request));
- ServletContextHashModel ftlServletContext = (ServletContextHashModel) request.getAttribute("ftlServletContext");
- context.put("Application", ftlServletContext);
- context.put("Request", context.get("requestAttributes"));
-
// this is a dummy object to stand-in for the JPublish page object for backward compatibility
context.put("page", FastMap.newInstance());