You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/09/17 06:34:20 UTC

svn commit: r1867039 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc

Author: jleroux
Date: Tue Sep 17 06:34:20 2019
New Revision: 1867039

URL: http://svn.apache.org/viewvc?rev=1867039&view=rev
Log:
"Applied fix from trunk for revision: 1867038" 
------------------------------------------------------------------------
r1867038 | jleroux | 2019-09-17 08:32:20 +0200 (mar. 17 sept. 2019) | 11 lignes

Documented: 
Got this error with Eclipse Asciidoctor editor plugin

>> rendering:-273312131_hidden-editorfile_developer-manual.adoc
asciidoctor: WARNING: C:/projectsASF/ofbiz/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc: line 473: unterminated listing block
asciidoctor: WARNING: C:/projectsASF/ofbiz/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc: line 511: unterminated listing block

This fixes it



------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 17 06:34:20 2019
@@ -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:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367,1865370,1865811,1865820,1865852,1865883,1865891,1865924,1866259,1866519,1866834,1866890,1866920,1866986
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367,1865370,1865811,1865820,1865852,1865883,1865891,1865924,1866259,1866519,1866834,1866890,1866920,1866986,1867038

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc?rev=1867039&r1=1867038&r2=1867039&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc Tue Sep 17 06:34:20 2019
@@ -205,6 +205,7 @@ a|[source,xml]
 --
 <if-empty field="fieldName"></if-empty>
 --
+
 a|[source,groovy]
 --
  //checks if fieldName is existent and/or empty
@@ -215,6 +216,7 @@ a|[source,xml]
 --
 <if-empty field="fieldName.property"></if-empty>
 --
+
 a|[source,groovy]
 --
  // fieldName has to be existent, property doesn't need to
@@ -245,6 +247,7 @@ a|[source,xml]
     </else>
 </if>
 --
+
 a|[source,groovy]
 --
 if (!field1 \|\| !field2) {
@@ -260,6 +263,7 @@ a|[source,xml]
     <!-- code -->
 </if-compare-field>
 --
+
 a|[source,groovy]
 --
  // this will even work, if product is not existent or null
@@ -272,10 +276,12 @@ a|[source,xml]
 --
 <if-instance-of field="parameters.categories" class="java.util.List"></if-instance-of>
 --
+
 a|[source,groovy]
 --
 if (parameters.categories instanceof java.util.List) {}
 --
+
 |===
 == Setting Fields
 |===
@@ -285,6 +291,7 @@ a|[source,xml]
 --
 <set field="fieldName" value="value"/>
 --
+
 a|[source,groovy]
 --
  // if fieldName is not initialized
@@ -299,6 +306,7 @@ a|[source,xml]
 <set field="otherFieldName.otherProperty" value="true" type="Boolean"/>
 <set field="otherFieldName.otherProperty" from-field="parameters.property/>
 --
+
 a|[source,groovy]
 --
  // if otherFieldName is not yet initialized, you have to do it first
@@ -321,6 +329,7 @@ a|[source,xml]
 --
 <set field="thisFieldName" value="${groovy: []}" type="List"/>
 --
+
 a|[source,groovy]
 --
  // this is easier in Groovy
@@ -333,6 +342,7 @@ a|[source,xml]
 <!-- there are different cases of this, which are not distinguished in MiniLang -->
 <property-to-field resource="general.properties" property="currency.uom.id.default" field="parameters.rateCurrencyUomId"/>
 --
+
 a|[source,groovy]
 --
 String failMessage = UtilProperties.getMessage("CommonUiLabels", "CommonGenericPermissionError", parameters.locale)
@@ -344,6 +354,7 @@ a|[source,xml]
 --
 <clear-field field="product.primaryProductCategoryId"/>
 --
+
 a|[source,groovy]
 --
 product.primaryProductCategoryId = null
@@ -361,6 +372,7 @@ a|[source,xml]
     <result-to-field result-name="categories" field="resCategories"/>
 </call-service>
 --
+
 a|[source,groovy]
 --
 def relatedCategoryContext = [parentProductCategoryId: defaultTopCategoryId]
@@ -377,11 +389,13 @@ a|[source,xml]
     <results-to-map map-name="genericResult"/>
 </call-service>
 --
+
 a|[source,groovy]
 --
  // instead of setting the service fields from parameters, it is possible to run the service with the parameters map
 Map genericResult = run service: "productCategoryGenericPermission", with: parameters
 --
+
 |===
 == Preparing Service Results
 |===
@@ -391,6 +405,7 @@ a|[source,xml]
 --
 <field-to-result field="fieldBudgetId" result-name="budgetId"/>
 --
+
 a|[source,groovy]
 --
  // MiniLang knows this implicitly
@@ -409,6 +424,7 @@ a|[source,xml]
 <set-nonpk-fields map="parameters" value-field="newEntity"/>
 <set-pk-fields map="parameters" value-field="newEntity"/>
 --
+
 a|[source,groovy]
 --
  // this is the easy way
@@ -426,6 +442,7 @@ a|[source,xml]
     <order-by field-name="-statusDate"/>
 </entity-and>
 --
+
 a|[source,groovy]
 --
  // this can also be done in one line, but it can easily become unreadable
@@ -444,6 +461,7 @@ a|[source,xml]
 <!-- entity-one can be called without child elements, too -->
 <entity-one entity-name="Product" value-field="product" auto-field-map="true"/>
 --
+
 a|[source,groovy]
 --
  // MiniLang has false set for useCache as the default value
@@ -460,6 +478,7 @@ a|[source,xml]
 --
 <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/>
 --
+
 a|[source,groovy]
 --
 GenericValue lookedUpValue = findOne("ProductCategoryMember", lookupPKMap, false)
@@ -488,6 +507,8 @@ a|[source,xml]
         </condition-list>
     </condition-list>
 </entity-condition>
+-- 
+
 a|[source,groovy]
 --
  // the Groovy methods use the "and" and "equals" operator as default values
@@ -516,6 +537,8 @@ a|[source,xml]
 <set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/>
 <set field="newLimitRollup.parentProductCategoryId" from-field="productCategoryRole.productCategoryId"/>
 <set field="newLimitRollup.fromDate" from-field="nowTimestamp"/>
+--
+
 a|[source,groovy]
 --
 def newEntity = makeValue("FinAccountTrans", parameters)