OFBiz › OFBiz - Commits

svn commit: r730098 [9/9] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/scr...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r730098 [9/9] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/scr...

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 03:28:24 2008
@@ -25,7 +25,7 @@
<entity-one entity-name="PortalPagePortlet" value-name="oldEntity" auto-field-map="true"/>
<check-errors/>

- <make-value value-name="newEntity" entity-name="PortalPagePortlet"/>
+ <make-value value-field="newEntity" entity-name="PortalPagePortlet"/>
<set field="newEntity.portalPortletId" from-field="parameters.portalPortletId"/>
<set field="newEntity.portalPageId" from-field="parameters.newPortalPageId"/>
<set field="newEntity.columnNum" value="1"/>
@@ -39,7 +39,7 @@
</simple-method>

<simple-method method-name="addPortalPageColumn" short-description="Add a new Column to a PortalPage">
- <make-value entity-name="PortalPageColumn" value-name="newEntity"/>
+ <make-value entity-name="PortalPageColumn" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="columnSeqId"/>
<field-to-result field-name="newEntity.columnSeqId" result-name="columnSeqId"/>
@@ -56,7 +56,7 @@
<field-map field-name="columnSeqId" from-field="column.columnSeqId"/>
</entity-and>

- <iterate list-name="portalPortletList" entry-name="portalPortlet">
+ <iterate list="portalPortletList" entry="portalPortlet">
<set-service-fields service-name="deletePortalPagePortlet" to-map-name="deletePortalPagePortletInMap" map-name="portalPortlet"/>
<call-service service-name="deletePortalPagePortlet" in-map-name="deletePortalPagePortletInMap"/>
</iterate>
@@ -66,13 +66,13 @@
</simple-method>

<simple-method method-name="createPortalPagePortlet" short-description="Add a registered PortalPortlet to a PortalPage">
- <make-value entity-name="PortalPagePortlet" value-name="newEntity"/>
+ <make-value entity-name="PortalPagePortlet" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="portletSeqId"/>
<field-to-result field-name="newEntity.portletSeqId" result-name="portletSeqId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
- <make-value entity-name="PortalPageColumn" value-name="newEntity1"/>
+ <make-value entity-name="PortalPageColumn" value-field="newEntity1"/>
<set-pk-fields map-name="parameters" value-name="newEntity1"/>
<make-next-seq-id value-name="newEntity1" seq-field-name="columnSeqId"/>
<create-value value-name="newEntity1"/>
@@ -82,7 +82,7 @@
<entity-one entity-name="PortalPagePortlet" value-name="portlet" auto-field-map="true" use-cache="true"/>

<if-not-empty field="portlet">
- <make-value value-name="newEntity" entity-name="PortletAttribute"/>
+ <make-value value-field="newEntity" entity-name="PortletAttribute"/>
<set field="newEntity.portalPageId" from-field="portlet.portalPageId"/>
<set field="newEntity.portalPortletId" from-field="portlet.portalPortletId"/>
<set field="newEntity.portletSeqId" from-field="portlet.portletSeqId"/>
@@ -98,21 +98,21 @@
<field-map field-name="portalPortletId" from-field="parameters.portalPortletId"/>
<field-map field-name="portletSeqId" from-field="parameters.portletSeqId"/>
</entity-and>
- <iterate list-name="attributeList" entry-name="attributeRecord">
+ <iterate list="attributeList" entry="attributeRecord">
<set field="attributeMap.${attributeRecord.attrName}" from-field="attributeRecord.attrValue"/>
</iterate>
<field-to-result field-name="attributeMap" result-name="attributeMap"/>
</simple-method>

<simple-method method-name="createPortalPage" short-description="Create a new Portal Page">
- <make-value entity-name="PortalPage" value-name="newPortalPage"/>
+ <make-value entity-name="PortalPage" value-field="newPortalPage"/>
<set-pk-fields map-name="parameters" value-name="newPortalPage"/>
<make-next-seq-id value-name="newPortalPage" seq-field-name="portalPageId"/>

<set-nonpk-fields map-name="parameters" value-name="newPortalPage"/>
<create-value value-name="newPortalPage"/>

