You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/21 16:39:59 UTC
svn commit: r1341053 - in /ofbiz/trunk:
applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy
specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy
Author: doogie
Date: Mon May 21 14:39:59 2012
New Revision: 1341053
URL: http://svn.apache.org/viewvc?rev=1341053&view=rev
Log:
FIX: Replace BeansWrapper.getDefaultInstance() with
FreeMarkerWorker.getDefaultOfbizWrapper(); these were missed in
v1340631.
Modified:
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy?rev=1341053&r1=1341052&r2=1341053&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy Mon May 21 14:39:59 2012
@@ -18,13 +18,13 @@
*/
import org.ofbiz.base.util.*
+import org.ofbiz.base.util.template.FreeMarkerWorker
import org.ofbiz.entity.*
import org.ofbiz.entity.model.*
import org.ofbiz.content.data.DataResourceWorker
import org.ofbiz.webapp.ftl.FreeMarkerViewHandler
import java.io.StringWriter
-import freemarker.ext.beans.BeansWrapper
import freemarker.template.WrappingTemplateModel
import javax.servlet.*
@@ -37,7 +37,7 @@ if (currentValue) {
if (dataResourceTypeId) {
mimeTypeId = currentValue.drMimeTypeId;
rootDir = request.getSession().getServletContext().getRealPath("/");
- wrapper = BeansWrapper.getDefaultInstance();
+ wrapper = FreeMarkerWorker.getDefaultOfbizWrapper();
WrappingTemplateModel.setDefaultObjectWrapper(wrapper);
templateRoot = [:];
FreeMarkerViewHandler.prepOfbizRoot(templateRoot, request, response);
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy?rev=1341053&r1=1341052&r2=1341053&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy Mon May 21 14:39:59 2012
@@ -18,6 +18,7 @@
*/
import org.ofbiz.base.util.*;
+import org.ofbiz.base.util.template.FreeMarkerWorker;
import org.ofbiz.entity.*;
import org.ofbiz.security.*;
import org.ofbiz.service.*;
@@ -30,7 +31,6 @@ import org.ofbiz.content.content.Content
import org.ofbiz.content.ContentManagementWorker;
import java.io.StringWriter;
-import freemarker.ext.beans.BeansWrapper;
import freemarker.template.SimpleHash;
import freemarker.template.WrappingTemplateModel;
@@ -75,7 +75,7 @@ if (currentValue) {
mimeTypeId = currentValue.mimeTypeId;
rootDir = request.getSession().getServletContext().getRealPath("/");
- wrapper = BeansWrapper.getDefaultInstance();
+ wrapper = FreeMarkerWorker.getDefaultOfbizWrapper();
WrappingTemplateModel.setDefaultObjectWrapper(wrapper);
//templateRoot = new SimpleHash(wrapper);
templateRoot = [:];