svn commit: r1729615 - in /ofbiz/branches/release15.12: ./ applications/commonext/webapp/ofbizsetup/organization/ framework/base/lib/scripting/ specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/

[jacopoc]

Author: jacopoc
Date: Wed Feb 10 15:00:24 2016
New Revision: 1729615

URL: http://svn.apache.org/viewvc?rev=1729615&view=rev
Log:
Applied fix from trunk for revision: 1729609
===

OFBIZ-6568: upgraded Groovy to the latest version (2.4.5).



Added:
    ofbiz/branches/release15.12/framework/base/lib/scripting/groovy-all-2.4.5.jar
      - copied unchanged from r1729609, ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.4.5.jar
Removed:
    ofbiz/branches/release15.12/framework/base/lib/scripting/groovy-all-2.2.1.jar
Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/.classpath
    ofbiz/branches/release15.12/LICENSE
    ofbiz/branches/release15.12/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
    ofbiz/branches/release15.12/macros.xml
    ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 15:00:24 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609

Modified: ofbiz/branches/release15.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/.classpath?rev=1729615&r1=1729614&r2=1729615&view=diff
==============================================================================
--- ofbiz/branches/release15.12/.classpath (original)
+++ ofbiz/branches/release15.12/.classpath Wed Feb 10 15:00:24 2016
@@ -88,7 +88,7 @@
  <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.2.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.4.5.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
  <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.2.jar"/>

Modified: ofbiz/branches/release15.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/LICENSE?rev=1729615&r1=1729614&r2=1729615&view=diff
==============================================================================
--- ofbiz/branches/release15.12/LICENSE (original)
+++ ofbiz/branches/release15.12/LICENSE Wed Feb 10 15:00:24 2016
@@ -73,7 +73,7 @@ framework/base/lib/j2eespecs/servlet-api
 framework/base/lib/owasp-java-html-sanitizer-r239.jar
 framework/base/lib/scripting/bsf-2.4.0.jar
 framework/base/lib/scripting/jakarta-oro-2.0.8.jar
-framework/base/lib/scripting/groovy-all-2.2.1.jar
+framework/base/lib/scripting/groovy-all-2.4.5.jar
 framework/base/lib/scripting/jansi-1.2.1.jar
 framework/base/lib/xmlrpc-client-3.1.2.jar
 framework/base/lib/xmlrpc-common-3.1.2.jar

Modified: ofbiz/branches/release15.12/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy?rev=1729615&r1=1729614&r2=1729615&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy (original)
+++ ofbiz/branches/release15.12/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy Wed Feb 10 15:00:24 2016
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+@BaseScript(org.ofbiz.service.engine.GroovyBaseScript)
+import groovy.transform.BaseScript
 import org.ofbiz.base.util.*;
 
 //partyAcctgPrefAndGroupList

Modified: ofbiz/branches/release15.12/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/macros.xml?rev=1729615&r1=1729614&r2=1729615&view=diff
==============================================================================
--- ofbiz/branches/release15.12/macros.xml (original)
+++ ofbiz/branches/release15.12/macros.xml Wed Feb 10 15:00:24 2016
@@ -48,7 +48,7 @@ under the License.
  <patternset id="src.exc.set"/>
 
  <path id="groovy.class.path">
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.2.1.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.4.5.jar"/>
  </path>
  <path id="rhino.class.path">
   <pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/>

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy?rev=1729615&r1=1729614&r2=1729615&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy Wed Feb 10 15:00:24 2016
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+@BaseScript(org.ofbiz.service.engine.GroovyBaseScript)
+import groovy.transform.BaseScript
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.*;