- <make-value entity-name="PortalPageColumn" value-name="newPortalPageColumn"/>
+ <make-value entity-name="PortalPageColumn" value-field="newPortalPageColumn"/>
<set field="newPortalPageColumn.portalPageId" from-field="newPortalPage.portalPageId"/>
<set field="newPortalPageColumn.columnSeqId" value="1"/>
<create-value value-name="newPortalPageColumn"/>
@@ -130,7 +130,7 @@
<field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
</entity-and>

- <iterate list-name="portalPageColumnList" entry-name="portalPageColumn">
+ <iterate list="portalPageColumnList" entry="portalPageColumn">
<set-service-fields service-name="deletePortalPageColumn" to-map-name="deletePortalPageColumnInMap" map-name="portalPageColumn"/>
<call-service service-name="deletePortalPageColumn" in-map-name="deletePortalPageColumnInMap"/>
</iterate>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml Tue Dec 30 03:28:24 2008
@@ -22,21 +22,21 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">

<simple-method method-name="createDataSource" short-description="Create an DataSource">
- <make-value value-name="newEntity" entity-name="DataSource"/>
+ <make-value value-field="newEntity" entity-name="DataSource"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>

<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateDataSource" short-description="Update an DataSource">
- <make-value entity-name="DataSource" value-name="lookupPKMap"/>
+ <make-value entity-name="DataSource" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="DataSource" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteDataSource" short-description="Delete an DataSource">
- <make-value entity-name="DataSource" value-name="lookupPKMap"/>
+ <make-value entity-name="DataSource" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="DataSource" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml Tue Dec 30 03:28:24 2008
@@ -22,20 +22,20 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">

<simple-method method-name="createDataSourceType" short-description="Create an DataSourceType">
- <make-value value-name="newEntity" entity-name="DataSourceType"/>
+ <make-value value-field="newEntity" entity-name="DataSourceType"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateDataSourceType" short-description="Update an DataSourceType">
- <make-value entity-name="DataSourceType" value-name="lookupPKMap"/>
+ <make-value entity-name="DataSourceType" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="DataSourceType" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteDataSourceType" short-description="Delete an DataSourceType">
- <make-value entity-name="DataSourceType" value-name="lookupPKMap"/>
+ <make-value entity-name="DataSourceType" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="DataSourceType" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml Tue Dec 30 03:28:24 2008
@@ -26,17 +26,17 @@
<entity-and entity-name="Uom" list-name="currencies">
<field-map field-name="uomTypeId" value="CURRENCY_MEASURE"/>
</entity-and>
- <iterate list-name="currencies" entry-name="currency">
+ <iterate list="currencies" entry="currency">
<entity-and entity-name="CurrencyDimension" list-name="currencyDims">
<field-map field-name="currencyId" from-field="currency.uomId"/>
</entity-and>
<if-not-empty field="currencyDims">
- <iterate list-name="currencyDims" entry-name="currencyDim">
+ <iterate list="currencyDims" entry="currencyDim">
<set field="currencyDim.description" from-field="currency.description"/>
<store-value value-name="currencyDim"/>
</iterate>
<else>
- <make-value value-name="currencyDim" entity-name="CurrencyDimension"/>
+ <make-value value-field="currencyDim" entity-name="CurrencyDimension"/>
<sequenced-id-to-env sequence-name="CurrencyDimension" env-name="currencyDim.dimensionId"/>
<set field="currencyDim.currencyId" from-field="currency.uomId"/>
<set field="currencyDim.description" from-field="currency.description"/>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 03:28:24 2008
@@ -25,7 +25,7 @@
<check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run createCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission>
<check-errors/>

- <make-value value-name="newEntity" entity-name="CustomTimePeriod"/>
+ <make-value value-field="newEntity" entity-name="CustomTimePeriod"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>

<sequenced-id-to-env sequence-name="CustomTimePeriod" env-name="customTimePeriodId"/>
@@ -38,7 +38,7 @@
<check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run updateCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission>
<check-errors/>

- <make-value value-name="lookupPKMap" entity-name="CustomTimePeriod"/>
+ <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -48,7 +48,7 @@
<check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run deleteCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission>
<check-errors/>

- <make-value value-name="lookupPKMap" entity-name="CustomTimePeriod"/>
+ <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -62,7 +62,7 @@
<result-to-field result-name="parentOrganizationPartyIdList"/>
</call-service>

