svn commit: r1835238 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/product/config/freemarkerTransforms.properties framework/webapp/config/freemarkerTransforms.properties

[Deepak Dixit-5]

Author: deepak
Date: Fri Jul  6 11:51:24 2018
New Revision: 1835238

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

Fixed: Framework webapp freemarkerTransform.properties has dependency on proudct component
(OFBIZ-10463)

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/freemarkerTransforms.properties
    ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/config/freemarkerTransforms.properties

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul  6 11:51:24 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/freemarkerTransforms.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/freemarkerTransforms.properties?rev=1835238&r1=1835237&r2=1835238&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/freemarkerTransforms.properties (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/freemarkerTransforms.properties Fri Jul  6 11:51:24 2018
@@ -25,4 +25,5 @@
 #ofbizCatalogUrl=org.apache.ofbiz.product.category.ftl.CatalogUrlDirective
 ofbizCatalogAltUrl=org.apache.ofbiz.product.category.ftl.CatalogAltUrlSeoTransform
 ofbizCatalogUrl=org.apache.ofbiz.product.category.ftl.CatalogUrlSeoTransform
+ofbizUrl=org.apache.ofbiz.product.category.ftl.UrlRegexpTransform
 

Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/config/freemarkerTransforms.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/config/freemarkerTransforms.properties?rev=1835238&r1=1835237&r2=1835238&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/config/freemarkerTransforms.properties (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/config/freemarkerTransforms.properties Fri Jul  6 11:51:24 2018
@@ -21,8 +21,7 @@
 
 # entries are in the form: key=transform name, property=transform class name
 
-#ofbizUrl=org.apache.ofbiz.webapp.ftl.OfbizUrlTransform
-ofbizUrl=org.apache.ofbiz.product.category.ftl.UrlRegexpTransform
+ofbizUrl=org.apache.ofbiz.webapp.ftl.OfbizUrlTransform
 ofbizContentUrl=org.apache.ofbiz.webapp.ftl.OfbizContentTransform
 ofbizCurrency=org.apache.ofbiz.webapp.ftl.OfbizCurrencyTransform
 ofbizAmount=org.apache.ofbiz.webapp.ftl.OfbizAmountTransform