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 2008/12/31 11:41:27 UTC
svn commit: r730370 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/content/script/org/ofbiz/content/content/
applications/order/script/org/ofbiz/o...
Author: jleroux
Date: Wed Dec 31 02:41:26 2008
New Revision: 730370
URL: http://svn.apache.org/viewvc?rev=730370&view=rev
Log:
<make-next-seq-id(.*)value-name => <make-next-seq-id$1value-field
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Wed Dec 31 02:41:26 2008
@@ -252,7 +252,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.invoiceItemSeqId">
- <make-next-seq-id value-name="newEntity" seq-field-name="invoiceItemSeqId"/> <!-- this finds the next sub-sequence ID -->
+ <make-next-seq-id value-field="newEntity" seq-field-name="invoiceItemSeqId"/> <!-- this finds the next sub-sequence ID -->
<field-to-result field="newEntity.invoiceItemSeqId" result-name="invoiceItemSeqId"/>
</if-empty>
<!-- if there is no amount and a productItem is supplied fill the amount(price) and description from the product record
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Wed Dec 31 02:41:26 2008
@@ -72,7 +72,7 @@
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
- <make-next-seq-id value-name="newEntity" seq-field-name="acctgTransEntrySeqId" numeric-padding="5"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="acctgTransEntrySeqId" numeric-padding="5"/>
<field-to-result field="newEntity.acctgTransEntrySeqId" result-name="acctgTransEntrySeqId"/>
<!-- if not explicitly provided in the parameters, set the currency of the entry from PartyAcctgPreference -->
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Wed Dec 31 02:41:26 2008
@@ -24,7 +24,7 @@
<set-pk-fields map="parameters" value-field="currentContent"/>
<set-nonpk-fields map="parameters" value-field="currentContent"/>
<if-empty field="currentContent.contentId">
- <make-next-seq-id seq-field-name="contentId" value-name="currentContent"/>
+ <make-next-seq-id seq-field-name="contentId" value-field="currentContent"/>
<sequenced-id field="id" sequence-name="Content"/>
<set field="currentContent.contentId" from-field="id"/>
</if-empty>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Wed Dec 31 02:41:26 2008
@@ -360,7 +360,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.contentPurposeTypeId">
- <make-next-seq-id seq-field-name="contentPurposeTypeId" value-name="newEntity"/>
+ <make-next-seq-id seq-field-name="contentPurposeTypeId" value-field="newEntity"/>
</if-empty>
<create-value value-field="newEntity"/>
<field-to-result map-name="newEntity" field="contentPurposeTypeId" />
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Wed Dec 31 02:41:26 2008
@@ -290,7 +290,7 @@
<set from-field="parameters.quoteItemSeqId" field="newEntity.quoteItemSeqId"/>
<if-empty field="newEntity.quoteItemSeqId">
<!-- create a non existing ID -->
- <make-next-seq-id value-name="newEntity" seq-field-name="quoteItemSeqId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="quoteItemSeqId"/>
<set from-field="quoteItemSeqId" field="newEntity.quoteItemSeqId"/>
</if-empty>
<field-to-result field="newEntity.quoteId" result-name="quoteId"/>
@@ -513,7 +513,7 @@
<sequenced-id sequence-name="Quote" field="quoteId"/>
<set from-field="quoteId" field="newQuote.quoteId"/>
<set from-field="quoteId" field="newQuoteItem.quoteId"/>
- <make-next-seq-id value-name="newQuoteItem" seq-field-name="quoteItemSeqId"/>
+ <make-next-seq-id value-field="newQuoteItem" seq-field-name="quoteItemSeqId"/>
<field-to-result field="quoteId" result-name="quoteId"/>
<field-to-result field="newQuoteItem.quoteItemSeqId" result-name="quoteItemSeqId"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Wed Dec 31 02:41:26 2008
@@ -125,7 +125,7 @@
</if-empty>
<make-value value-field="newEntity" entity-name="ShoppingListItem"/>
<set from-field="parameters.shoppingListId" field="newEntity.shoppingListId"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<field-to-result field="newEntity.shoppingListItemSeqId" result-name="shoppingListItemSeqId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Wed Dec 31 02:41:26 2008
@@ -671,7 +671,7 @@
<!-- don't set the fromDate yet; let's get the seq ID first -->
<if-empty field="parameters.linkSeqId">
- <make-next-seq-id value-name="newEntity" seq-field-name="linkSeqId"/> <!-- this finds the next sub-sequence ID -->
+ <make-next-seq-id value-field="newEntity" seq-field-name="linkSeqId"/> <!-- this finds the next sub-sequence ID -->
<set from-field="linkSeqId" field="newEntity.linkSeqId"/>
</if-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Wed Dec 31 02:41:26 2008
@@ -285,7 +285,7 @@
<make-value value-field="newEntity" entity-name="InventoryItemDetail"/>
<set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/>
- <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-name="newEntity" increment-by="1" numeric-padding="4"/> -->
+ <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-field="newEntity" increment-by="1" numeric-padding="4"/> -->
<sequenced-id sequence-name="InventoryItemDetail" field="newEntity.inventoryItemDetailSeqId"/>
<field-to-result field="newEntity.inventoryItemDetailSeqId" result-name="inventoryItemDetailSeqId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Wed Dec 31 02:41:26 2008
@@ -181,7 +181,7 @@
<make-value value-field="newEntity" entity-name="ProductPriceCond"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
<field-to-result field="productPriceCondSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
@@ -217,7 +217,7 @@
<make-value value-field="newEntity" entity-name="ProductPriceAction"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
<field-to-result field="productPriceActionSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Wed Dec 31 02:41:26 2008
@@ -764,7 +764,7 @@
<make-value value-field="newEntity" entity-name="ProductMaint"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="productMaintSeqId"/> <!-- this finds the next sub-sequence ID -->
+ <make-next-seq-id value-field="newEntity" seq-field-name="productMaintSeqId"/> <!-- this finds the next sub-sequence ID -->
<field-to-result field="newEntity.productMaintSeqId" result-name="productMaintSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Wed Dec 31 02:41:26 2008
@@ -83,7 +83,7 @@
<make-value value-field="newEntity" entity-name="ProductPromoAction"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
<field-to-result field="productPromoActionSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
@@ -252,7 +252,7 @@
<make-value value-field="newEntity" entity-name="ProductPromoCond"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
<field-to-result field="productPromoCondSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
@@ -322,7 +322,7 @@
<make-value value-field="newEntity" entity-name="ProductPromoRule"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
<field-to-result field="productPromoRuleId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Dec 31 02:41:26 2008
@@ -790,7 +790,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- if no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
- <make-next-seq-id value-name="newEntity" seq-field-name="shipmentItemSeqId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="shipmentItemSeqId"/>
<field-to-result field="shipmentItemSeqId" map-name="newEntity" result-name="shipmentItemSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -920,7 +920,7 @@
</if-compare>
<!-- if no shipmentPackageSeqId, generate one based on existing items, ie one greater than the current higher number -->
- <make-next-seq-id value-name="newEntity" seq-field-name="shipmentPackageSeqId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="shipmentPackageSeqId"/>
<field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
<now-timestamp field="newEntity.dateCreated"/>
@@ -1146,7 +1146,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- if no shipmentRouteSegmentSeqId, generate one based on existing items, ie one greater than the current higher number -->
- <make-next-seq-id value-name="newEntity" seq-field-name="shipmentRouteSegmentId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="shipmentRouteSegmentId"/>
<field-to-result field="shipmentRouteSegmentId" map-name="newEntity" result-name="shipmentRouteSegmentId"/>
<if-empty field="newEntity.carrierServiceStatusId">
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730370&r1=730369&r2=730370&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Wed Dec 31 02:41:26 2008
@@ -29,7 +29,7 @@
<set field="newEntity.portalPortletId" from-field="parameters.portalPortletId"/>
<set field="newEntity.portalPageId" from-field="parameters.newPortalPageId"/>
<set field="newEntity.columnNum" value="1"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="portletSeqId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="portletSeqId"/>
<create-value value-field="newEntity"/>
<check-errors/>
@@ -41,7 +41,7 @@
<simple-method method-name="addPortalPageColumn" short-description="Add a new Column to a PortalPage">
<make-value entity-name="PortalPageColumn" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="columnSeqId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="columnSeqId"/>
<field-to-result field="newEntity.columnSeqId" result-name="columnSeqId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -68,13 +68,13 @@
<simple-method method-name="createPortalPagePortlet" short-description="Add a registered PortalPortlet to a PortalPage">
<make-value entity-name="PortalPagePortlet" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <make-next-seq-id value-name="newEntity" seq-field-name="portletSeqId"/>
+ <make-next-seq-id value-field="newEntity" seq-field-name="portletSeqId"/>
<field-to-result field="newEntity.portletSeqId" result-name="portletSeqId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
<make-value entity-name="PortalPageColumn" value-field="newEntity1"/>
<set-pk-fields map="parameters" value-field="newEntity1"/>
- <make-next-seq-id value-name="newEntity1" seq-field-name="columnSeqId"/>
+ <make-next-seq-id value-field="newEntity1" seq-field-name="columnSeqId"/>
<create-value value-field="newEntity1"/>
</simple-method>
@@ -107,7 +107,7 @@
<simple-method method-name="createPortalPage" short-description="Create a new Portal Page">
<make-value entity-name="PortalPage" value-field="newPortalPage"/>
<set-pk-fields map="parameters" value-field="newPortalPage"/>
- <make-next-seq-id value-name="newPortalPage" seq-field-name="portalPageId"/>
+ <make-next-seq-id value-field="newPortalPage" seq-field-name="portalPageId"/>
<set-nonpk-fields map="parameters" value-field="newPortalPage"/>
<create-value value-field="newPortalPage"/>