- <iterate entry="curOrganizationPartyId" list-name="parentOrganizationPartyIdList">
+ <iterate entry="curOrganizationPartyId" list="parentOrganizationPartyIdList">
<clear-field field-name="orgTimePeriodList"/>
<entity-condition entity-name="CustomTimePeriod" list-name="orgTimePeriodList">
<condition-list combine="and">

Modified: ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml (original)
+++ ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml Tue Dec 30 03:28:24 2008
@@ -24,7 +24,7 @@
<check-permission permission="ENTITY_SYNC" action="_CREATE"><fail-message message="Security Error: to run createEntitySync you must have the ENTITY_SYNC_CREATE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="newEntity" entity-name="EntitySync"/>
+ <make-value value-field="newEntity" entity-name="EntitySync"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>

<sequenced-id-to-env sequence-name="EntitySync" env-name="entitySyncId"/>
@@ -60,7 +60,7 @@
<check-permission permission="ENTITY_SYNC" action="_CREATE"><fail-message message="Security Error: to run createEntitySyncHistory you must have the ENTITY_SYNC_CREATE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="newEntity" entity-name="EntitySyncHistory"/>
+ <make-value value-field="newEntity" entity-name="EntitySyncHistory"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<now-timestamp-to-env env-name="newEntity.startDate"/>
<field-to-result field-name="newEntity.startDate" result-name="startDate"/>
@@ -76,7 +76,7 @@
<check-permission permission="ENTITY_SYNC" action="_UPDATE"><fail-message message="Security Error: to run updateEntitySyncHistory you must have the ENTITY_SYNC_UPDATE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="lookupPKMap" entity-name="EntitySyncHistory"/>
+ <make-value value-field="lookupPKMap" entity-name="EntitySyncHistory"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -86,7 +86,7 @@
<check-permission permission="ENTITY_SYNC" action="_DELETE"><fail-message message="Security Error: to run deleteEntitySyncHistory you must have the ENTITY_SYNC_DELETE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="lookupPKMap" entity-name="EntitySyncHistory"/>
+ <make-value value-field="lookupPKMap" entity-name="EntitySyncHistory"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -97,7 +97,7 @@
<check-permission permission="ENTITY_SYNC" action="_CREATE"><fail-message message="Security Error: to run createEntitySyncInclude you must have the ENTITY_SYNC_CREATE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="newEntity" entity-name="EntitySyncInclude"/>
+ <make-value value-field="newEntity" entity-name="EntitySyncInclude"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -106,7 +106,7 @@
<check-permission permission="ENTITY_SYNC" action="_UPDATE"><fail-message message="Security Error: to run updateEntitySyncInclude you must have the ENTITY_SYNC_UPDATE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="lookupPKMap" entity-name="EntitySyncInclude"/>
+ <make-value value-field="lookupPKMap" entity-name="EntitySyncInclude"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -116,7 +116,7 @@
<check-permission permission="ENTITY_SYNC" action="_DELETE"><fail-message message="Security Error: to run deleteEntitySyncInclude you must have the ENTITY_SYNC_DELETE or ENTITY_SYNC_ADMIN permission"/></check-permission>
<check-errors/>

- <make-value value-name="lookupPKMap" entity-name="EntitySyncInclude"/>
+ <make-value value-field="lookupPKMap" entity-name="EntitySyncInclude"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml Tue Dec 30 03:28:24 2008
@@ -35,7 +35,7 @@
<store-value value-name="oldExampleStatus"/>
</if-not-empty>

- <make-value entity-name="ExampleStatus" value-name="newEntity"/>
+ <make-value entity-name="ExampleStatus" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set field="newEntity.statusDate" from-field="nowTimestamp"/>

Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Tue Dec 30 03:28:24 2008
@@ -67,7 +67,7 @@
<simple-method method-name="setupItems" short-description="">

<call-object-method method-name="items" obj-field-name="cart" ret-field-name="cartItems"/>
- <iterate entry="item" list-name="cartItems">
+ <iterate entry="item" list="cartItems">

<call-object-method method-name="getProductId" obj-field-name="item" ret-field-name="itemName" ret-map-name="thisItem"/>

@@ -129,7 +129,7 @@
</simple-method>
<simple-method method-name="getShippingMethods" short-description="">

