OFBIZ-6277: new Configuration() is deprecated; instead, the desired
freemarker version should be passed in.  To make it easier to control
the version centrally, add a helper method on FreeMarkerWorker that
wraps the instantiation of the Configuration object.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/OFBIZ-6275@1675521 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java b/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
index 436f910..d0436ef 100644
--- a/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
+++ b/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
@@ -88,8 +88,12 @@
         return defaultOfbizWrapper;
     }
 
+    public static Configuration newConfiguration() {
+        return new Configuration(version);
+    }
+
     public static Configuration makeConfiguration(BeansWrapper wrapper) {
-        Configuration newConfig = new Configuration(version);
+        Configuration newConfig = newConfiguration();
 
         newConfig.setObjectWrapper(wrapper);
         TemplateHashModel staticModels = wrapper.getStaticModels();
diff --git a/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java b/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
index b34425f..fa7617a 100644
--- a/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
+++ b/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
@@ -376,7 +376,7 @@
                     Reader templateReader = new InputStreamReader(templateUrl.openStream());
 
                     StringWriter outWriter = new StringWriter();
-                    Configuration config = new Configuration();
+                    Configuration config = FreeMarkerWorker.newConfiguration();
                     config.setObjectWrapper(FreeMarkerWorker.getDefaultOfbizWrapper());
                     config.setSetting("datetime_format", "yyyy-MM-dd HH:mm:ss.SSS");