svn commit: r667748 [8/16] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accounti...

[lektran]

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Fri Jun 13 23:03:12 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createContactMech" short-description="Create Contact Mechanism">
         <make-value value-name="newValue" entity-name="ContactMech"/>
-        <if-empty field-name="parameters.contactMechId">
+        <if-empty field="parameters.contactMechId">
             <sequenced-id-to-env sequence-name="ContactMech" env-name="newValue.contactMechId"/>
             <else>
                 <set field="newValue.contactMechId" from-field="parameters.contactMechId"/>
@@ -36,35 +36,35 @@
     </simple-method>
     
     <simple-method method-name="updateContactMech" short-description="Update Contact Mechanism">
-        <if-compare field-name="contactMechTypeId" operator="equals" value="POSTAL_ADDRESS">
+        <if-compare field="contactMechTypeId" operator="equals" value="POSTAL_ADDRESS">
             <add-error><fail-property resource="PartyUiLabels" property="PartyServiceNotForPostalAddress"/></add-error>
         </if-compare>
-        <if-compare field-name="contactMechTypeId" operator="equals" value="TELECOM_NUMBER">
+        <if-compare field="contactMechTypeId" operator="equals" value="TELECOM_NUMBER">
             <add-error><fail-property resource="PartyUiLabels" property="PartyServiceNotForTelecomNumber"/></add-error>
         </if-compare>                      
         <check-errors/>
 
         <set field="successMessageProperty" value="PartyContactMechanismSuccessfullyUpdated"/>                        
-        <if-compare map-name="context" field-name="contactMechTypeId" operator="equals" value="EMAIL_ADDRESS">
+        <if-compare field="context.contactMechTypeId" operator="equals" value="EMAIL_ADDRESS">
             <set field="successMessageProperty" value="PartyEmailAddressSuccessfullyUpdated"/>
         </if-compare>
-        <if-compare map-name="context" field-name="contactMechTypeId" operator="equals" value="WEB_ADDRESS">
+        <if-compare field="context.contactMechTypeId" operator="equals" value="WEB_ADDRESS">
             <set field="successMessageProperty" value="PartyWebAddressSuccessfullyUpdated"/>
         </if-compare>
-        <if-compare map-name="context" field-name="contactMechTypeId" operator="equals" value="IP_ADDRESS">
+        <if-compare field="context.contactMechTypeId" operator="equals" value="IP_ADDRESS">
             <set field="successMessageProperty" value="PartyIpAddressSuccessfullyUpdated"/>
         </if-compare>
-        <if-compare map-name="context" field-name="contactMechTypeId" operator="equals" value="ELECTRONIC_ADDRESS">
+        <if-compare field="context.contactMechTypeId" operator="equals" value="ELECTRONIC_ADDRESS">
             <set field="successMessageProperty" value="PartyElectronicAddressSuccessfullyUpdated"/>
         </if-compare>
-        <if-compare map-name="context" field-name="contactMechTypeId" operator="equals" value="DOMAIN_NAME">
+        <if-compare field="context.contactMechTypeId" operator="equals" value="DOMAIN_NAME">
             <set field="successMessageProperty" value="PartyDomainNameSuccessfullyUpdated"/>
         </if-compare>
 
         <make-value entity-name="ContactMech" value-name="ContactMechMap"/>
         <set-pk-fields value-name="ContactMechMap" map-name="parameters"/>
         <find-by-primary-key entity-name="ContactMech" map-name="ContactMechMap" value-name="oldValue" />
-        <if-compare-field map-name="parameters" field-name="infoString" to-map-name="oldValue" operator="not-equals">
+        <if-compare-field to-field="oldValue." field="parameters.infoString" operator="not-equals">
              <log level="info" message="Contact mech need updating"/>
             <clone-value value-name="oldValue" new-value-name="newValue"/>
             <set-nonpk-fields map-name="parameters" value-name="newValue" set-if-null="false"/>
@@ -85,15 +85,15 @@
     </simple-method>
     
     <simple-method method-name="createPostalAddress" short-description="Create Contact Mechanism with PostalAddress">
-        <if-compare value="USA" operator="equals" field-name="countryGeoId" map-name="parameters">
-          <if-empty field-name="stateProvinceGeoId" map-name="parameters">
+        <if-compare value="USA" operator="equals" field="parameters.countryGeoId">
+          <if-empty field="parameters.stateProvinceGeoId">
             <add-error>
               <fail-property resource="PartyUiLabels" property="PartyStateInUsMissing"/>
             </add-error>                        
           </if-empty>
         </if-compare>        
-        <if-compare value="CAN" operator="equals" field-name="countryGeoId" map-name="parameters">
-          <if-empty field-name="stateProvinceGeoId" map-name="parameters">
+        <if-compare value="CAN" operator="equals" field="parameters.countryGeoId">
+          <if-empty field="parameters.stateProvinceGeoId">
             <add-error>
               <fail-property resource="PartyUiLabels" property="PartyProveinceInCanadaMissing"/>
             </add-error>
@@ -113,15 +113,15 @@
     </simple-method>
     
     <simple-method method-name="updatePostalAddress" short-description="Update Contact Mechanism with PostalAddress">
-        <if-compare value="USA" operator="equals" field-name="countryGeoId" map-name="parameters">
-          <if-empty field-name="stateProvinceGeoId" map-name="parameters">
+        <if-compare value="USA" operator="equals" field="parameters.countryGeoId">
+          <if-empty field="parameters.stateProvinceGeoId">
             <add-error>
               <fail-property resource="PartyUiLabels" property="PartyStateInUsMissing"/>
             </add-error>                        
           </if-empty>
         </if-compare>        
-        <if-compare value="CAN" operator="equals" field-name="countryGeoId" map-name="parameters">
-          <if-empty field-name="stateProvinceGeoId" map-name="parameters">
+        <if-compare value="CAN" operator="equals" field="parameters.countryGeoId">
+          <if-empty field="parameters.stateProvinceGeoId">
             <add-error>
               <fail-property resource="PartyUiLabels" property="PartyProveinceInCanadaMissing"/>
             </add-error>
@@ -135,7 +135,7 @@
           
         <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/>
         
-        <if-compare-field field-name="oldValue" to-field-name="newValue" operator="not-equals" type="Object">
+        <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
             <log level="info" message="Postal address need updating"/>
             <call-service service-name="createContactMech" in-map-name="context">
                 <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
@@ -148,7 +148,7 @@
                     <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
                     <result-to-field result-name="contactMechId" map-name="newValue"/>
                 </call-service>
-                <if-compare-field map-name="oldValue" to-map-name="newValue" field-name="contactMechId" operator="not-equals">
+                <if-compare-field to-field="newValue." field="oldValue.contactMechId" operator="not-equals">
                     <log level="info" message="Postal address need updating, contact mech changed"/>
                     <create-value value-name="newValue"/>
                     <else>
@@ -182,7 +182,7 @@
         <set-nonpk-fields map-name="parameters" value-name="newValue"/>
         <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/>
         
-        <if-compare-field field-name="oldValue" to-field-name="newValue" operator="not-equals" type="Object">
+        <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
             <log level="info" message="Telecom number needs updating"/>
             <call-service service-name="createContactMech" in-map-name="context">
                 <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
@@ -195,7 +195,7 @@
                     <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
                     <result-to-field result-name="contactMechId" map-name="newValue"/>
                 </call-service>
-                <if-compare-field map-name="oldValue" to-map-name="newValue" field-name="contactMechId" operator="not-equals">
+                <if-compare-field to-field="newValue." field="oldValue.contactMechId" operator="not-equals">
                     <log level="info" message="Telecom Number need updating, contact mech changed"/>
                     <create-value value-name="newValue"/>
                     <else>
@@ -274,7 +274,7 @@
         <find-by-primary-key value-name="emailAddressVerification" entity-name="EmailAddressVerification" map-name="lookupHash"/>
         <set field="bodyParameters.verifyHash" from-field="emailAddressVerification.verifyHash"/>
         <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
-        <if-not-empty field-name="bodyScreenLocation" map-name="storeEmail">                        
+        <if-not-empty field="storeEmail.bodyScreenLocation">                        
             <set field="emailParams.sendTo" from-field="parameters.emailAddress"/>
             <set field="emailParams.subject" from-field="storeEmail.subject"/>
             <set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/>
@@ -293,9 +293,9 @@
         </entity-and>
         
         <first-from-list list-name="emailAddressVerifications" entry-name="emailAddressVerification"/>