- <iterate entry="" list-name="">
+ <iterate entry="" list="">

<field-to-list field-name="" list-name="shippingMethods"/>
</iterate>

Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 03:28:24 2008
@@ -115,7 +115,7 @@
<simple-method method-name="createCommunicationEventRoles" short-description="">
<entity-condition list-name="commEvents" entity-name="CommunicationEvent" />
<set field="count" value="0" type="Integer" />
- <iterate entry="commEvent" list-name="commEvents">
+ <iterate entry="commEvent" list="commEvents">
<get-related value-name="commEvent" relation-name="CommunicationEventRole" list-name="roles" />
<if-empty field="roles">

@@ -125,12 +125,12 @@
<field-map field-name="roleTypeId" value="ADDRESSEE" />
</entity-one>
<if-empty field="partyRole">
- <make-value entity-name="PartyRole" value-name="partyRole" />
+ <make-value entity-name="PartyRole" value-field="partyRole" />
<set field="partyRole.partyId" value="${commEvent.partyIdTo}" />
<set field="partyRole.roleTypeId" value="ADDRESSEE" />
<create-value value-name="partyRole" />
</if-empty>
- <make-value entity-name="CommunicationEventRole" value-name="commRole" />
+ <make-value entity-name="CommunicationEventRole" value-field="commRole" />
<set field="commRole.communicationEventId" from-field="commEvent.communicationEventId" />
<set field="commRole.partyId" from-field="commEvent.partyIdTo" />
<set field="commRole.roleTypeId" value="ADDRESSEE" />
@@ -145,7 +145,7 @@
<field-map field-name="roleTypeId" value="ORIGINATOR" />
</entity-one>
<if-empty field="partyRole">
- <make-value entity-name="PartyRole" value-name="partyRole" />
+ <make-value entity-name="PartyRole" value-field="partyRole" />
<set field="partyRole.partyId" value="${commEvent.partyIdFrom}" />
<set field="partyRole.roleTypeId" value="ORIGINATOR" />
<create-value value-name="partyRole" />

Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 03:28:24 2008
@@ -102,7 +102,7 @@
<field-map field-name="partyIdFrom" value="${userLogin.partyId}"/>
<field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN"/>
</entity-and>
- <iterate entry-name="emailOwners" list-name="emailOwner">
+ <iterate entry="emailOwners" list="emailOwner">
<if-compare operator="equals" value="${userLogin.partyId}"
field="emailOwner.partyIdTo">
<set field="found" value="true"/>
@@ -116,7 +116,7 @@
<simple-method method-name="createCommunicationEventRoles" short-description="">
<entity-condition list-name="commEvents" entity-name="CommunicationEvent"/>
<set field="count" value="0" type="Integer"/>
- <iterate entry-name="commEvent" list-name="commEvents">
+ <iterate entry="commEvent" list="commEvents">
<log level="always" message="====processing: ${commEvent.communicationEventId}"/>
<get-related value-name="commEvent" relation-name="CommunicationEventRole"
list-name="roles"/>
@@ -128,12 +128,12 @@
<field-map field-name="roleTypeId" value="ADDRESSEE"/>
</entity-one>
<if-empty field="partyRole">
- <make-value entity-name="PartyRole" value-name="partyRole"/>
+ <make-value entity-name="PartyRole" value-field="partyRole"/>
<set field="partyRole.partyId" value="${commEvent.partyIdTo}"/>
<set field="partyRole.roleTypeId" value="ADDRESSEE"/>
<create-value value-name="partyRole"/>
</if-empty>
- <make-value entity-name="CommunicationEventRole" value-name="commRole"/>
+ <make-value entity-name="CommunicationEventRole" value-field="commRole"/>
<set field="commRole.communicationEventId"
from-field="commEvent.communicationEventId"/>
<set field="commRole.partyId" from-field="commEvent.partyIdTo"/>
@@ -149,7 +149,7 @@
<field-map field-name="roleTypeId" value="ORIGINATOR"/>
</entity-one>
<if-empty field="partyRole">
- <make-value entity-name="PartyRole" value-name="partyRole"/>
+ <make-value entity-name="PartyRole" value-field="partyRole"/>
<set field="partyRole.partyId" value="${commEvent.partyIdFrom}"/>
<set field="partyRole.roleTypeId" value="ORIGINATOR"/>
<create-value value-name="partyRole"/>

Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">

