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:40:24 UTC
svn commit: r1341056 - in /ofbiz/trunk: .classpath LICENSE framework/base/lib/freemarker-2.3.19-null-wildcards.jar framework/base/lib/freemarker-2.3.19.jar framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java

Author: doogie
Date: Mon May 21 14:40:23 2012
New Revision: 1341056

URL: http://svn.apache.org/viewvc?rev=1341056&view=rev
Log:
FEATURE: Upgrade freemarker to a custom version that contains an
upcoming fix, filed in bug upstream at:
https://sourceforge.net/tracker/?func=detail&atid=100794&aid=3527625&group_id=794

Added:
    ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar
      - copied, changed from r1341055, ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar
Removed:
    ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1341056&r1=1341055&r2=1341056&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon May 21 14:40:23 2012
@@ -26,7 +26,7 @@
     <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19-null-wildcards.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpclient-4.1.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.1.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpcore-4.1.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1341056&r1=1341055&r2=1341056&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon May 21 14:40:23 2012
@@ -454,7 +454,7 @@ BSD License:
 ofbiz/trunk/applications/content/lib/dom4j-1.6.1.jar
 ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar
 ofbiz/trunk/framework/base/lib/bsh-engine-modified.jar
-ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar
+ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar
 ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
 ofbiz/trunk/framework/base/lib/httpunit-1.7.jar
 ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar

Copied: ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar (from r1341055, ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar?p2=ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar&p1=ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar&r1=1341055&r2=1341056&rev=1341056&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1341056&r1=1341055&r2=1341056&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon May 21 14:40:23 2012
@@ -84,6 +84,7 @@ public class FreeMarkerWorker {
     }
 
     public static <T extends BeansWrapper> T configureBeansWrapper(T wrapper) {
+        wrapper.setNullWildcards(true);
         return wrapper;
     }