You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by da...@apache.org on 2021/09/27 09:27:00 UTC
[ofbiz-framework] branch OFBIZ-12274-ftl-with-args updated (440af94
-> dec562d)
This is an automated email from the ASF dual-hosted git repository.
danwatford pushed a change to branch OFBIZ-12274-ftl-with-args
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
from 440af94 Improved: Use FTL with_args on macro calls (OFBIZ-12274)
add 1d2902b Improved: Add theme orientation color on Helveticus (OFBIZ-12288)
add 4fe5ded Documented: give some information on how to quickly override security in content
add 8b5bd93 Fixed: Use platform specific failed on CompoundWidget (OFBIZ-12283)
add c5a1a91 Fixed: Correct checkstyle typo
add 4e0ed1e Fixed: Static initialization vectors for encryption (OFBIZ-12281)
add 4f14cb9 Fixed: Use platform specific failed on CompoundWidget (OFBIZ-12283)
add 064c956 Fixed: bug on button from catalog to party associated (OFBIZ-12289)
add 139ae27 Update services_ledger.xml (#315)
add 36c489f Improved: Adds missing ASL2 headers in Helveticus less files
add de4213f Improved: Add description for all color orientation on Helveticus theme (OFBIZ-12288)
add 2aa68dc Fixed: UserLoginHistory failed the store operation with large password (OFBIZ-12287)
add 7f065bc Fixed: Wrong uploaded file checked in Image Management (OFBIZ-12297)
add c6c9b46 Fixed: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add e6b16a5 Fixed: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 59ef7a4 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 1459e1f Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 55fa3d1 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 9708d22 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 42ce0f6 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 13d6bc2 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add f6a0acb Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 4cedb51 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add cdf7d23 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 9ad9cd6 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 4d3039c Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 46433e8 Improved: Fix issues reported by SonarQube analysis on Github (OFBIZ-12284)
add 6addbdc Implemented: Convert WorkEffort relation screen to dynamic Compound (OFBIZ-12292) (#318)
add 54acc03 Fixed: SecuredUpload::isValidTextFile wrong check with uppercase (OFBIZ-12301)
add 25c75e2 Implemented: Clojure Service engine (OFBIZ-12302) (#317)
add 3dd89a5 Fixed: Fix checkstyle issue
add 2525377 Improved: switch link from Nabble (no longer reachable) to Markmail
add 3fb6b40 Fixed: Clean groovy file FindLookUp No functional change : * remove case syntax * use groovy syntax (excepted on executeResult.listIt, EntityListIterator not support the groovy syntax *if (!listIt)*) * use Elvis operator for default values * add typage to help ide and compilation
add bdd5673 Fixed: Clean groovy file ContentServices.groovy No functional change : * remove case syntax * use OFBiz dsl * condense map creation, entityCondition by builder * add typage to help ide and compilation
add 92d3625 Fixed: remove unnecessary quote on groovy map
add a37d5cc Fixed: Jgrowl label are not well retrieved showing 'undefined' button (OFBIZ-12299)
add 70ea85c Fixed: move crud QuoteTerm services to services_quote.xml
add fe542cf Improved: Tooltips overload labels (OFBIZ-12277)
add 3b593f8 Improved: Propage product features from a marketing package (OFBIZ-12077)
add 5d3d394 Documented: Changes the link to issue tracker (Jira) to simplify things related to security
add 3bfb03e Fixed: CVE-2021-37608 vulnerability bypass (OFBIZ-12307)
add 9ea7c6d Fixed: CVE-2021-37608 vulnerability bypass (OFBIZ-12307)
add 26a9dc7 Implemented: Rendering widget screen from ftl with the current context (OFBIZ-12310)
add a83faaf Fixed: Rendering widget screen from ftl with the current context : java doc generation error (OFBIZ-12310)
add ad1e06b Improved: Update build.gradle to the latest dependencies (OFBIZ-12311)
add 192a3b7 Fixed: Setup instructions don't work (OFBIZ-12228)
add ab9ca12 Execute a callback with parameters from the request (OFBIZ-12262)
add 4bb54a1 Improved: Improve login page for Helveticus Theme (OFBIZ-12313)
add fa3e357 Improved: Improve run test from artefact info (OFBIZ-12312)
add 7d40e07 Improved: Convert RoutingServices.xml mini-lang to groovy (OFBIZ-11855)
add de1e9e4 Improved: Convert ShoppingListServices.xml mini lang to groovy (OFBIZ-11602)
add 67665d1 Fixed: Found a new XXE (XML External Entity Injection) vulnerability in ArtifactInfo (OFBIZ-12306)
add 7a22a2b Fixed: Found a new XXE (XML External Entity Injection) vulnerability in EntityImport (OFBIZ-12304)
add 8d5dae6 Improved: Converted createPaymentFromOrder service from mini-lang to groovy DSL. (OFBIZ-11499)
add 7f0c5a7 Improved: Convert createPaymentApplication service from mini-lang to groovy DSL (OFBIZ-11481)
add 65e955b Fixed: No functional change, simplify a conditional
add dfb75fb Improved: Convert createSimpleTextContent service from mini-lang to groovy DSL (OFBIZ-11374)
add 46d53b5 Improved: Convert findAssocContent service from mini-lang to groovy DSL (OFBIZ-11369)
add 85c6220 Improved: Convert updateSimpleTextContent service from mini-lang to groovy DSL (OFBIZ-11375)
add 9c53861 Improved: Convert createPaymentAndPaymentGroupForInvoices service from mini-lang to groovy DSL (OFBIZ-11490)
add c97d9e7 Improved: Set Helveticus Theme as default (OFBIZ-12318)
add fcd2c0c Improved: Estimated shipping cost resolution with breaks on price and quantity (OFBIZ-6988)
add f82f763 Implemented: Groovy DSL add label method (OFBIZ-12319)
add 5bd3ccf Improved: Groovy DSL add success(Map) method (OFBIZ-12317)
add 73ec939 Fixed: Reformat PaymentServices.groovy
add f790b7a Implemented: Reintroduce groovy-test-suite test case (OFBIZ-12320)
add 052f347 Improved: Converted the setPaymentStatus service from XML to groovy DSL. (OFBIZ-11482)
add 7230aa8 Improved: Convert createMatchingPaymentApplication service from mini-lang to groovy DSL (OFBIZ-11500)
add 2ebf14e Improved: Convert SystemInfoServices.xml mini lang to groovy (OFBIZ-11919)
add 08f4995 Improved: Convert createPaymentGroupAndMember service from mini-lang to groovy DSL (OFBIZ-11493)
add b2d1161 Improved: Convert checkAndCreateBatchForValidPayments service from mini-lang to groovy DSL (OFBIZ-11497)
add a8afcff Improved: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)
add 71dbb3c Fixed: CVE-2021-37608 vulnerability bypass (OFBIZ-12307)
add 32cca8a Fixed: Groovy DSL failed to use 'run service' from an event call (OFBIZ-12322)
add 8548f3a Fixed: Remove unnecessary variable instanciation
add 4112f1c Improved: Convert createInvoiceItemPayrol service from mini-lang to groovy DSL (OFBIZ-11503)
add aa9caa1 Fixeded: Convert createInvoiceItemPayrol service from mini-lang to groovy DSL (OFBIZ-11503)
add 6a7f3cd Fixed: Groovy Program sandbox bypass (OFBIZ-12305)
add 5b1552c Improved: Convert ContentPermissionServices.xml mini lang to groovy (OFBIZ-11446)
add 976b63b Improved: Create a deny list to reject webshell tokens (OFBIZ-12324)
add 6c42384 Improved: Adds the HTML <input> accept Attribute in form widgets and Freemaker templates (OFBIZ-12049)
add c0f8783 Improved: Create a deny list to reject webshell tokens (OFBIZ-12324)
add 3cea95f Create a deny list to reject webshell tokens (OFBIZ-12324)
add dfc05ed Improved: Remove Docbook parts now useless since Ascidoc is used for online help (OFBIZ-12327)
add dec562d Merge remote-tracking branch 'origin/trunk' into OFBIZ-12274-ftl-with-args
No new revisions were added by this update.
Summary of changes:
README.adoc | 5 +-
.../groovyScripts/invoice/InvoiceEvents.groovy | 55 +
.../groovyScripts/invoice/InvoiceServices.groovy | 3 +-
.../groovyScripts/payment/PaymentServices.groovy | 928 +-
.../accounting/minilang/invoice/InvoiceEvents.xml | 60 -
.../minilang/payment/PaymentServices.xml | 665 -
.../accounting/servicedef/services_ledger.xml | 2 +-
.../accounting/servicedef/services_payment.xml | 33 +-
.../thirdparty/valuelink/ValueLinkApi.java | 142 +-
.../webapp/accounting/WEB-INF/controller.xml | 2 +-
.../ofbizsetup/SystemInfoServices.groovy | 104 +
.../commonext/minilang/SystemInfoServices.xml | 159 -
.../commonext/minilang/setup/SetupEvents.xml | 27 +-
applications/commonext/servicedef/services.xml | 24 +-
applications/content/dtd/docbook.dtd | 4199 -----
applications/content/dtd/docbook.xsd | 17458 -------------------
applications/content/dtd/docbookx.dtd | 170 -
applications/content/dtd/xlink.xsd | 32 -
.../groovyScripts/content/ContentServices.groovy | 419 +-
.../permission/ContentPermissionServices.groovy | 590 +
.../content/minilang/content/ContentServices.xml | 55 -
.../permission/ContentPermissionServices.xml | 821 -
.../permission/DataResourcePermissionServices.xml | 3 +-
applications/content/servicedef/services.xml | 46 +-
.../content/src/docs/asciidoc/content.adoc | 13 +
.../apache/ofbiz/content/data/DataServices.java | 27 +-
.../datamodel/data/demo/AccountingDemoData.xml | 1464 --
.../datamodel/data/demo/GlAccountDemoData.xml | 1484 ++
applications/datamodel/ofbiz-component.xml | 1 +
.../groovyScripts/routing/RoutingServices.groovy | 128 +
.../minilang/routing/RoutingServices.xml | 131 -
.../manufacturing/servicedef/services_routing.xml | 8 +-
.../shoppinglist/ShoppingListServices.groovy | 332 +
.../minilang/shoppinglist/ShoppingListServices.xml | 364 -
applications/order/servicedef/services.xml | 22 -
applications/order/servicedef/services_quote.xml | 24 +-
.../order/servicedef/services_shoppinglist.xml | 40 +-
.../apache/ofbiz/order/order/OrderReadHelper.java | 8 +-
.../ofbiz/order/shoppingcart/ShoppingCartItem.java | 12 +-
.../order/template/order/AddOrderAttachments.ftl | 2 +-
.../party/groovyScripts/party/FindLookUp.groovy | 50 +-
.../party/template/party/AddressMatchMap.ftl | 12 +-
.../party/template/party/EditContactMech.ftl | 4 +-
.../apache/ofbiz/shipment/ShipmentCostTests.groovy | 378 +
.../ofbiz/product/imagemanagement/FrameImage.java | 14 +-
.../imagemanagement/ImageManagementServices.java | 41 +-
.../ofbiz/product/product/ProductServices.java | 21 +-
.../ofbiz/product/product/ProductWorker.java | 31 +
.../ofbiz/shipment/shipment/ShipmentServices.java | 366 +-
.../product/template/category/EditCategory.ftl | 2 +-
.../config/EditProductConfigItemContent.ftl | 2 +-
.../template/imagemanagement/AddMultipleImages.ftl | 20 +-
.../template/product/AddAdditionalImages.ftl | 6 +-
.../template/product/EditProductContent.ftl | 2 +-
applications/product/testdef/FacilityTest.xml | 5 +
.../product/testdef/data/ShipmentCostTestData.xml | 108 +
.../product/widget/catalog/ProdCatalogForms.xml | 2 +-
applications/workeffort/servicedef/services.xml | 18 +-
.../webapp/workeffort/WEB-INF/controller.xml | 414 +-
.../workeffort/WEB-INF/workeffort-controller.xml | 46 +
applications/workeffort/widget/CommonScreens.xml | 25 +-
applications/workeffort/widget/WorkEffortForms.xml | 870 +-
.../widget/WorkEffortOrderHeaderForms.xml | 55 -
.../widget/WorkEffortPartyAssignForms.xml | 131 -
.../workeffort/widget/WorkEffortQuoteForms.xml | 94 -
.../widget/WorkEffortRelatedSummaryScreens.xml | 19 +-
.../workeffort/widget/WorkEffortRequestForms.xml | 88 -
.../widget/WorkEffortRequirementForms.xml | 67 -
.../workeffort/widget/WorkEffortScreens.xml | 195 +-
.../workeffort/widget/WorkEffortShopListForms.xml | 53 -
.../widget/workeffort/WorkEffortAgreementCpd.xml | 143 +
.../widget/workeffort/WorkEffortAttributeCpd.xml | 142 +
.../widget/workeffort/WorkEffortCommEventCpd.xml | 238 +
.../widget/workeffort/WorkEffortContactMechCpd.xml | 142 +
.../widget/workeffort/WorkEffortContentsCpd.xml | 161 +
.../workeffort/widget/workeffort/WorkEffortCpd.xml | 287 +
.../workeffort/WorkEffortEventRemindersCpd.xml | 164 +
.../widget/workeffort/WorkEffortFixedAssetCpd.xml | 176 +
.../workeffort/WorkEffortGoodStandardsCpd.xml | 196 +
.../widget/workeffort/WorkEffortKeywordsCpd.xml | 133 +
.../widget/workeffort/WorkEffortNotesCpd.xml | 171 +
.../widget/workeffort/WorkEffortOrdersCpd.xml | 143 +
.../widget/workeffort/WorkEffortPartyAssignCpd.xml | 205 +
.../widget/workeffort/WorkEffortQuotesCpd.xml | 249 +
.../widget/workeffort/WorkEffortRateAssignCpd.xml | 170 +
.../workeffort/WorkEffortRequestAndItemCpd.xml | 257 +
.../workeffort/WorkEffortRequirementsCpd.xml | 211 +
.../widget/workeffort/WorkEffortReviewsCpd.xml | 167 +
.../widget/workeffort/WorkEffortShopListCpd.xml | 142 +
.../widget/workeffort/WorkEffortTimeEntriesCpd.xml | 254 +
build.gradle | 64 +-
.../base/groovyScripts/test/SimpleTests.groovy | 40 +-
.../org/apache/ofbiz/base/crypto/DesCrypt.java | 2 -
.../org/apache/ofbiz/base/util/UtilNumber.java | 24 +
.../java/org/apache/ofbiz/base/util/UtilURL.java | 2 +-
.../org/apache/ofbiz/base/util/UtilValidate.java | 18 +-
.../java/org/apache/ofbiz/base/util/UtilXml.java | 2 +-
framework/base/testdef/basetests.xml | 2 +-
framework/common/config/CommonEntityLabels.xml | 18 +-
framework/common/config/CommonUiLabels.xml | 4 +
framework/common/config/general.properties | 2 +-
framework/common/data/CommonTypeData.xml | 3 +-
framework/common/servicedef/services.xml | 6 +-
framework/common/servicedef/services_test.xml | 7 +
.../apache/ofbiz/common/login/LoginServices.java | 31 +-
.../org/apache/ofbiz/common/clojure_test.clj | 51 +
framework/entity/config/entityengine.xml | 2 +-
framework/security/config/security.properties | 15 +-
.../org/apache/ofbiz/security/SecuredUpload.java | 99 +-
.../apache/ofbiz/security/SecurityUtilTest.java | 47 +
framework/service/config/serviceengine.xml | 1 +
.../ofbiz/service/engine/GroovyBaseScript.groovy | 54 +-
.../service/engine/StandardClojureEngine.java | 140 +
.../ofbiz/service/test/ServiceEngineTests.java | 10 +
framework/testtools/dtd/test-suite.xsd | 22 +
.../ofbiz/testtools/GroovyScriptTestCase.java} | 47 +-
.../org/apache/ofbiz/testtools/ModelTestSuite.java | 18 +
.../ofbiz/webapp/ftl/OfbizScreenTransform.java | 149 +
.../ofbiz/webapp/freemarkerTransforms.properties | 1 +
.../groovyScripts/artifactinfo/ArtifactInfo.groovy | 10 +-
.../artifactinfo/TestSuiteInfo.groovy | 31 +-
.../artifactinfo/TestSuiteResults.groovy | 66 +
.../groovyScripts/entity/ProgramExport.groovy | 8 +-
.../apache/ofbiz/webtools/WebToolsServices.java | 5 +
.../ofbiz/webtools/artifactinfo/RunTestEvents.java | 23 +-
framework/webtools/template/Main.ftl | 2 +-
.../webtools/template/entity/ModelInduceFromDb.jsp | 4 +-
.../webapp/webtools/WEB-INF/controller.xml | 15 +-
framework/webtools/widget/ArtifactInfoForms.xml | 34 +-
framework/webtools/widget/ArtifactInfoScreens.xml | 8 +-
framework/widget/dtd/widget-common.xsd | 7 +
.../ofbiz/widget/model/CommonWidgetModels.java | 6 +
.../org/apache/ofbiz/widget/model/HtmlWidget.java | 53 +-
themes/bluelight/webapp/bluelight/docbook.css | 350 -
themes/bluelight/widget/Theme.xml | 3 +-
.../common/js/plugins/date/FromThruDateCheck.js | 12 +-
.../webapp/common/js/util/OfbizUtil.js | 170 +-
.../webapp/common/js/util/application.js | 2 +-
.../webapp/common/js/util/fieldlookup.js | 2 -
themes/flatgrey/webapp/flatgrey/docbook.css | 351 -
themes/flatgrey/webapp/flatgrey/style.css | 18 +-
themes/flatgrey/widget/Theme.xml | 3 +-
themes/helveticus/data/HelveticusThemeData.xml | 5 +-
themes/helveticus/template/ForgotPassword.ftl | 77 +-
themes/helveticus/template/Login.ftl | 62 +-
themes/helveticus/template/includes/TopAppBar.ftl | 8 +
.../macro/HtmlFormMacroLibrary.ftl} | 17 +-
themes/helveticus/webapp/helveticus/docbook.css | 350 -
.../webapp/helveticus/helveticus-amber.less} | 29 +-
.../webapp/helveticus/helveticus-emerald.less} | 29 +-
.../webapp/helveticus/helveticus-main-theme.less | 370 +-
.../webapp/helveticus/helveticus-ruby.less} | 29 +-
.../webapp/helveticus/helveticus-saphir.less} | 29 +-
.../helveticus/webapp/helveticus/helveticus.less | 54 +-
.../webapp/helveticus/images/themeHelveticus.png | Bin 127072 -> 0 bytes
.../helveticus/images/themeHelveticus_amber.png | Bin 0 -> 95633 bytes
.../helveticus/images/themeHelveticus_emerald.png | Bin 0 -> 101992 bytes
.../helveticus/images/themeHelveticus_ruby.png | Bin 0 -> 100522 bytes
.../helveticus/images/themeHelveticus_saphir.png | Bin 0 -> 101749 bytes
themes/helveticus/webapp/helveticus/javascript.css | 8 +-
.../helveticus/webapp/helveticus/js/OfbizUtil.js | 55 +
.../helveticus/webapp/helveticus/js/helveticus.js | 27 +-
themes/helveticus/widget/Theme.xml | 23 +-
.../rainbowstone/webapp/rainbowstone/docbook.css | 350 -
.../webapp/rainbowstone/rainbowstone-amber.less | 22 +-
.../webapp/rainbowstone/rainbowstone-emerald.less | 22 +-
.../rainbowstone/rainbowstone-main-theme.less | 301 +-
.../webapp/rainbowstone/rainbowstone-ruby.less | 22 +-
.../webapp/rainbowstone/rainbowstone-saphir.less | 22 +-
themes/rainbowstone/webapp/rainbowstone/style.css | 2 +-
themes/rainbowstone/widget/Theme.xml | 3 +-
themes/tomahawk/webapp/tomahawk/css/docbook.css | 351 -
themes/tomahawk/webapp/tomahawk/css/stylertl.css | 2 +-
themes/tomahawk/widget/Theme.xml | 3 +-
174 files changed, 10351 insertions(+), 30937 deletions(-)
create mode 100644 applications/accounting/groovyScripts/invoice/InvoiceEvents.groovy
delete mode 100644 applications/accounting/minilang/invoice/InvoiceEvents.xml
delete mode 100644 applications/accounting/minilang/payment/PaymentServices.xml
create mode 100644 applications/commonext/groovyScripts/ofbizsetup/SystemInfoServices.groovy
delete mode 100644 applications/commonext/minilang/SystemInfoServices.xml
delete mode 100644 applications/content/dtd/docbook.dtd
delete mode 100644 applications/content/dtd/docbook.xsd
delete mode 100644 applications/content/dtd/docbookx.dtd
delete mode 100644 applications/content/dtd/xlink.xsd
create mode 100644 applications/content/groovyScripts/permission/ContentPermissionServices.groovy
delete mode 100644 applications/content/minilang/permission/ContentPermissionServices.xml
create mode 100644 applications/datamodel/data/demo/GlAccountDemoData.xml
create mode 100644 applications/manufacturing/groovyScripts/routing/RoutingServices.groovy
delete mode 100644 applications/manufacturing/minilang/routing/RoutingServices.xml
create mode 100644 applications/order/groovyScripts/shoppinglist/ShoppingListServices.groovy
delete mode 100644 applications/order/minilang/shoppinglist/ShoppingListServices.xml
create mode 100644 applications/product/src/main/groovy/org/apache/ofbiz/shipment/ShipmentCostTests.groovy
create mode 100644 applications/product/testdef/data/ShipmentCostTestData.xml
create mode 100644 applications/workeffort/webapp/workeffort/WEB-INF/workeffort-controller.xml
delete mode 100644 applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
delete mode 100644 applications/workeffort/widget/WorkEffortPartyAssignForms.xml
delete mode 100644 applications/workeffort/widget/WorkEffortQuoteForms.xml
delete mode 100644 applications/workeffort/widget/WorkEffortRequestForms.xml
delete mode 100644 applications/workeffort/widget/WorkEffortRequirementForms.xml
delete mode 100644 applications/workeffort/widget/WorkEffortShopListForms.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortAgreementCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortAttributeCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortCommEventCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortContactMechCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortContentsCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortEventRemindersCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortFixedAssetCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortGoodStandardsCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortKeywordsCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortNotesCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortOrdersCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortPartyAssignCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortQuotesCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortRateAssignCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortRequestAndItemCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortRequirementsCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortReviewsCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortShopListCpd.xml
create mode 100644 applications/workeffort/widget/workeffort/WorkEffortTimeEntriesCpd.xml
copy themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less => framework/base/groovyScripts/test/SimpleTests.groovy (61%)
create mode 100644 framework/common/src/main/resources/org/apache/ofbiz/common/clojure_test.clj
create mode 100644 framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardClojureEngine.java
copy framework/{service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTests.java => testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java} (50%)
create mode 100644 framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
create mode 100644 framework/webtools/groovyScripts/artifactinfo/TestSuiteResults.groovy
delete mode 100644 themes/bluelight/webapp/bluelight/docbook.css
delete mode 100644 themes/flatgrey/webapp/flatgrey/docbook.css
copy themes/helveticus/{data/HelveticusThemeData.xml => template/macro/HtmlFormMacroLibrary.ftl} (68%)
delete mode 100644 themes/helveticus/webapp/helveticus/docbook.css
copy themes/{rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less => helveticus/webapp/helveticus/helveticus-amber.less} (64%)
copy themes/{rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less => helveticus/webapp/helveticus/helveticus-emerald.less} (64%)
copy themes/{rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less => helveticus/webapp/helveticus/helveticus-ruby.less} (64%)
copy themes/{rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less => helveticus/webapp/helveticus/helveticus-saphir.less} (64%)
delete mode 100644 themes/helveticus/webapp/helveticus/images/themeHelveticus.png
create mode 100644 themes/helveticus/webapp/helveticus/images/themeHelveticus_amber.png
create mode 100644 themes/helveticus/webapp/helveticus/images/themeHelveticus_emerald.png
create mode 100644 themes/helveticus/webapp/helveticus/images/themeHelveticus_ruby.png
create mode 100644 themes/helveticus/webapp/helveticus/images/themeHelveticus_saphir.png
create mode 100644 themes/helveticus/webapp/helveticus/js/OfbizUtil.js
delete mode 100644 themes/rainbowstone/webapp/rainbowstone/docbook.css
delete mode 100644 themes/tomahawk/webapp/tomahawk/css/docbook.css