<simple-method method-name="createOagisMessageInfo" short-description="Create MessageInfo">
- <make-value entity-name="OagisMessageInfo" value-name="newEntity"/>
+ <make-value entity-name="OagisMessageInfo" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity" />


@@ -47,7 +47,7 @@
</simple-method>

<simple-method method-name="createOagisMessageErrorInfo" short-description="Create MessageErrorInfo">
- <make-value entity-name="OagisMessageErrorInfo" value-name="newEntity"/>
+ <make-value entity-name="OagisMessageErrorInfo" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity" />
<make-next-seq-id value-name="newEntity" seq-field-name="errorSeqId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -66,7 +66,7 @@
<set field="createOagisMsgErrCtx.task" from-field="parameters.task"/>
<set field="createOagisMsgErrCtx.referenceId" from-field="parameters.referenceId"/>
<if-not-empty field="parameters.errorMapList">
- <iterate list-name="parameters.errorMapList" entry-name="errorMap">
+ <iterate list="parameters.errorMapList" entry="errorMap">
<set field="createOagisMsgErrCtx.description" from-field="errorMap.description"/>
<set field="createOagisMsgErrCtx.reasonCode" from-field="errorMap.reasonCode"/>
<call-service service-name="createOagisMessageErrorInfo" in-map-name="createOagisMsgErrCtx"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 03:28:24 2008
@@ -85,7 +85,7 @@
</or>
</condition>
<then>
- <make-value value-name="workEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
+ <make-value value-field="workEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
<set field="workEffortPartyAssignment.workEffortId" from-field="parameters.workEffortId"/>
<set field="workEffortPartyAssignment.partyId" from-field="updProjectRole.newPartyId"/>
<set field="workEffortPartyAssignment.roleTypeId" from-field="updProjectRole.roleTypeId"/>
@@ -146,7 +146,7 @@
<now-date-to-env env-name="workEffortPartyAssignment.thruDate"/>
<store-value value-name="workEffortPartyAssignment"/>

- <make-value value-name="newAssign" entity-name="WorkEffortPartyAssignment"/>
+ <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
<set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="newAssign.partyId" from-field="parameters.newPartyId"/>
<set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId"/>
@@ -190,7 +190,7 @@
</entity-and>

<if-not-empty field="assignments">
- <iterate entry="assignment" list-name="assignments">
+ <iterate entry="assignment" list="assignments">
<if-compare field="assignment.statusId" value="PAS_COMPLETED" operator="not-equals">
<set field="status" value="notcomplete"/>
</if-compare>
@@ -205,7 +205,7 @@
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="custRequests">
- <iterate entry="custReq" list-name="custRequests">
+ <iterate entry="custReq" list="custRequests">
<set field="updStat.custRequestId" from-field="custReq.custRequestId"/>
<set field="updStat.statusId" value="CRQ_COMPLETED"/>
<call-service service-name="updateCustRequest" in-map-name="updStat"/>
@@ -249,7 +249,7 @@

<if-not-empty field="tasks">

- <iterate entry="task" list-name="tasks">
+ <iterate entry="task" list="tasks">
<clear-field field-name="task.estimatedStartDate"/>
<clear-field field-name="task.estimatedCompletionDate"/>
</iterate>
@@ -270,7 +270,7 @@
<field-map field-name="workEffortIdTo" from-field="taskId"/>
</entity-and>
<if-not-empty field="assocs">
- <iterate entry="assoc" list-name="assocs">
+ <iterate entry="assoc" list="assocs">
<clear-field field-name="hours"/>
<set field="getTask.taskId" from-field="assoc.workEffortIdFrom"/>
<call-service service-name="getProjectTask" in-map-name="getTask">
@@ -342,10 +342,10 @@
</entity-one>
<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
- <iterate entry="phase" list-name="phases">
+ <iterate entry="phase" list="phases">
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry="task" list-name="tasks">
+ <iterate entry="task" list="tasks">
<get-related value-name="task" relation-name="ToWorkEffortAssoc" list-name="t.prevTasks"/>
<if-empty field="t.prevTasks">

@@ -414,7 +414,7 @@

