svn commit: r1328369 - in /ofbiz/branches/release11.04: ./ framework/base/lib/ framework/base/src/org/ofbiz/base/util/ themes/bizznesstime/includes/ themes/droppingcrumbs/includes/ themes/flatgrey/includes/ themes/tomahawk/includes/

[jacopoc]

Author: jacopoc
Date: Fri Apr 20 13:30:43 2012
New Revision: 1328369

URL: http://svn.apache.org/viewvc?rev=1328369&view=rev
Log:
Backported

Added:
    ofbiz/branches/release11.04/framework/base/lib/freemarker-2.3.19.jar   (with props)
Removed:
    ofbiz/branches/release11.04/framework/base/lib/freemarker-2.3.10.jar
Modified:
    ofbiz/branches/release11.04/.classpath
    ofbiz/branches/release11.04/LICENSE
    ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/GroovyUtil.java
    ofbiz/branches/release11.04/themes/bizznesstime/includes/footer.ftl
    ofbiz/branches/release11.04/themes/droppingcrumbs/includes/footer.ftl
    ofbiz/branches/release11.04/themes/flatgrey/includes/footer.ftl
    ofbiz/branches/release11.04/themes/tomahawk/includes/footer.ftl

Modified: ofbiz/branches/release11.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/.classpath?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/.classpath (original)
+++ ofbiz/branches/release11.04/.classpath Fri Apr 20 13:30:43 2012
@@ -28,7 +28,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.10.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19.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/branches/release11.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/LICENSE?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/LICENSE (original)
+++ ofbiz/branches/release11.04/LICENSE Fri Apr 20 13:30:43 2012
@@ -455,7 +455,7 @@ The JDOM License
 The following libraries distributed with Apache OFBiz are licensed under the
 BSD License:
 ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar
-ofbiz/trunk/framework/base/lib/freemarker-2.3.10.jar
+ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar
 ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
 ofbiz/trunk/framework/base/lib/httpunit.jar
 ofbiz/trunk/framework/base/lib/ical4j-1.0.jar

Added: ofbiz/branches/release11.04/framework/base/lib/freemarker-2.3.19.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/lib/freemarker-2.3.19.jar?rev=1328369&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release11.04/framework/base/lib/freemarker-2.3.19.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/GroovyUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/GroovyUtil.java?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/GroovyUtil.java (original)
+++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/GroovyUtil.java Fri Apr 20 13:30:43 2012
@@ -109,10 +109,17 @@ public class GroovyUtil {
                     throw new GeneralException("Script not found at location [" + location + "]");
                 }
                 scriptClass = parseClass(scriptUrl.openStream(), location);
-                if (Debug.verboseOn()) {
-                    Debug.logVerbose("Caching Groovy script at: " + location, module);
+                synchronized (parsedScripts) {
+                    Class<?> scriptClassCached = parsedScripts.get(location);
+                    if (scriptClassCached == null) {
+                        if (Debug.verboseOn()) {
+                            Debug.logVerbose("Caching Groovy script at: " + location, module);
+                        }
+                        parsedScripts.put(location, scriptClass);
+                    } else {
+                        scriptClass = scriptClassCached;
+                    }
                 }
-                parsedScripts.put(location, scriptClass);
             }
             return scriptClass;
         } catch (Exception e) {
@@ -145,10 +152,18 @@ public class GroovyUtil {
             Class<?> scriptClass = parsedScripts.get(script);
             if (scriptClass == null) {
                 scriptClass = loadClass(script);
-                if (Debug.verboseOn()) Debug.logVerbose("Caching Groovy script: " + script, module);
-                parsedScripts.put(script, scriptClass);
+                synchronized (parsedScripts) {
+                    Class<?> scriptClassCached = parsedScripts.get(script);
+                    if (scriptClassCached == null) {
+                        if (Debug.verboseOn()) {
+                            Debug.logVerbose("Caching Groovy script: " + script, module);
+                        }
+                        parsedScripts.put(script, scriptClass);
+                    } else {
+                        scriptClass = scriptClassCached;
+                    }
+                }
             }
-
             return InvokerHelper.createScript(scriptClass, getBinding(context)).run();
         } catch (CompilationFailedException e) {
             String errMsg = "Error loading Groovy script [" + script + "]: " + e.toString();

Modified: ofbiz/branches/release11.04/themes/bizznesstime/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/bizznesstime/includes/footer.ftl?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/bizznesstime/includes/footer.ftl (original)
+++ ofbiz/branches/release11.04/themes/bizznesstime/includes/footer.ftl Fri Apr 20 13:30:43 2012
@@ -25,7 +25,7 @@ under the License.
 </div>
 <!-- footer -->
 <div id="footer">
-    <div class="poweredBy"><span>Powered by <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-2009 <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "../../../runtime/svninfo.ftl" /></span></div>
+    <div class="poweredBy"><span>Powered by <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-2009 <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "ofbizhome://runtime/svninfo.ftl" /></span></div>
 
 </div>
 <!-- footer -->

Modified: ofbiz/branches/release11.04/themes/droppingcrumbs/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/droppingcrumbs/includes/footer.ftl?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/branches/release11.04/themes/droppingcrumbs/includes/footer.ftl Fri Apr 20 13:30:43 2012
@@ -27,7 +27,7 @@ under the License.
   <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
   <p>
   ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
-  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" /></p>
+  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /></p>
 </div>
 <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
   <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>

Modified: ofbiz/branches/release11.04/themes/flatgrey/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/flatgrey/includes/footer.ftl?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/branches/release11.04/themes/flatgrey/includes/footer.ftl Fri Apr 20 13:30:43 2012
@@ -23,7 +23,7 @@ under the License.
         <li class="last"><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
     </ul>
   <p>
-  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "../../../runtime/svninfo.ftl" />
+  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" />
   </p>
 </div>
 </div>

Modified: ofbiz/branches/release11.04/themes/tomahawk/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/tomahawk/includes/footer.ftl?rev=1328369&r1=1328368&r2=1328369&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/tomahawk/includes/footer.ftl (original)
+++ ofbiz/branches/release11.04/themes/tomahawk/includes/footer.ftl Fri Apr 20 13:30:43 2012
@@ -23,7 +23,7 @@ under the License.
   <ul>
     <li>
       ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br/>
-      ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" />
+      ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" />
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
   <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>