-        <if-not-empty field-name="emailAddressVerification">
+        <if-not-empty field="emailAddressVerification">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <if-compare-field field-name="emailAddressVerification.expireDate" operator="less" to-field-name="nowTimestamp">
+            <if-compare-field field="emailAddressVerification.expireDate" to-field="nowTimestamp" operator="less">
                  <add-error><fail-property resource="PartyUiLabels" property="PartyEmailAddressVerificationExpired"/></add-error>
             </if-compare-field>
         <else>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Fri Jun 13 23:03:12 2008
@@ -23,11 +23,11 @@
     <simple-method method-name="createPartyContactMech" short-description="Create a PartyContactMech">
         <make-value entity-name="PartyContactMech" value-name="newValue"/>
         <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/><!-- DEJ20061016: is this really needed? doesn't seem to be used... -->
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
-        <if-empty map-name="parameters" field-name="contactMechId">
+        <if-empty field="parameters.contactMechId">
             <set-service-fields service-name="createContactMech" map-name="parameters" to-map-name="createContactMechMap"/>
             <call-service service-name="createContactMech" in-map-name="createContactMechMap">
                 <result-to-field result-name="contactMechId" map-name="newValue"/>
@@ -48,7 +48,7 @@
     
     <simple-method method-name="updatePartyContactMech" short-description="Update a PartyContactMech">
         <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
@@ -58,7 +58,7 @@
         <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
         <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
         <first-from-list entry-name="partyContactMech" list-name="validPartyContactMechs"/>
-        <if-empty field-name="partyContactMech">
+        <if-empty field="partyContactMech">
             <add-error><fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/></add-error>
         </if-empty>
 
@@ -67,7 +67,7 @@
         <clone-value value-name="partyContactMech" new-value-name="newPartyContactMech"/>
         
         <!-- If we already have a new contactMechId don't update ContactMech -->
-        <if-empty map-name="parameters" field-name="newContactMechId">                
+        <if-empty field="parameters.newContactMechId">                
             <set-service-fields service-name="updateContactMech" map-name="parameters" to-map-name="updateContactMechMap"/>
             <call-service service-name="updateContactMech" in-map-name="updateContactMechMap">
                 <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
@@ -86,7 +86,7 @@
         <store-value value-name="partyContactMech"/>
         <create-value value-name="newPartyContactMech"/>
         
-        <if-compare-field field-name="contactMechId" map-name="parameters" to-map-name="newPartyContactMech" operator="not-equals">
+        <if-compare-field to-field="newPartyContactMech." field="parameters.contactMechId" operator="not-equals">
             <get-related value-name="partyContactMech" relation-name="PartyContactMechPurpose" list-name="partyContactMechPurposes"/>  
             <iterate entry-name="partyContactMechPurposeOld" list-name="partyContactMechPurposes">
                 <clone-value value-name="partyContactMechPurposeOld" new-value-name="partyContactMechPurpose"/>
@@ -99,7 +99,7 @@
                 <set field="purposeMap.contactMechId" from-field="partyContactMechPurpose.contactMechId"/>
                 <find-by-and entity-name="PartyContactMechPurpose" list-name="purposeResult" map-name="purposeMap"/>
                     
-                <if-empty field-name="purposeResult">
+                <if-empty field="purposeResult">
                     <create-value value-name="partyContactMechPurpose"/>
                 </if-empty>
             </iterate>
@@ -112,7 +112,7 @@
     
     <simple-method method-name="deletePartyContactMech" short-description="Delete a PartyContactMech">
         <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
@@ -121,7 +121,7 @@
         <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
         <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
         <first-from-list entry-name="partyContactMech" list-name="validPartyContactMechs"/>
-        <if-empty field-name="partyContactMech">
+        <if-empty field="partyContactMech">
             <add-error>
                 <fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>
             </add-error>
@@ -132,7 +132,7 @@
     </simple-method>
     
     <simple-method method-name="createPartyPostalAddress" short-description="Create a PostalAddress for party">
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>        
 
@@ -156,7 +156,7 @@
     
     <simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party">
         <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
@@ -178,7 +178,7 @@
     </simple-method>
 
     <simple-method method-name="createPartyTelecomNumber" short-description="Create a TelecomNumber for party">
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
                 
@@ -203,7 +203,7 @@
     
     <simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party">
         <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
@@ -227,7 +227,7 @@
     </simple-method>  
     
     <simple-method method-name="createPartyEmailAddress" short-description="Create an email address for party">
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
 
@@ -247,7 +247,7 @@
     </simple-method>
     
     <simple-method method-name="updatePartyEmailAddress" short-description="Update an email address for party">
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
 
@@ -272,7 +272,7 @@
         <set field="input.filterByDate" value="Y"/>
         <set field="input.inputFields.infoString" from-field="parameters.address"/>
         
-        <if-empty field-name="parameters.fromDate">
+        <if-empty field="parameters.fromDate">
             <now-timestamp-to-env env-name="input.filterByDateValue"/>
             <else>
                 <set field="input.filterByDateValue" from-field="parameters.fromDate"/>
@@ -283,7 +283,7 @@
             <results-to-map map-name="results"/>
         </call-service>
         
-        <if-not-empty field-name="results.item">
+        <if-not-empty field="results.item">
             <field-to-result field-name="results.item.partyId" result-name="partyId"/>
             <field-to-result field-name="results.item.contactMechId" result-name="contactMechId"/>
         </if-not-empty>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml Fri Jun 13 23:03:12 2008
@@ -26,7 +26,7 @@
         <set-pk-fields value-name="partyContent" map-name="parameters"/>
         <set-nonpk-fields value-name="partyContent" map-name="parameters"/>
 
-        <if-empty field-name="fromDate" map-name="partyContent">
+        <if-empty field="partyContent.fromDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set field="partyContent.fromDate" from-field="nowTimestamp"/>
         </if-empty>
@@ -51,4 +51,4 @@
         <remove-value value-name="partyContent"/>        
     </simple-method>
 
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Fri Jun 13 23:03:12 2008
@@ -32,17 +32,17 @@
         <now-timestamp-to-env env-name="nowStamp"/>
         <set field="parameters.roleTypeId" value="CUSTOMER" />
 
-        <if-compare field-name="create_allow_password" operator="not-equals" value="true">
+        <if-compare field="create_allow_password" operator="not-equals" value="true">
             <set field="parameters.PASSWORD" from-field="default_customer_password" />
             <set field="parameters.CONFIRM_PASSWORD" from-field="default_customer_password" />
             <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled" />
         </if-compare>
 
         <!-- if username and/or password should be lowercased, do that now -->
-        <if-compare field-name="username_lowercase" operator="equals" value="true">
+        <if-compare field="username_lowercase" operator="equals" value="true">
             <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="USERNAME" ret-map-name="parameters"/>
         </if-compare>
-        <if-compare field-name="password_lowercase" operator="equals" value="true">
+        <if-compare field="password_lowercase" operator="equals" value="true">
             <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="PASSWORD" ret-map-name="parameters"/>
             <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="CONFIRM_PASSWORD" ret-map-name="parameters"/>
         </if-compare>
@@ -60,10 +60,10 @@
                 <process field="PASSWORD_HINT"><copy to-field="passwordHint"/></process>
             </simple-map-processor>
         </call-map-processor>
-        <if-not-empty field-name="userLoginId" map-name="userLoginContext">
+        <if-not-empty field="userLoginContext.userLoginId">
             <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" />
             <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/>
-            <if-not-empty field-name="existingUserLogin">
+            <if-not-empty field="existingUserLogin">
                 <set field="tempErrorMessage" value="Username in use, please choose another." />
                 <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
             </if-not-empty>
@@ -99,7 +99,7 @@
         <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" />
 
         <!-- Create the Postal Address -->
-        <if-compare field-name="USE_ADDRESS" map-name="parameters" operator="equals" value="false">
+        <if-compare field="parameters.USE_ADDRESS" operator="equals" value="false">
             <!-- address not used, do nothing -->
             <else>
                 <call-map-processor in-map-name="parameters" out-map-name="addressContext">
@@ -120,14 +120,14 @@
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>
-                <if-compare value="USA" operator="equals" field-name="CUSTOMER_COUNTRY" map-name="parameters">
-                    <if-empty field-name="CUSTOMER_STATE" map-name="parameters">
+                <if-compare value="USA" operator="equals" field="parameters.CUSTOMER_COUNTRY">
+                    <if-empty field="parameters.CUSTOMER_STATE">
                         <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." />
                         <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
                     </if-empty>
                 </if-compare>
-                <if-compare value="CAN" operator="equals" field-name="CUSTOMER_COUNTRY" map-name="parameters">
-                    <if-empty field-name="CUSTOMER_STATE" map-name="parameters">
+                <if-compare value="CAN" operator="equals" field="parameters.CUSTOMER_COUNTRY">
+                    <if-empty field="parameters.CUSTOMER_STATE">
                         <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." />
                         <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
                     </if-empty>
@@ -136,7 +136,7 @@
         </if-compare>
 
         <!-- Create the Home Phone -->
-        <if-not-empty field-name="CUSTOMER_HOME_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT">
             <call-map-processor in-map-name="parameters" out-map-name="homePhoneContext">
                 <simple-map-processor name="newTelecomNumber">
                     <process field="roleTypeId"><copy/></process>
@@ -150,7 +150,7 @@
         </if-not-empty>
 
         <!-- Create the Work Phone -->
-        <if-not-empty field-name="CUSTOMER_WORK_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT">
             <call-map-processor in-map-name="parameters" out-map-name="workPhoneContext">
                 <simple-map-processor name="newTelecomNumber">
                     <process field="roleTypeId"><copy/></process>
@@ -164,7 +164,7 @@
         </if-not-empty>
 
         <!-- Create the Fax Phone -->
-        <if-not-empty field-name="CUSTOMER_FAX_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT">
             <call-map-processor in-map-name="parameters" out-map-name="faxPhoneContext">
                 <simple-map-processor name="newTelecomNumber">
                     <process field="roleTypeId"><copy/></process>
@@ -178,7 +178,7 @@
         </if-not-empty>
 
         <!-- Create the Mobile Phone -->
-        <if-not-empty field-name="CUSTOMER_MOBILE_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT">
             <call-map-processor in-map-name="parameters" out-map-name="mobilePhoneContext">
                 <simple-map-processor name="newTelecomNumber">
                     <process field="roleTypeId"><copy/></process>
@@ -192,10 +192,10 @@
         </if-not-empty>
 
         <!-- Check for required Phone -->
-        <if-compare field-name="require_phone" operator="equals" value="true">
-            <if-empty field-name="CUSTOMER_HOME_CONTACT" map-name="parameters">
-                <if-empty field-name="CUSTOMER_WORK_CONTACT" map-name="parameters">
-                    <if-empty field-name="CUSTOMER_MOBILE_CONTACT" map-name="parameters">
+        <if-compare field="require_phone" operator="equals" value="true">
+            <if-empty field="parameters.CUSTOMER_HOME_CONTACT">
+                <if-empty field="parameters.CUSTOMER_WORK_CONTACT">
+                    <if-empty field="parameters.CUSTOMER_MOBILE_CONTACT">
                         <call-map-processor in-map-name="parameters" out-map-name="dummymap">
                             <simple-map-processor name="checkRequiredPhone">
                                 <process field="REQUIRED_PHONE">
@@ -218,8 +218,8 @@
         </call-map-processor>
 
         <!-- Check for required E-Mail -->
-        <if-compare field-name="require_email" operator="equals" value="true">
-            <if-empty field-name="emailAddress" map-name="emailContext">
+        <if-compare field="require_email" operator="equals" value="true">
+            <if-empty field="emailContext.emailAddress">
                 <call-map-processor in-map-name="emailContext" out-map-name="dummymap">
                     <simple-map-processor name="checkRequiredEmail">
                         <process field="emailAddress">
@@ -228,7 +228,7 @@
                     </simple-map-processor>
                </call-map-processor>
            </if-empty>
-           <if-not-empty field-name="emailAddress" map-name="emailContext">
+           <if-not-empty field="emailContext.emailAddress">
                 <call-map-processor in-map-name="emailContext" out-map-name="dummymap">
                     <simple-map-processor name="checkRequiredEmailFormat">
                         <process field="emailAddress">
@@ -280,7 +280,7 @@
         <call-service service-name="createPartyRole" in-map-name="partyRoleContext"/>
 
         <!-- shipping address -->
-        <if-compare field-name="USE_ADDRESS" map-name="parameters" operator="equals" value="false">
+        <if-compare field="parameters.USE_ADDRESS" operator="equals" value="false">
             <!-- address not used, do nothing -->
             <else>
                 <call-service service-name="createPartyPostalAddress" in-map-name="addressContext">
@@ -297,7 +297,7 @@
         </if-compare>
 
         <!-- home phone -->
-        <if-not-empty field-name="CUSTOMER_HOME_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT">
             <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
                 <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/>
             </call-service>
@@ -307,7 +307,7 @@
         </if-not-empty>
 
         <!-- work phone -->
-        <if-not-empty field-name="CUSTOMER_WORK_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT">
             <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
                 <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/>
             </call-service>
@@ -317,7 +317,7 @@
         </if-not-empty>
 
         <!-- fax phone -->
-        <if-not-empty field-name="CUSTOMER_FAX_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT">
             <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
                 <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/>
             </call-service>
@@ -327,7 +327,7 @@
         </if-not-empty>
 
         <!-- mobile phone -->
-        <if-not-empty field-name="CUSTOMER_MOBILE_CONTACT" map-name="parameters">
+        <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT">
             <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
                 <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/>
             </call-service>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Fri Jun 13 23:03:12 2008
@@ -26,7 +26,7 @@
         <make-value entity-name="PartyInvitation" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="PartyInvitation" env-name="newEntity.partyInvitationId"/>
         <field-to-result field-name="newEntity.partyInvitationId" result-name="partyInvitationId"/>
-        <if-not-empty field-name="parameters.partyId">
+        <if-not-empty field="parameters.partyId">
             <entity-one entity-name="Person" value-name="person" auto-field-map="false">
                 <field-map field-name="partyId" env-name="parameters.partyId"/>
             </entity-one>
@@ -39,7 +39,7 @@
     </simple-method>
     <simple-method method-name="updatePartyInvitation" short-description="Update a PartyInvitation">
         <entity-one entity-name="PartyInvitation" value-name="lookedUpValue"/>
-        <if-not-empty field-name="parameters.partyId">
+        <if-not-empty field="parameters.partyId">
             <entity-one entity-name="Person" value-name="person" auto-field-map="false">
                 <field-map field-name="partyId" env-name="parameters.partyId"/>
             </entity-one>
@@ -74,7 +74,7 @@
         <entity-and entity-name="PartyInvitationGroupAssoc" list-name="partyInvitationGroupAssocs">
             <field-map field-name="partyInvitationId" env-name="parameters.partyInvitationId"/>
         </entity-and>
-        <if-not-empty field-name="partyInvitationGroupAssocs">
+        <if-not-empty field="partyInvitationGroupAssocs">
             <set field="createPartyRelationshipCtx.partyIdTo" from-field="parameters.partyId"/>
             <set field="createPartyRelationshipCtx.partyRelationshipTypeId" value="GROUP_ROLLUP"/>            
             <iterate list-name="partyInvitationGroupAssocs" entry-name="partyInvitationGroupAssoc">
@@ -85,7 +85,7 @@
         <entity-and entity-name="PartyInvitationRoleAssoc" list-name="partyInvitationRoleAssocs">
             <field-map field-name="partyInvitationId" env-name="parameters.partyInvitationId"/>
         </entity-and>
-        <if-not-empty field-name="partyInvitationRoleAssocs">
+        <if-not-empty field="partyInvitationRoleAssocs">
             <set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/>
             <iterate list-name="partyInvitationRoleAssocs" entry-name="partyInvitationRoleAssoc">
                 <set field="createPartyRoleCtx.roleTypeId" from-field="partyInvitationRoleAssoc.roleTypeId"/>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml Fri Jun 13 23:03:12 2008
@@ -31,15 +31,15 @@
 
     <!-- Returns hasPermission=true if userLogin partyId equals partyId parameter -->
     <simple-method method-name="partyIdPermissionCheck" short-description="Party ID Permission Check">
-        <if-empty field-name="partyId">
+        <if-empty field="partyId">
             <set field="partyId" from-field="parameters.partyId"/>
         </if-empty>
         <if>
             <condition>
                 <and>
-                    <not><if-empty field-name="partyId"/></not>
-                    <not><if-empty field-name="userLogin.partyId"/></not>
-                    <if-compare-field field-name="partyId" operator="equals" to-field-name="userLogin.partyId"/>
+                    <not><if-empty field="partyId"/></not>
+                    <not><if-empty field="userLogin.partyId"/></not>
+                    <if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals"/>
                 </and>
             </condition>
             <then>
@@ -47,7 +47,7 @@
             </then>
             <else>
                 <set field="resourceDescription" from-field="parameters.resourceDescription"/>
-                <if-empty field-name="resourceDescription">
+                <if-empty field="resourceDescription">
                     <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
                 </if-empty>
                 <property-to-field resource="PartyUiLabels" property="PartyPermissionErrorPartyId" field-name="failMessage"/>
@@ -62,7 +62,7 @@
         user has one of the base PARTYMGR CRUD+ADMIN permissions -->
     <simple-method method-name="basePlusPartyIdPermissionCheck" short-description="Base Permission Plus Party ID Permission Check">
         <call-simple-method method-name="basePermissionCheck"/>
-        <if-compare field-name="hasPermission" operator="not-equals" value="true">
+        <if-compare field="hasPermission" operator="not-equals" value="true">
             <call-simple-method method-name="partyIdPermissionCheck"/>
         </if-compare>
     </simple-method>
@@ -73,13 +73,13 @@
          user has one of the base PARTYMGR or PARTYMGR_STS CRUD+ADMIN permissions -->
     <simple-method method-name="partyStatusPermissionCheck" short-description="Party status permission logic">
         <set field="hasPermission" type="Boolean" value="false"/>
-        <if-not-empty field-name="parameters.partyId">
-            <if-compare-field field-name="parameters.partyId" operator="equals" to-field-name="userLogin.partyId">
+        <if-not-empty field="parameters.partyId">
+            <if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="equals">
                 <set field="hasPermission" type="Boolean" value="true"/>
                 <field-to-result field-name="hasPermission"/>
             </if-compare-field>
         </if-not-empty>
-        <if-compare field-name="hasPermission" operator="not-equals" value="true">
+        <if-compare field="hasPermission" operator="not-equals" value="true">
             <set field="altPermission" value="PARTYMGR_STS"/>
             <call-simple-method method-name="basePermissionCheck"/>
         </if-compare>
@@ -106,7 +106,7 @@
 
     <!-- Returns hasPermission=true if user has one of the base PARTYMGR or PARTYMGR_REL CRUD+ADMIN permissions -->
     <simple-method method-name="partyRelationshipPermissionCheck" short-description="Party relationship permission logic">
-        <if-empty field-name="parameters.partyIdFrom">
+        <if-empty field="parameters.partyIdFrom">
             <set field="parameters.partyIdFrom" from-field="userLogin.partyId"/>
             <set field="hasPermission" type="Boolean" value="true"/>
             <field-to-result field-name="hasPermission"/>
@@ -120,10 +120,10 @@
     <!-- Returns hasPermission=true if userLogin partyId equals partyId parameter OR
          user has one of the base PARTYMGR or PARTYMGR_PCM CRUD+ADMIN permissions -->
     <simple-method method-name="partyContactMechPermissionCheck" short-description="Party contact mech permission logic">
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
-        <if-compare-field field-name="partyId" map-name="parameters" to-map-name="userLogin" operator="equals">
+        <if-compare-field to-field="userLogin." field="parameters.partyId" operator="equals">
             <set field="hasPermission" type="Boolean" value="true"/>
             <field-to-result field-name="hasPermission"/>
             
@@ -141,10 +141,10 @@
             <set field="hasPermission" type="Boolean" value="true"/>
             <field-to-result field-name="hasPermission"/>
         </if-has-permission>
-        <if-compare field-name="hasPermission" operator="not-equals" value="true">
+        <if-compare field="hasPermission" operator="not-equals" value="true">
             <entity-one entity-name="PartyInvitation" value-name="partyInvitation"/>
-            <if-empty field-name="partyInvitation.partyId">
-                <if-empty field-name="partyInvitation.emailAddress">
+            <if-empty field="partyInvitation.partyId">
+                <if-empty field="partyInvitation.emailAddress">
                     <add-error>
                         <fail-property property="PartyInvitationNotValidError" resource="PartyUiLabels"/>
                     </add-error>
@@ -153,8 +153,8 @@
                     <call-service service-name="findPartyFromEmailAddress" in-map-name="findPartyCtx">
                         <result-to-field result-name="partyId" field-name="partyId"/>
                     </call-service>
-                    <if-not-empty field-name="partyId">
-                        <if-compare-field field-name="partyId" operator="equals" to-field-name="userLogin.partyId">
+                    <if-not-empty field="partyId">
+                        <if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals">
                             <set field="hasPermission" type="Boolean" value="true"/>
                             <field-to-result field-name="hasPermission"/>
                         </if-compare-field>
@@ -167,7 +167,7 @@
                 </else>    
                 </if-empty>
             <else>
-                <if-compare-field field-name="partyInvitation.partyId" operator="equals" to-field-name="userLogin.partyId">
+                <if-compare-field field="partyInvitation.partyId" to-field="userLogin.partyId" operator="equals">
                     <set field="hasPermission" type="Boolean" value="true"/>
                     <field-to-result field-name="hasPermission"/>
                 </if-compare-field>
@@ -175,7 +175,7 @@
             </if-empty>
             <check-errors/>
         </if-compare>
-        <if-compare field-name="hasPermission" operator="not-equals" value="true">
+        <if-compare field="hasPermission" operator="not-equals" value="true">
             <property-to-field property="PartyInvitationAccAndDecPermissionError" field-name="failMessage" resource="PartyUiLabels"/>
             <field-to-result field-name="hasPermission"/>
             <field-to-result field-name="failMessage"/>
@@ -187,17 +187,17 @@
             <set field="hasPermission" type="Boolean" value="true"/>
             <field-to-result field-name="hasPermission"/>
         </if-has-permission>
-        <if-compare field-name="hasPermission" operator="not-equals" value="true">
+        <if-compare field="hasPermission" operator="not-equals" value="true">
             <entity-one entity-name="PartyInvitation" value-name="partyInvitation"/>
-            <if-not-empty field-name="partyInvitation.partyIdFrom">
-                <if-compare-field field-name="partyInvitation.partyIdFrom" operator="equals" to-field-name="userLogin.partyId">
+            <if-not-empty field="partyInvitation.partyIdFrom">
+                <if-compare-field field="partyInvitation.partyIdFrom" to-field="userLogin.partyId" operator="equals">
                     <set field="hasPermission" type="Boolean" value="true"/>
                     <field-to-result field-name="hasPermission"/>
                 </if-compare-field>
             </if-not-empty>
-            <if-compare field-name="hasPermission" operator="not-equals" value="true">
-                <if-empty field-name="partyInvitation.partyId">
-                    <if-empty field-name="partyInvitation.emailAddress">
+            <if-compare field="hasPermission" operator="not-equals" value="true">
+                <if-empty field="partyInvitation.partyId">
+                    <if-empty field="partyInvitation.emailAddress">
                         <add-error>
                             <fail-property property="PartyInvitationNotValidError" resource="PartyUiLabels"/>
                         </add-error>
@@ -206,8 +206,8 @@
                         <call-service service-name="findPartyFromEmailAddress" in-map-name="findPartyCtx">
                             <result-to-field result-name="partyId" field-name="partyId"/>
                         </call-service>
-                        <if-not-empty field-name="partyId">
-                            <if-compare-field field-name="partyId" operator="equals" to-field-name="userLogin.partyId">
+                        <if-not-empty field="partyId">
+                            <if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals">
                                 <set field="hasPermission" type="Boolean" value="true"/>
                                 <field-to-result field-name="hasPermission"/>
                             </if-compare-field>
@@ -220,7 +220,7 @@
                     </else>    
                     </if-empty>
                 <else>
-                    <if-compare-field field-name="partyInvitation.partyId" operator="equals" to-field-name="userLogin.partyId">
+                    <if-compare-field field="partyInvitation.partyId" to-field="userLogin.partyId" operator="equals">
                         <set field="hasPermission" type="Boolean" value="true"/>
                         <field-to-result field-name="hasPermission"/>
                     </if-compare-field>
@@ -229,7 +229,7 @@
                 <check-errors/>
             </if-compare>
         </if-compare>
-        <if-compare field-name="hasPermission" operator="not-equals" value="true">
+        <if-compare field="hasPermission" operator="not-equals" value="true">
             <property-to-field property="PartyInvitationCancelPermissionError" field-name="failMessage" resource="PartyUiLabels"/>
             <field-to-result field-name="hasPermission"/>
             <field-to-result field-name="failMessage"/>
@@ -242,8 +242,8 @@
         <if>
             <condition>
                 <and>
-                    <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="userLogin.partyId"/>
-                    <if-compare-field field-name="parameters.partyIdTo" operator="not-equals" to-field-name="userLogin.partyId"/>
+                    <if-compare-field field="parameters.partyIdFrom" to-field="userLogin.partyId" operator="not-equals"/>
+                    <if-compare-field field="parameters.partyIdTo" to-field="userLogin.partyId" operator="not-equals"/>
                 </and>
             </condition>
             <then>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Fri Jun 13 23:03:12 2008
@@ -27,7 +27,7 @@
         <make-value value-name="partyRolePK" entity-name="PartyRole"/>
         <set-pk-fields value-name="partyRolePK" map-name="parameters"/>
         <find-by-primary-key entity-name="PartyRole" map-name="partyRolePK" value-name="partyRole"/>
-        <if-empty field-name="partyRole">
+        <if-empty field="partyRole">
             <make-value entity-name="PartyRole" map-name="partyRolePK" value-name="partyRole"/>
             <create-value value-name="partyRole"/>
         </if-empty>
@@ -42,7 +42,7 @@
     
     <simple-method method-name="savePartyNameChange" short-description="Save Party Name Change">
         <!-- for special case in ecommerce, if no partyId is passed in use userLogin.partyId -->
-        <if-empty field-name="parameters.partyId">
+        <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
@@ -51,11 +51,11 @@
         <now-timestamp-to-env env-name="partyNameHistory.changeDate"/>
         
         <if>
-            <condition><not><if-empty field-name="parameters.groupName"/></not></condition>
+            <condition><not><if-empty field="parameters.groupName"/></not></condition>
             <then>
                 <entity-one entity-name="PartyGroup" value-name="partyGroup"/>
                 <if>
-                    <condition><if-compare-field field-name="partyGroup.groupName" operator="not-equals" to-field-name="parameters.groupName"/></condition>
+                    <condition><if-compare-field field="partyGroup.groupName" to-field="parameters.groupName" operator="not-equals"/></condition>
                     <then>
                         <set-nonpk-fields value-name="partyNameHistory" map-name="partyGroup"/>
                         <create-value value-name="partyNameHistory"/>
@@ -65,11 +65,11 @@
             <else-if>
                 <condition>
                     <or>
-                        <not><if-empty field-name="parameters.firstName"></if-empty></not>
-                        <not><if-empty field-name="parameters.middleName"></if-empty></not>
-                        <not><if-empty field-name="parameters.lastName"></if-empty></not>
-                        <not><if-empty field-name="parameters.personalTitle"></if-empty></not>
-                        <not><if-empty field-name="parameters.suffix"></if-empty></not>
+                        <not><if-empty field="parameters.firstName"></if-empty></not>
+                        <not><if-empty field="parameters.middleName"></if-empty></not>
+                        <not><if-empty field="parameters.lastName"></if-empty></not>
+                        <not><if-empty field="parameters.personalTitle"></if-empty></not>
+                        <not><if-empty field="parameters.suffix"></if-empty></not>
                     </or>
                 </condition>
                 <then>
@@ -77,11 +77,11 @@
                     <if>
                         <condition>
                             <or>
-                                <if-compare-field field-name="person.firstName" operator="not-equals" to-field-name="parameters.firstName"/>
-                                <if-compare-field field-name="person.middleName" operator="not-equals" to-field-name="parameters.middleName"/>
-                                <if-compare-field field-name="person.lastName" operator="not-equals" to-field-name="parameters.lastName"/>
-                                <if-compare-field field-name="person.personalTitle" operator="not-equals" to-field-name="parameters.personalTitle"/>
-                                <if-compare-field field-name="person.suffix" operator="not-equals" to-field-name="parameters.suffix"/>
+                                <if-compare-field field="person.firstName" to-field="parameters.firstName" operator="not-equals"/>
+                                <if-compare-field field="person.middleName" to-field="parameters.middleName" operator="not-equals"/>
+                                <if-compare-field field="person.lastName" to-field="parameters.lastName" operator="not-equals"/>
+                                <if-compare-field field="person.personalTitle" to-field="parameters.personalTitle" operator="not-equals"/>
+                                <if-compare-field field="person.suffix" to-field="parameters.suffix" operator="not-equals"/>
                             </or>
                         </condition>
                         <then>
@@ -101,33 +101,33 @@
         </entity-and>
         <entity-one entity-name="Person" value-name="person"/>
         <entity-one entity-name="PartyGroup" value-name="partyGroup"/>
-        <if-empty field-name="parameters.compareDate">
+        <if-empty field="parameters.compareDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set field="parameters.compareDate" from-field="nowTimestamp"/>
         </if-empty>
         <!-- go through the list which is sorted by most recent first and find the oldest (last) one with the changeDate greater than the compareDate -->        
         <iterate entry-name="partyNameHistory" list-name="partyNameHistoryList">
-            <if-compare-field field-name="partyNameHistory.changeDate" operator="greater" to-field-name="parameters.compareDate">
+            <if-compare-field field="partyNameHistory.changeDate" to-field="parameters.compareDate" operator="greater">
                 <set field="partyNameHistoryCurrent" from-field="partyNameHistory"/>
             </if-compare-field>
         </iterate>
         
-        <if-empty field-name="partyNameHistoryCurrent">
-            <if-not-empty field-name="person">
+        <if-empty field="partyNameHistoryCurrent">
+            <if-not-empty field="person">
                 <field-to-result field-name="person.firstName" result-name="firstName"/>
-                <if-not-empty field-name="person.middleName">
+                <if-not-empty field="person.middleName">
                     <field-to-result field-name="person.middleName" result-name="middleName"/>
                 </if-not-empty>
                 <field-to-result field-name="person.lastName" result-name="lastName"/>
-                <if-not-empty field-name="person.personalTitle">
+                <if-not-empty field="person.personalTitle">
                     <field-to-result field-name="person.personalTitle" result-name="personalTitle"/>
                 </if-not-empty>
-                <if-not-empty field-name="person.suffix">
+                <if-not-empty field="person.suffix">
                     <field-to-result field-name="person.suffix" result-name="suffix"/>
                 </if-not-empty>
 
 
-                <if-compare field-name="parameters.lastNameFirst" operator="equals" value="Y">
+                <if-compare field="parameters.lastNameFirst" operator="equals" value="Y">
                     <set field="fullName" value="${person.personalTitle} ${person.lastName}, ${person.firstName} ${person.middleName} ${person.suffix}"/>
                 <else>
                     <set field="fullName" value="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName} ${person.suffix}"/>
@@ -136,7 +136,7 @@
                 <field-to-result field-name="fullName"/>
                 
                 <else>
-                    <if-not-empty field-name="partyGroup">
+                    <if-not-empty field="partyGroup">
                         <field-to-result field-name="partyGroup.groupName" result-name="groupName"/>
                         <field-to-result field-name="partyGroup.groupName" result-name="fullName"/>
                     </if-not-empty>
@@ -144,21 +144,21 @@
             </if-not-empty>
             <else>
                 <!-- partyNameHistoryCurrent has a value -->
-                <if-not-empty field-name="person">
+                <if-not-empty field="person">
                     <field-to-result field-name="partyNameHistoryCurrent.firstName" result-name="firstName"/>
-                    <if-not-empty field-name="partyNameHistoryCurrent.middleName">
+                    <if-not-empty field="partyNameHistoryCurrent.middleName">
                         <field-to-result field-name="partyNameHistoryCurrent.middleName" result-name="middleName"/>
                     </if-not-empty>
                     <field-to-result field-name="partyNameHistoryCurrent.lastName" result-name="lastName"/>
-                    <if-not-empty field-name="partyNameHistoryCurrent.personalTitle">
+                    <if-not-empty field="partyNameHistoryCurrent.personalTitle">
                         <field-to-result field-name="partyNameHistoryCurrent.personalTitle" result-name="personalTitle"/>
                     </if-not-empty>
-                    <if-not-empty field-name="partyNameHistoryCurrent.suffix">
+                    <if-not-empty field="partyNameHistoryCurrent.suffix">
                         <field-to-result field-name="partyNameHistoryCurrent.suffix" result-name="suffix"/>
                     </if-not-empty>
 
                     
-                    <if-compare field-name="parameters.lastNameFirst" operator="equals" value="Y">
+                    <if-compare field="parameters.lastNameFirst" operator="equals" value="Y">
                         <set field="fullName" value="${partyNameHistoryCurrent.personalTitle} ${partyNameHistoryCurrent.lastName}, ${partyNameHistoryCurrent.firstName} ${partyNameHistoryCurrent.middleName} ${partyNameHistoryCurrent.suffix}"/>
                     <else>
                         <set field="fullName" value="${partyNameHistoryCurrent.personalTitle} ${partyNameHistoryCurrent.firstName} ${partyNameHistoryCurrent.middleName} ${partyNameHistoryCurrent.lastName} ${partyNameHistoryCurrent.suffix}"/>
@@ -167,7 +167,7 @@
                     <field-to-result field-name="fullName"/>
                     
                     <else>
-                        <if-not-empty field-name="partyGroup">
+                        <if-not-empty field="partyGroup">
                             <field-to-result field-name="partyNameHistoryCurrent.groupName" result-name="groupName"/>
                             <field-to-result field-name="partyNameHistoryCurrent.groupName" result-name="fullName"/>
                         </if-not-empty>
@@ -203,7 +203,7 @@
         <make-value entity-name="PartyClassification" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-        <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>        
+        <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>        
         <create-value value-name="newEntity"/>  
     </simple-method>  
     <simple-method method-name="updatePartyClassification" short-description="update a PartyClassification">
@@ -271,13 +271,13 @@
 
     <!-- party profile default -->
     <simple-method method-name="setPartyProfileDefaults" short-description="Sets Party Profile Defaults">
-        <if-empty map-name="parameters" field-name="partyId">
+        <if-empty field="parameters.partyId">
             <set from-field="userLogin.partyId" field="parameters.partyId"/>
         </if-empty>
 
         <!-- lookup existing value -->
         <entity-one entity-name="PartyProfileDefault" value-name="partyProfileDefault"/>
-        <if-empty field-name="partyProfileDefault">
+        <if-empty field="partyProfileDefault">
             <make-value value-name="partyProfileDefault" entity-name="PartyProfileDefault"/>
             <set-pk-fields value-name="partyProfileDefault" map-name="parameters"/>
             <create-value value-name="partyProfileDefault"/>
@@ -292,25 +292,25 @@
     <!-- TODO: this method will be deleted in favor of new content methods and the PartyContentServices.xml -->
     <simple-method method-name="createPartyContent" short-description="Creates Party Associated Content" login-required="false">
            <!-- make sure we are logged in when passing a partyId -->
-        <if-not-empty field-name="partyId" map-name="parameters">
-            <if-empty field-name="userLogin" map-name="parameters">
+        <if-not-empty field="parameters.partyId">
+            <if-empty field="parameters.userLogin">
                 <add-error><fail-property resource="PartyUiLabels" property="PartyPermissionErrorForThisParty"/></add-error>
                 <check-errors/>
             </if-empty>
         </if-not-empty>
 
         <!-- check permission when creating content on behalf of another party -->
-        <if-empty field-name="partyId" map-name="parameters">
-            <if-not-empty field-name="userLogin" map-name="parameters">
+        <if-empty field="parameters.partyId">
+            <if-not-empty field="parameters.userLogin">
                 <set from-field="userLogin.partyId" field="parameters.partyId"/>
-                <if-compare-field field-name="partyId" map-name="parameters" to-map-name="userLogin" operator="not-equals">
+                <if-compare-field to-field="userLogin." field="parameters.partyId" operator="not-equals">
                     <check-permission permission="PARTYMGR" action="_UPDATE">
                         <fail-property resource="PartyUiLabels" property="PartyPermissionErrorForThisParty"/>
                     </check-permission>
                 </if-compare-field>
             </if-not-empty>
         </if-empty>
-       <if-not-empty field-name="_uploadedFile_fileName" map-name="parameters">                    
+       <if-not-empty field="parameters._uploadedFile_fileName">                    
            <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field-name="uploadPath"/>
            <log level="always" message="[createPartyContent] - Found Subdir : ${uploadPath}"/>
            <!-- locate the file extension to use based on mime-type -->
@@ -334,14 +334,14 @@
        </if-not-empty>
         
        <set-service-fields service-name="createContent" map-name="parameters" to-map-name="createContentMap"/>
-       <if-not-empty field-name="_uploadedFile_fileName" map-name="parameters">
+       <if-not-empty field="parameters._uploadedFile_fileName">
             <set from-field="dataResourceId" field="createContentMap.dataResourceId"/>
        </if-not-empty>
        <call-service service-name="createContent" in-map-name="createContentMap" break-on-error="false">
             <result-to-field result-name="contentId" field-name="contentId"/>
        </call-service>        
        <!-- create the content role -->
-       <if-not-empty field-name="partyId" map-name="parameters">
+       <if-not-empty field="parameters.partyId">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set-service-fields service-name="createContentRole" map-name="parameters" to-map-name="contentRole"/>
             <set from-field="contentId" field="contentRole.contentId"/>
@@ -353,12 +353,12 @@
             <make-value value-name="partyRole" entity-name="PartyRole"/>
             <set-pk-fields value-name="partyRole" map-name="contentRole"/>
             <find-by-and entity-name="PartyRole" map-name="partyRole" list-name="pRoles"/>
-            <if-empty field-name="pRoles">
+            <if-empty field="pRoles">
                 <set-service-fields service-name="createPartyRole" map-name="contentRole" to-map-name="partyRole"/>
                 <call-service service-name="createPartyRole" in-map-name="partyRole" break-on-error="false" />    
             </if-empty>
        </if-not-empty>      
-       <if-not-empty field-name="_uploadedFile_fileName" map-name="parameters">
+       <if-not-empty field="parameters._uploadedFile_fileName">
             <!-- store the file -->
             <set-service-fields service-name="createAnonFile" map-name="dataResourceMap" to-map-name="fileCtx"/>
             <set from-field="parameters.uploadedFile" field="fileCtx.binData"/>
@@ -372,18 +372,18 @@
     <!-- TODO: this method will be deleted in favor of new content methods and the PartyContentServices.xml -->
     <simple-method method-name="updatePartyContent" short-description="Creates Party Associated Content" login-required="false">
            <!-- make sure we are logged in when passing a partyId -->
-        <if-not-empty field-name="partyId" map-name="parameters">
-            <if-empty field-name="userLogin" map-name="parameters">
+        <if-not-empty field="parameters.partyId">
+            <if-empty field="parameters.userLogin">
                 <add-error><fail-property resource="PartyUiLabels" property="PartyPermissionErrorForThisParty"/></add-error>
                 <check-errors/>
             </if-empty>
         </if-not-empty>
 
         <!-- check permission when creating content on behalf of another party -->
-        <if-empty field-name="partyId" map-name="parameters">
-            <if-not-empty field-name="userLogin" map-name="parameters">
+        <if-empty field="parameters.partyId">
+            <if-not-empty field="parameters.userLogin">
                 <set from-field="userLogin.partyId" field="parameters.partyId"/>
-                <if-compare-field field-name="partyId" map-name="parameters" to-map-name="userLogin" operator="not-equals">
+                <if-compare-field to-field="userLogin." field="parameters.partyId" operator="not-equals">
                     <check-permission permission="PARTYMGR" action="_UPDATE">
                         <fail-property resource="PartyUiLabels" property="PartyPermissionErrorForThisParty"/>
                     </check-permission>
@@ -391,10 +391,10 @@
             </if-not-empty>
         </if-empty>
                 
-        <if-not-empty field-name="_uploadedFile_fileName" map-name="parameters">                    
+        <if-not-empty field="parameters._uploadedFile_fileName">                    
            <set from-field="parameters.contentId" field="lookupParam.contentId"/>
            <find-by-primary-key use-cache="true" entity-name="Content" value-name="content" map-name="lookupParam"/>
-           <if-not-empty field-name="dataResourceId" map-name="content">
+           <if-not-empty field="content.dataResourceId">
                <set-service-fields service-name="updateDataResource" map-name="parameters" to-map-name="dataResource"/>          
                <set from-field="content.dataResourceId" field="dataResource.dataResourceId"/>
                <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" />
@@ -417,7 +417,7 @@
                     <result-to-field result-name="dataResourceId" field-name="dataResourceId"/>
                 </call-service>
                 <set value="${uploadPath}/${dataResourceId}" field="dataResource.objectInfo"/>
-                <if-not-empty field-name="extension">
+                <if-not-empty field="extension">
                     <set value="${uploadPath}/${dataResourceId}.${extension.fileExtensionId}" field="dataResource.objectInfo"/>
                 </if-not-empty>
                 <set-service-fields service-name="updateDataResource" map-name="dataResource" to-map-name="dataResource"/>          
@@ -429,11 +429,11 @@
            </if-not-empty>          
        </if-not-empty>        
        <set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContentMap"/>
-       <if-not-empty field-name="dataResourceId">
+       <if-not-empty field="dataResourceId">
            <set from-field="dataResourceId" field="updateContentMap.dataResourceId" />
        </if-not-empty>
        <call-service service-name="updateContent" in-map-name="updateContentMap" break-on-error="false" />
-       <if-not-empty field-name="_uploadedFile_fileName" map-name="parameters">
+       <if-not-empty field="parameters._uploadedFile_fileName">
           <set-service-fields service-name="createAnonFile" map-name="dataResourceMap" to-map-name="fileCtx"/>
           <set from-field="parameters.uploadedFile" field="fileCtx.binData"/>
           <set from-field="dataResourceMap" field="fileCtx.dataResource"/>
@@ -458,7 +458,7 @@
             <get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-name="party"/>
             <field-to-list field-name="party" list-name="parties"/>
         </iterate>
-        <if-not-empty field-name="parties">  
+        <if-not-empty field="parties">  
             <field-to-result field-name="parties"/>
         </if-not-empty>        
     </simple-method>    
@@ -466,7 +466,7 @@
     <simple-method method-name="getParentOrganizations" short-description="Gets Parent Organizations for an Organization Party">
         <set from-field="parameters.organizationPartyId" field="relatedPartyIdList[]"/>
         <set from-field="parameters.getParentsOfParents" field="recurse"/>
-        <if-empty field-name="recurse"><set value="Y" field="recurse"/></if-empty>
+        <if-empty field="recurse"><set value="Y" field="recurse"/></if-empty>
         
         <set value="GROUP_ROLLUP" field="partyRelationshipTypeId"/>
         <set value="ORGANIZATION_UNIT" field="roleTypeIdFrom"/>
@@ -510,19 +510,19 @@
              - useCache (should be "true" or "false")
         -->
         
-        <if-empty field-name="nowTimestamp"><now-timestamp-to-env env-name="nowTimestamp"/></if-empty>
+        <if-empty field="nowTimestamp"><now-timestamp-to-env env-name="nowTimestamp"/></if-empty>
         
         <!-- only create these if they don't already exist, more efficient and avoids potential problems in recursed calls -->
-        <if-empty field-name="_inline_roleTypeIdFromList">
+        <if-empty field="_inline_roleTypeIdFromList">
             <field-to-list field-name="roleTypeIdFrom" list-name="_inline_roleTypeIdFromList"/>
-            <if-compare field-name="roleTypeIdFromInclueAllChildTypes" operator="equals" value="Y">
+            <if-compare field="roleTypeIdFromInclueAllChildTypes" operator="equals" value="Y">
                 <set value="_inline_roleTypeIdFromList" field="roleTypeIdListName"/>
                 <call-simple-method method-name="getChildRoleTypesInline"/>
             </if-compare>
         </if-empty>
-        <if-empty field-name="_inline_roleTypeIdToList">
+        <if-empty field="_inline_roleTypeIdToList">
             <field-to-list field-name="roleTypeIdTo" list-name="_inline_roleTypeIdToList"/>
-            <if-compare field-name="roleTypeIdToInclueAllChildTypes" operator="equals" value="Y">
+            <if-compare field="roleTypeIdToInclueAllChildTypes" operator="equals" value="Y">
                 <set value="_inline_roleTypeIdToList" field="roleTypeIdListName"/>
                 <call-simple-method method-name="getChildRoleTypesInline"/>
             </if-compare>
@@ -535,7 +535,7 @@
         
         <iterate entry-name="relatedPartyId" list-name="relatedPartyIdList">
             <if>
-                <condition><not><if-compare-field field-name="_inline_relatedPartyIdAlreadySearchedList" operator="contains" to-field-name="relatedPartyId"/></not></condition>
+                <condition><not><if-compare-field field="_inline_relatedPartyIdAlreadySearchedList" to-field="relatedPartyId" operator="contains"/></not></condition>
                 <then>
                     <field-to-list field-name="relatedPartyId" list-name="_inline_relatedPartyIdAlreadySearchedList"/>
                     
@@ -561,8 +561,8 @@
                         <if>
                             <condition>
                                 <and>
-                                    <not><if-compare-field field-name="relatedPartyIdList" operator="contains" to-field-name="_inline_PartyRelationship.partyIdTo"/></not>
-                                    <not><if-compare-field field-name="_inline_NewRelatedPartyIdList" operator="contains" to-field-name="_inline_PartyRelationship.partyIdTo"/></not>
+                                    <not><if-compare-field field="relatedPartyIdList" to-field="_inline_PartyRelationship.partyIdTo" operator="contains"/></not>
+                                    <not><if-compare-field field="_inline_NewRelatedPartyIdList" to-field="_inline_PartyRelationship.partyIdTo" operator="contains"/></not>
                                 </and>
                             </condition>
                             <then>
@@ -571,7 +571,7 @@
                         </if>
                     </iterate>
                     
-                    <if-compare field-name="includeFromToSwitched" operator="equals" value="Y">
+                    <if-compare field="includeFromToSwitched" operator="equals" value="Y">
                         <clear-field field-name="_inline_PartyRelationshipList"/>
                         <entity-condition entity-name="PartyRelationship" list-name="_inline_PartyRelationshipList" use-cache="${useCache}">
                             <condition-list combine="and">
@@ -594,8 +594,8 @@
                             <if>
                                 <condition>
                                     <and>
-                                        <not><if-compare-field field-name="relatedPartyIdList" operator="contains" to-field-name="_inline_PartyRelationship.partyIdFrom"/></not>
-                                        <not><if-compare-field field-name="_inline_NewRelatedPartyIdList" operator="contains" to-field-name="_inline_PartyRelationship.partyIdFrom"/></not>
+                                        <not><if-compare-field field="relatedPartyIdList" to-field="_inline_PartyRelationship.partyIdFrom" operator="contains"/></not>
+                                        <not><if-compare-field field="_inline_NewRelatedPartyIdList" to-field="_inline_PartyRelationship.partyIdFrom" operator="contains"/></not>
                                     </and>
                                 </condition>
                                 <then>
@@ -609,9 +609,9 @@
         </iterate>
         
         <!-- if we found new ones, add them to the master list and if recurse=Y then recurse -->
-        <if-not-empty field-name="_inline_NewRelatedPartyIdList">
+        <if-not-empty field="_inline_NewRelatedPartyIdList">
             <list-to-list list-name="_inline_NewRelatedPartyIdList" to-list-name="relatedPartyIdList"/>
-            <if-compare field-name="recurse" operator="equals" value="Y">
+            <if-compare field="recurse" operator="equals" value="Y">
                 <log level="verbose" message="Recursively calling followPartyRelationshipsInlineRecurse _inline_NewRelatedPartyIdList=${_inline_NewRelatedPartyIdList}"/>
                 <call-simple-method method-name="followPartyRelationshipsInlineRecurse"/>
             </if-compare>
@@ -629,7 +629,7 @@
         
         <iterate entry-name="roleTypeId" list-name="${roleTypeIdListName}">
             <if>
-                <condition><not><if-compare-field field-name="_inline_roleTypeIdAlreadySearchedList" operator="contains" to-field-name="roleTypeId"/></not></condition>
+                <condition><not><if-compare-field field="_inline_roleTypeIdAlreadySearchedList" to-field="roleTypeId" operator="contains"/></not></condition>
                 <then>
                     <field-to-list field-name="roleTypeId" list-name="_inline_roleTypeIdAlreadySearchedList"/>
                     
@@ -641,8 +641,8 @@
                         <if>
                             <condition>
                                 <and>
-                                    <not><if-compare-field field-name="${roleTypeIdListName}" operator="contains" to-field-name="newRoleType.roleTypeId"/></not>
-                                    <not><if-compare-field field-name="_inline_NewRoleTypeIdList" operator="contains" to-field-name="newRoleType.roleTypeId"/></not>
+                                    <not><if-compare-field field="${roleTypeIdListName}" to-field="newRoleType.roleTypeId" operator="contains"/></not>
+                                    <not><if-compare-field field="_inline_NewRoleTypeIdList" to-field="newRoleType.roleTypeId" operator="contains"/></not>
                                 </and>
                             </condition>
                             <then>
@@ -655,7 +655,7 @@
         </iterate>
         
         <!-- if we found some new types, add them to the main list -->
-        <if-not-empty field-name="_inline_NewRoleTypeIdList">
+        <if-not-empty field="_inline_NewRoleTypeIdList">
             <list-to-list list-name="_inline_NewRoleTypeIdList" to-list-name="${roleTypeIdListName}"/>
             <log level="verbose" message="Recursively calling getChildRoleTypesInline roleTypeIdListName=${roleTypeIdListName}, _inline_NewRoleTypeIdList=${_inline_NewRoleTypeIdList}"/>
             <call-simple-method method-name="getChildRoleTypesInline"/>
@@ -666,7 +666,7 @@
         <set field="findMap.partyId" from-field="parameters.partyId"/>
         <set field="findMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
         <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="emailAddressesAll"/>
-        <if-empty field-name="emailAddressesAll">
+        <if-empty field="emailAddressesAll">
             <set field="findMap.contactMechTypeId" value="ELECTRONIC_ADDRESS"/>
             <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="emailAddressesAll"/>
         </if-empty>
@@ -678,7 +678,7 @@
     
     <simple-method method-name="getPartyTelephone" short-description="Get the telephone number of the party">
         <set field="findMap.partyId" from-field="parameters.partyId"/>
-        <if-empty field-name="parameters.contactMechPurposeTypeId">
+        <if-empty field="parameters.contactMechPurposeTypeId">
             <!-- search in this order if not provided-->
             <set field="type" value="PRIMARY_PHONE"/><field-to-list field-name="type" list-name="types"/>
             <set field="type" value="PHONE_MOBILE"/><field-to-list field-name="type" list-name="types"/>
@@ -696,22 +696,22 @@
         <find-by-and entity-name="PartyContactDetailByPurpose" map-name="findMap" list-name="telephoneAll1"></find-by-and>
         <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/>
         <filter-list-by-date list-name="telephoneAll2" to-list-name="telephoneAll3"/>
-        <if-not-empty field-name="telephoneAll3">
+        <if-not-empty field="telephoneAll3">
             <iterate entry-name="type" list-name="types">
                 <iterate entry-name="telephone" list-name="telephoneAll3">
-                    <if-empty field-name="found">
-                        <if-compare-field field-name="telephone.contactMechPurposeTypeId" to-field-name="type" operator="equals">
+                    <if-empty field="found">
+                        <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals">
                             <set field="found" value="notImportant"/>
-                            <if-not-empty field-name="telephone.countryCode">
+                            <if-not-empty field="telephone.countryCode">
                                 <field-to-result map-name="telephone" field-name="countryCode"/>
                             </if-not-empty>
-                            <if-not-empty field-name="telephone.areaCode">
+                            <if-not-empty field="telephone.areaCode">
                                 <field-to-result map-name="telephone" field-name="areaCode"/>
                             </if-not-empty>
-                            <if-not-empty field-name="telephone.contactNumber">
+                            <if-not-empty field="telephone.contactNumber">
                                 <field-to-result map-name="telephone" field-name="contactNumber"/>
                             </if-not-empty>
-                            <if-not-empty field-name="telephone.extension">
+                            <if-not-empty field="telephone.extension">
                                 <field-to-result map-name="telephone" field-name="extension"/>
                             </if-not-empty>
                             <field-to-result map-name="telephone" field-name="contactMechPurposeTypeId"/>
@@ -723,16 +723,16 @@
                 <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="telephoneAll1"/>
                 <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2"/>
                 <first-from-list entry-name="telephone" list-name="telephoneAll2"/>
-                <if-not-empty field-name="telephone.tnCountryCode">
+                <if-not-empty field="telephone.tnCountryCode">
                     <field-to-result map-name="telephone" field-name="tnCountryCode" result-name="countryCode"/>
                 </if-not-empty>
-                <if-not-empty field-name="telephone.tnAreaCode">
+                <if-not-empty field="telephone.tnAreaCode">
                     <field-to-result map-name="telephone" field-name="tnAreaCode" result-name="areaCode"/>
                 </if-not-empty>
-                <if-not-empty field-name="telephone.tnContactNumber">
+                <if-not-empty field="telephone.tnContactNumber">
                     <field-to-result map-name="telephone" field-name="tnContactNumber" result-name="contactNumber"/>
                 </if-not-empty>
-                <if-not-empty field-name="telephone.extension">
+                <if-not-empty field="telephone.extension">
                     <field-to-result map-name="telephone" field-name="extension"/>
                 </if-not-empty>
             </else>
@@ -764,11 +764,11 @@
 
     <!-- PartyRelationship services -->
     <simple-method method-name="createPartyRelationship" short-description="createPartyRelationship">
-        <if-empty field-name="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
-        <if-empty field-name="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
-        <if-empty field-name="parameters.partyIdFrom"><set field="parameters.partyIdFrom" from-field="userLogin.partyId"/></if-empty>
+        <if-empty field="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
+        <if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
+        <if-empty field="parameters.partyIdFrom"><set field="parameters.partyIdFrom" from-field="userLogin.partyId"/></if-empty>
 
-        <if-empty field-name="parameters.fromDate"><now-timestamp-to-env env-name="parameters.fromDate"/></if-empty>
+        <if-empty field="parameters.fromDate"><now-timestamp-to-env env-name="parameters.fromDate"/></if-empty>
         
         <!-- check if not already exist -->
         <entity-and entity-name="PartyRelationship" list-name="partyRels" filter-by-date="true">
@@ -778,7 +778,7 @@
             <field-map field-name="roleTypeIdTo" env-name="parameters.roleTypeIdTo"/>
         </entity-and>
         
-        <if-empty field-name="partyRels">
+        <if-empty field="partyRels">
             <make-value value-name="newEntity" entity-name="PartyRelationship"/>
             <set-pk-fields map-name="parameters" value-name="newEntity"/>
             <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -786,16 +786,16 @@
         </if-empty>
     </simple-method>
     <simple-method method-name="updatePartyRelationship" short-description="updatePartyRelationship">
-        <if-empty field-name="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
-        <if-empty field-name="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
+        <if-empty field="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
+        <if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
         
         <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deletePartyRelationship" short-description="deletePartyRelationship">
-        <if-empty field-name="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
-        <if-empty field-name="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
+        <if-empty field="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
+        <if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
 
         <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -805,7 +805,7 @@
         <make-value entity-name="PartyCarrierAccount" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-        <if-empty field-name="newEntity.fromDate">
+        <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
         </if-empty>        
@@ -827,7 +827,7 @@
             </condition-list>
         </entity-condition>
         <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
-        <if-not-empty field-name="bodyScreenLocation" map-name="storeEmail">
+        <if-not-empty field="storeEmail.bodyScreenLocation">
             <entity-one entity-name="Person" value-name="person"/>
             <set field="bodyParameters.person" from-field="person"/>
             <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
@@ -852,8 +852,8 @@
             </condition-list>
         </entity-condition>
         <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
-        <if-not-empty field-name="bodyScreenLocation" map-name="storeEmail">
-            <if-not-empty field-name="parameters.updatedUserLogin.partyId">
+        <if-not-empty field="storeEmail.bodyScreenLocation">
+            <if-not-empty field="parameters.updatedUserLogin.partyId">
                 <set field="partyId" from-field="parameters.updatedUserLogin.partyId"/>
             <else>
                 <set field="partyId" from-field="parameters.partyId"/>
@@ -880,7 +880,7 @@
             <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
             <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
             
-            <if-not-empty field-name="emailParams.sendTo">
+            <if-not-empty field="emailParams.sendTo">
                 <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
                 <else>
                     <log level="warning" message="Tried to send Update Personal Info Notifcation with no to address; partyId is [${partyId}], subject is: ${emailParams.subject}"/>