<set field="hours" value="0" type="Double"/>
<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list-name="timeEntries">
+ <iterate entry="timeEntry" list="timeEntries">
<if-compare-field field="timeEntry.workEffortId" to-field="parameters.workEffortId" operator="equals">
<if-compare-field field="timeEntry.rateTypeId" to-field="parameters.rateTypeId" operator="equals">
<if-not-empty field="timeEntry.hours">
@@ -540,7 +540,7 @@
<get-related value-name="project" relation-name="WorkEffortPartyAssignment" list-name="partiesAll"/>
<filter-list-by-date list-name="partiesAll" to-list-name="parties"/>
<if-not-empty field="parties">
- <iterate entry="party" list-name="parties">
+ <iterate entry="party" list="parties">
<set field="parameters.workEffortId" from-field="newProjectId"/>
<set field="parameters.partyId" from-field="party.partyId"/>
<set field="parameters.roleTypeId" from-field="party.roleTypeId"/>
@@ -551,7 +551,7 @@

<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
- <iterate entry="phase" list-name="phases">
+ <iterate entry="phase" list="phases">
<clear-field field-name="newPhase"/>
<if-not-empty field="toTemplate">
<set field="parameters.workEffortTypeId" value="PHASE_TEMPLATE"/>
@@ -568,7 +568,7 @@

<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry="task" list-name="tasks">
+ <iterate entry="task" list="tasks">
<clear-field field-name="newTask"/>
<if-not-empty field="toTemplate">
<set field="newTask.workEffortTypeId" value="TASK_TEMPLATE"/>
@@ -612,10 +612,10 @@

<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
- <iterate entry="phase" list-name="phases">
+ <iterate entry="phase" list="phases">
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry="lowInfo" list-name="tasks">
+ <iterate entry="lowInfo" list="tasks">
<if-compare field="lowInfo.currentStatusId" value="PTS_COMPLETED" operator="not-equals">
<if-compare field="lowInfo.currentStatusId" value="PTS_CANCELLED" operator="not-equals">
<set field="allTaskStatus" value="notComplete"/>
@@ -676,7 +676,7 @@
<order-by field-name="workEffortName"/>
</entity-and>
<if-not-empty field="phases">
- <iterate entry="phase" list-name="phases">
+ <iterate entry="phase" list="phases">

<entity-one entity-name="StatusItem" value-name="highSeq">
<field-map field-name="statusId" from-field="phase.currentStatusId"/>
@@ -691,7 +691,7 @@

<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry="lowInfo" list-name="tasks">
+ <iterate entry="lowInfo" list="tasks">
<if-compare field="lowInfo.currentStatusId" value="PTS_COMPLETED" operator="not-equals">
<if-compare field="lowInfo.currentStatusId" value="PTS_CANCELLED" operator="not-equals">
<set field="allTaskStatus" value="notComplete"/>
@@ -751,7 +751,7 @@
<order-by field-name="workEffortName"/>
</entity-and>
<if-not-empty field="tasks">
- <iterate entry="lowInfo" list-name="tasks">
+ <iterate entry="lowInfo" list="tasks">
<set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
<call-simple-method method-name="combineInfo"/>
<clear-field field-name="highInfo.sequenceId"/>
@@ -795,7 +795,7 @@
<order-by field-name="partyId"/>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list-name="tasks">
+ <iterate entry="task" list="tasks">
<if>
<condition>
<and>
@@ -857,7 +857,7 @@
<order-by field-name="partyId"/>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list-name="tasks">
+ <iterate entry="task" list="tasks">
<if>
<condition >
<and>
@@ -1014,7 +1014,7 @@

<get-related value-name="lowInfo" relation-name="WorkEffortSkillStandard" list-name="estimates"/>
<if-not-empty field="estimates">
- <iterate entry="estimate" list-name="estimates">
+ <iterate entry="estimate" list="estimates">
<if-not-empty field="estimate.estimatedDuration">
<if-not-empty field="highInfo.plannedHours">
<calculate field-name="highInfo.plannedHours">
@@ -1032,7 +1032,7 @@

<get-related value-name="lowInfo" relation-name="TimeEntry" list-name="actuals"/>
<if-not-empty field="actuals">
- <iterate entry="actual" list-name="actuals">
+ <iterate entry="actual" list="actuals">
<if-not-empty field="actual.hours">
<get-related-one value-name="actual" relation-name="Timesheet" to-value-name="timesheet"/>

@@ -1242,7 +1242,7 @@
<entity-and list="entries" entity-name="TimeEntry">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-and>
- <iterate list-name="entries" entry-name="timeEntry">
+ <iterate list="entries" entry="timeEntry">
<clear-field field-name="timeEntry.invoiceId"/>
<clear-field field-name="timeEntry.invoiceItemSeqId"/>
<store-value value-name="timeEntry"/>
@@ -1266,7 +1266,7 @@
</add-error>
<check-errors/>
</if-empty>
- <iterate entry="task" list-name="tasks">
+ <iterate entry="task" list="tasks">
<if-empty field="notFirst">

<set-service-fields service-name="addWorkEffortTimeToNewInvoice" map-name="parameters" to-map-name="addTaskToNewInvoice"/>
@@ -1330,8 +1330,8 @@
<if-not-empty field="assigns">
<set field="addAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="addAssign.statusId" value="PAS_ASSIGNED"/>
- <iterate entry="assign" list-name="assigns">
- <make-value value-name="newAssign" entity-name="WorkEffortPartyAssignment"/>
+ <iterate entry="assign" list="assigns">
+ <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
<set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="newAssign.partyId" from-field="assign.partyId"/>
<set field="newAssign.roleTypeId" from-field="assign.roleTypeId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 03:28:24 2008
@@ -82,7 +82,7 @@
</entity-and>

<if-not-empty field="assigns">
- <iterate entry="assign" list-name="assigns">
+ <iterate entry="assign" list="assigns">
<set-service-fields service-name="updateTaskAssigment" map-name="assign" to-map-name="upd"/>
<set field="upd.statusId" value="PAS_COMPLETED"/>
<call-service service-name="updateTaskAssigment" in-map-name="upd"/>

Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml Tue Dec 30 03:28:24 2008
@@ -26,7 +26,7 @@
<select-field field-name="productName"/>
<order-by field-name="productName"/>
</entity-condition>
- <iterate list-name="products" entry-name="product">
+ <iterate list="products" entry="product">
<set field="productName" type="String" value="${product.productName} (${product.productId})"/>
<field-to-list field-name="productName" list-name="productsList"/>
<set field="productId" type="String" value="${product.productId}"/>
@@ -42,7 +42,7 @@
<select-field field-name="description"/>
<order-by field-name="description"/>
</entity-condition>
- <iterate list-name="products" entry-name="product">
+ <iterate list="products" entry="product">
<set field="description" type="String" value="${product.description} (${product.productId})"/>
<field-to-list field-name="description" list-name="productsList"/>
<set field="productId" type="String" value="${product.productId}"/>
@@ -62,7 +62,7 @@
<select-field field-name="idValue"/>
<order-by field-name="idValue"/>
</entity-condition>
- <iterate list-name="products" entry-name="product">
+ <iterate list="products" entry="product">
<set field="idValue" type="String" value="${product.idValue} ${product.productName} (${product.productId})"/>
<field-to-list field-name="idValue" list-name="productsList"/>
<set field="productId" type="String" value="${product.productId}"/>

Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Tue Dec 30 03:28:24 2008
@@ -45,7 +45,7 @@
<field field-name="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="true">
- <make-value value-name="terminalState" entity-name="PosTerminalState"/>
+ <make-value value-field="terminalState" entity-name="PosTerminalState"/>
<call-object-method obj-field-name="webPosSession" method-name="getId" ret-field-name="terminalState.posTerminalId"/>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field-name="terminalState.openedDate"/>
<call-object-method obj-field-name="webPosSession" method-name="getUserLoginId" ret-field-name="terminalState.openedByUserLoginId"/>
@@ -305,7 +305,7 @@
<field field-name="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="true">
- <make-value value-name="internTx" entity-name="PosTerminalInternTx"/>
+ <make-value value-field="internTx" entity-name="PosTerminalInternTx"/>
<call-object-method obj-field-name="webPosTransaction" method-name="getTerminalLogId" ret-field-name="internTx.posTerminalLogId"/>
<set field="internTx.paidAmount" from-field="parameters.amountInOut"/>
<set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/>