Re: svn commit: r1425252 - in /ofbiz/branches/release11.04: ./ applications/accounting/data/A
Locked
Re: svn commit: r1425252 - in /ofbiz/branches/release11.04: ./ applications/accounting/data/A
 
|
There was no need to backport this to R11. The name was fine before the
Mini-language overhaul. -Adrian On 12/22/2012 7:19 AM, [hidden email] wrote: > Author: jleroux > Date: Sat Dec 22 07:19:08 2012 > New Revision: 1425252 > > URL: http://svn.apache.org/viewvc?rev=1425252&view=rev > Log: > "Applied fix from trunk for revision: 1425155 " > ------------------------------------------------------------------------ > r1425155 | jleroux | 2012-12-21 22:41:05 +0100 (ven., 21 déc. 2012) | 7 lines > > A patch from Carsten Schinzer for "non facet valid method name in OrderServices.xml#orderSequence-enforced" https://issues.apache.org/jira/browse/OFBIZ-5106 > > Error message in the error.log is as follows: > XmlFileLoader: File file:/usr/local/ofbiz-tr-mt12.5/applications/order/script/org/ofbiz/order/order/OrderServices.xml process error. Line: 530. Error message: cvc-pattern-valid: Value 'orderSequence-enforced' is not facet-valid with respect to pattern '[a-zA-Z_]{1}[a-zA-Z0-9_$.]+' for type 'javaClassName'. > > Changes all occurrencies of 'orderSequence-enforced' to 'orderSequence_enforced' as only underscore dashed are allowed by the cvc pattern. > > ------------------------------------------------------------------------ > > Modified: > ofbiz/branches/release11.04/ (props changed) > ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml > ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml > ofbiz/branches/release11.04/applications/order/servicedef/services.xml > > Propchange: ofbiz/branches/release11.04/ > ------------------------------------------------------------------------------ > Merged /ofbiz/trunk:r1425155 > > Modified: ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml?rev=1425252&r1=1425251&r2=1425252&view=diff > ============================================================================== > --- ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml (original) > +++ ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml Sat Dec 22 07:19:08 2012 > @@ -951,7 +951,7 @@ under the License. > <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> > <!-- order sequencing mode for accounting preferences --> > <CustomMethodType customMethodTypeId="ORDER_HOOK" parentTypeId="HOOK" hasTable="N" description="Order Sequence methods"/> > - <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> > + <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence_enforced" description="Enforced Sequence (no gaps, per organization)"/> > <!-- Deprecated sequencing mode by enumeration --> > <EnumerationType description="Invoice Sequence Mode" enumTypeId="INVOICE_SEQMD" hasTable="N" parentTypeId=""/> > <Enumeration description="Standard (faster, may have gaps, per system)" enumCode="STANDARD" enumId="INVSQ_STANDARD" sequenceId="01" enumTypeId="INVOICE_SEQMD"/> > > Modified: ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1425252&r1=1425251&r2=1425252&view=diff > ============================================================================== > --- ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) > +++ ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml Sat Dec 22 07:19:08 2012 > @@ -492,7 +492,7 @@ under the License. > <set field="customMethodName" from-field="customMethod.customMethodName"/> > <else><!-- retreive service from deprecated enumeration --> > <if-compare operator="equals" value="ODRSQ_ENF_SEQ" field="partyAcctgPreference.oldOrderSequenceEnumId"> > - <set field="customMethodName" value="orderSequence-enforced"/> > + <set field="customMethodName" value="orderSequence_enforced"/> > </if-compare> > </else> > </if-not-empty> > @@ -527,7 +527,7 @@ under the License. > <field-to-result field="orderId" result-name="orderId"/> > </simple-method> > > - <simple-method method-name="orderSequence-enforced" short-description="Enforced Sequence (no gaps, per organization)"> > + <simple-method method-name="orderSequence_enforced" short-description="Enforced Sequence (no gaps, per organization)"> > <log level="info" message="In getNextOrderId sequence enum Enforced"/> > <set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/> > <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom --> > > Modified: ofbiz/branches/release11.04/applications/order/servicedef/services.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/servicedef/services.xml?rev=1425252&r1=1425251&r2=1425252&view=diff > ============================================================================== > --- ofbiz/branches/release11.04/applications/order/servicedef/services.xml (original) > +++ ofbiz/branches/release11.04/applications/order/servicedef/services.xml Sat Dec 22 07:19:08 2012 > @@ -654,8 +654,8 @@ under the License. > <attribute name="orderId" type="String" mode="OUT" optional="false"/> > </service> > > - <service name="orderSequence-enforced" engine="simple" > - location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="orderSequence-enforced"> > + <service name="orderSequence_enforced" engine="simple" > + location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="orderSequence_enforced"> > <implements service="getNextOrderId"/> > <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/> > <override name="orderId" type="Long" mode="OUT"/> > > |
Re: svn commit: r1425252 - in /ofbiz/branches/release11.04: ./ applications/accounting/data/A
Administrator
|
Thanks for the info,
I let it like that now, don't hurt anyway Jacques From: "Adrian Crum" <[hidden email]> > There was no need to backport this to R11. The name was fine before the > Mini-language overhaul. > > -Adrian > > On 12/22/2012 7:19 AM, [hidden email] wrote: >> Author: jleroux >> Date: Sat Dec 22 07:19:08 2012 >> New Revision: 1425252 >> >> URL: http://svn.apache.org/viewvc?rev=1425252&view=rev >> Log: >> "Applied fix from trunk for revision: 1425155 " >> ------------------------------------------------------------------------ >> r1425155 | jleroux | 2012-12-21 22:41:05 +0100 (ven., 21 déc. 2012) | 7 lines >> >> A patch from Carsten Schinzer for "non facet valid method name in OrderServices.xml#orderSequence-enforced" https://issues.apache.org/jira/browse/OFBIZ-5106 >> >> Error message in the error.log is as follows: >> XmlFileLoader: File file:/usr/local/ofbiz-tr-mt12.5/applications/order/script/org/ofbiz/order/order/OrderServices.xml process error. Line: 530. Error message: cvc-pattern-valid: Value 'orderSequence-enforced' is not facet-valid with respect to pattern '[a-zA-Z_]{1}[a-zA-Z0-9_$.]+' for type 'javaClassName'. >> >> Changes all occurrencies of 'orderSequence-enforced' to 'orderSequence_enforced' as only underscore dashed are allowed by the cvc pattern. >> >> ------------------------------------------------------------------------ >> >> Modified: >> ofbiz/branches/release11.04/ (props changed) >> ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml >> ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml >> ofbiz/branches/release11.04/applications/order/servicedef/services.xml >> >> Propchange: ofbiz/branches/release11.04/ >> ------------------------------------------------------------------------------ >> Merged /ofbiz/trunk:r1425155 >> >> Modified: ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml >> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml?rev=1425252&r1=1425251&r2=1425252&view=diff >> ============================================================================== >> --- ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml (original) >> +++ ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml Sat Dec 22 07:19:08 2012 >> @@ -951,7 +951,7 @@ under the License. >> <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> >> <!-- order sequencing mode for accounting preferences --> >> <CustomMethodType customMethodTypeId="ORDER_HOOK" parentTypeId="HOOK" hasTable="N" description="Order Sequence methods"/> >> - <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> >> + <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence_enforced" description="Enforced Sequence (no gaps, per organization)"/> >> <!-- Deprecated sequencing mode by enumeration --> >> <EnumerationType description="Invoice Sequence Mode" enumTypeId="INVOICE_SEQMD" hasTable="N" parentTypeId=""/> >> <Enumeration description="Standard (faster, may have gaps, per system)" enumCode="STANDARD" enumId="INVSQ_STANDARD" sequenceId="01" enumTypeId="INVOICE_SEQMD"/> >> >> Modified: ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml >> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1425252&r1=1425251&r2=1425252&view=diff >> ============================================================================== >> --- ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) >> +++ ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml Sat Dec 22 07:19:08 2012 >> @@ -492,7 +492,7 @@ under the License. >> <set field="customMethodName" from-field="customMethod.customMethodName"/> >> <else><!-- retreive service from deprecated enumeration --> >> <if-compare operator="equals" value="ODRSQ_ENF_SEQ" field="partyAcctgPreference.oldOrderSequenceEnumId"> >> - <set field="customMethodName" value="orderSequence-enforced"/> >> + <set field="customMethodName" value="orderSequence_enforced"/> >> </if-compare> >> </else> >> </if-not-empty> >> @@ -527,7 +527,7 @@ under the License. >> <field-to-result field="orderId" result-name="orderId"/> >> </simple-method> >> >> - <simple-method method-name="orderSequence-enforced" short-description="Enforced Sequence (no gaps, per organization)"> >> + <simple-method method-name="orderSequence_enforced" short-description="Enforced Sequence (no gaps, per organization)"> >> <log level="info" message="In getNextOrderId sequence enum Enforced"/> >> <set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/> >> <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom --> >> >> Modified: ofbiz/branches/release11.04/applications/order/servicedef/services.xml >> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/servicedef/services.xml?rev=1425252&r1=1425251&r2=1425252&view=diff >> ============================================================================== >> --- ofbiz/branches/release11.04/applications/order/servicedef/services.xml (original) >> +++ ofbiz/branches/release11.04/applications/order/servicedef/services.xml Sat Dec 22 07:19:08 2012 >> @@ -654,8 +654,8 @@ under the License. >> <attribute name="orderId" type="String" mode="OUT" optional="false"/> >> </service> >> >> - <service name="orderSequence-enforced" engine="simple" >> - location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="orderSequence-enforced"> >> + <service name="orderSequence_enforced" engine="simple" >> + location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="orderSequence_enforced"> >> <implements service="getNextOrderId"/> >> <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/> >> <override name="orderId" type="Long" mode="OUT"/> >> >> > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |