You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/02/03 23:08:23 UTC
svn commit: r740474 - in /ofbiz/trunk/applications:
ecommerce/script/org/ofbiz/ecommerce/misc/
order/script/org/ofbiz/order/customer/
party/script/org/ofbiz/party/customer/ party/script/org/ofbiz/party/party/
party/script/org/ofbiz/party/user/ product/...
Author: jleroux
Date: Tue Feb 3 22:08:23 2009
New Revision: 740474
URL: http://svn.apache.org/viewvc?rev=740474&view=rev
Log:
Fix r740009
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Tue Feb 3 22:08:23 2009
@@ -55,7 +55,7 @@
processor-name="newAffilPostal" in-map-name="parameters" out-map-name="pa_context"/>
<check-errors/>
<call-service service-name="createPostalAddress" in-map-name="pa_context">
- <result-to-field result-name="contactMechId" field="parameters"/>
+ <result-to-field result-name="parameters.contactMechId"/>
</call-service>
<!-- Create the Postal Address Purpose -->
@@ -69,7 +69,7 @@
processor-name="newAffilPhone" in-map-name="parameters" out-map-name="ph_context"/>
<check-errors/>
<call-service service-name="createTelecomNumber" in-map-name="ph_context">
- <result-to-field result-name="contactMechId" field="parameters"/>
+ <result-to-field result-name="parameters.contactMechId"/>
</call-service>
<!-- Create the Phone ContactMech Purpose -->
@@ -85,7 +85,7 @@
<if-not-empty field="fax_context.contactNumber">
<call-service service-name="createTelecomNumber" in-map-name="fax_context">
- <result-to-field result-name="contactMechId" field="parameters"/>
+ <result-to-field result-name="parameters.contactMechId"/>
</call-service>
</if-not-empty>
@@ -102,7 +102,7 @@
processor-name="newAffilEmail" in-map-name="parameters" out-map-name="em_context"/>
<check-errors/>
<call-service service-name="createEmailAddress" in-map-name="em_context">
- <result-to-field result-name="contactMechId" field="parameters"/>
+ <result-to-field result-name="parameters.contactMechId"/>
</call-service>
<!-- Create the Email ContactMech Purpose -->
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Tue Feb 3 22:08:23 2009
@@ -206,7 +206,7 @@
<if-compare field="parameters.useAddress" operator="equals" value="true">
<set from-field="partyId" field="addressContext.partyId"/>
<call-service service-name="createPartyPostalAddress" in-map-name="addressContext">
- <result-to-field result-name="contactMechId" field="addressPurposeContext"/>
+ <result-to-field result-name="addressPurposeContext.contactMechId"/>
<result-to-request result-name="contactMechId"/>
</call-service>
<set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/>
@@ -229,7 +229,7 @@
<!-- call the create person service -->
<call-service service-name="createPerson" in-map-name="personMap">
- <result-to-field result-name="partyId" field="tempMap"/>
+ <result-to-field result-name="tempMap.partyId"/>
<result-to-request result-name="partyId"/>
</call-service>
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=740474&r1=740473&r2=740474&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 Tue Feb 3 22:08:23 2009
@@ -260,7 +260,7 @@
<set field="personUserLoginContext.currentPasswordVerify" from-field="newUserLogin.currentPassword" />
<!-- the above copy is okay since we checked already that they are the same -->
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
- <result-to-field result-name="partyId" field="tempMap"/>
+ <result-to-field result-name="tempMap.partyId"/>
<result-to-field field="createdUserLogin" result-name="newUserLogin"/>
</call-service>
<set-current-user-login value-field="createdUserLogin"/>
@@ -285,7 +285,7 @@
<!-- address not used, do nothing -->
<else>
<call-service service-name="createPartyPostalAddress" in-map-name="addressContext">
- <result-to-field result-name="contactMechId" field="addressPurposeContext"/>
+ <result-to-field result-name="addressPurposeContext.contactMechId"/>
</call-service>
<set field="addressPurposeContext.partyId" from-field="tempMap.partyId" />
<!-- create the shipping location -->
@@ -300,7 +300,7 @@
<!-- home phone -->
<if-not-empty field="parameters.CUSTOMER_HOME_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
- <result-to-field result-name="contactMechId" field="homePhonePurposeContext"/>
+ <result-to-field result-name="homePhonePurposeContext.contactMechId"/>
</call-service>
<set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" />
@@ -310,7 +310,7 @@
<!-- work phone -->
<if-not-empty field="parameters.CUSTOMER_WORK_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
- <result-to-field result-name="contactMechId" field="workPhonePurposeContext"/>
+ <result-to-field result-name="workPhonePurposeContext.contactMechId"/>
</call-service>
<set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" />
@@ -320,7 +320,7 @@
<!-- fax phone -->
<if-not-empty field="parameters.CUSTOMER_FAX_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
- <result-to-field result-name="contactMechId" field="faxPhonePurposeContext"/>
+ <result-to-field result-name="faxPhonePurposeContext.contactMechId"/>
</call-service>
<set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" />
@@ -330,7 +330,7 @@
<!-- mobile phone -->
<if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
- <result-to-field result-name="contactMechId" field="mobilePhonePurposeContext"/>
+ <result-to-field result-name="mobilePhonePurposeContext.contactMechId"/>
</call-service>
<set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" />
@@ -339,7 +339,7 @@
<!-- email address -->
<call-service service-name="createPartyEmailAddress" in-map-name="emailContext">
- <result-to-field result-name="contactMechId" field="emailPurposeContext"/>
+ <result-to-field result-name="emailPurposeContext.contactMechId"/>
</call-service>
<set field="emailPurposeContext.partyId" from-field="tempMap.partyId" />
<set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml Tue Feb 3 22:08:23 2009
@@ -77,7 +77,7 @@
<set-service-fields service-name="createPerson" map-name="parameters" to-map-name="createPersonCtx"/>
<call-service service-name="createPerson" in-map-name="createPersonCtx">
- <result-to-field result-name="partyId" field="createUlInMap"/>
+ <result-to-field result-name="createUlInMap.partyId"/>
</call-service>
<!-- call the service with the system account to get around security constraints for this special create -->
@@ -186,7 +186,7 @@
<set field="postalAddressContext.partyId" from-field="partyId"/>
<set field="postalAddressContext.contactMechPurposeTypeId" value="GENERAL_LOCATION"/>
<call-service service-name="createPartyPostalAddress" in-map-name="postalAddressContext">
- <result-to-field result-name="contactMechId" field="postalAddressContext"/>
+ <result-to-field result-name="postalAddressContext.contactMechId"/>
</call-service>
<if-not-empty field="postalAddContactMechPurpTypeId">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Feb 3 22:08:23 2009
@@ -293,7 +293,7 @@
<check-errors/>
<call-service service-name="createPerson" in-map-name="personContext">
- <result-to-field result-name="partyId" field="tempMap"/>
+ <result-to-field result-name="tempMap.partyId"/>
</call-service>
<!-- now that we have the partyId, put it where it needs to go... -->
@@ -329,7 +329,7 @@
<!-- address not used, do nothing -->
<else>
<call-service service-name="createPartyPostalAddress" in-map-name="addressContext">
- <result-to-field result-name="contactMechId" field="addressPurposeContext"/>
+ <result-to-field result-name="addressPurposeContext.contactMechId"/>
</call-service>
<set field="addressPurposeContext.partyId" from-field="tempMap.partyId" />
<!-- create the shipping location -->
@@ -344,7 +344,7 @@
<!-- home phone -->
<if-not-empty field="parameters.USER_HOME_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
- <result-to-field result-name="contactMechId" field="homePhonePurposeContext"/>
+ <result-to-field result-name="homePhonePurposeContext.contactMechId"/>
</call-service>
<set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" />
@@ -354,7 +354,7 @@
<!-- work phone -->
<if-not-empty field="parameters.USER_WORK_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
- <result-to-field result-name="contactMechId" field="workPhonePurposeContext"/>
+ <result-to-field result-name="workPhonePurposeContext.contactMechId"/>
</call-service>
<set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" />
@@ -364,7 +364,7 @@
<!-- fax phone -->
<if-not-empty field="parameters.USER_FAX_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
- <result-to-field result-name="contactMechId" field="faxPhonePurposeContext"/>
+ <result-to-field result-name="faxPhonePurposeContext.contactMechId"/>
</call-service>
<set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" />
@@ -374,7 +374,7 @@
<!-- mobile phone -->
<if-not-empty field="parameters.USER_MOBILE_CONTACT">
<call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
- <result-to-field result-name="contactMechId" field="mobilePhonePurposeContext"/>
+ <result-to-field result-name="mobilePhonePurposeContext.contactMechId"/>
</call-service>
<set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" />
<set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" />
@@ -384,7 +384,7 @@
<!-- email address -->
<if-not-empty field="parameters.USER_EMAIL">
<call-service service-name="createPartyEmailAddress" in-map-name="emailContext">
- <result-to-field result-name="contactMechId" field="emailPurposeContext"/>
+ <result-to-field result-name="emailPurposeContext.contactMechId"/>
</call-service>
<set field="emailPurposeContext.partyId" from-field="tempMap.partyId" />
<set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Feb 3 22:08:23 2009
@@ -94,7 +94,7 @@
<set-service-fields service-name="createProductContent" map="parameters" to-map="createProductContentMap"/>
<set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
<call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
- <result-to-field result-name="contentId" field="createProductContentMap"/>
+ <result-to-field result-name="createProductContentMap.contentId"/>
</call-service>
<call-service service-name="createProductContent" in-map-name="createProductContentMap"/>
</simple-method>
@@ -107,7 +107,7 @@
<simple-method method-name="createSimpleTextContentForAlternateLocale" short-description="Create Simple Text Content For Alternate Locale">
<set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
<call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
- <result-to-field result-name="contentId" field="createContentAssocMap.contentIdTo"/>
+ <result-to-field result-name="createContentAssocMap.contentIdTo.contentId"/>
</call-service>
<set field="createContentAssocMap.contentId" from-field="parameters.mainContentId"/>
<set field="createContentAssocMap.contentAssocTypeId" value="ALTERNATE_LOCALE"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Feb 3 22:08:23 2009
@@ -32,7 +32,7 @@
<set field="createContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" />
<call-service service-name="createContactMech" in-map-name="createContactMechMap">
<default-message>Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
<log level="info" message="ContactMech created"/>
<else>
@@ -77,7 +77,7 @@
<call-service service-name="updateContactMech" in-map-name="updateContactMechMap">
<default-message>Contact Mechanism successfully updated.</default-message>
- <result-to-field result-name="contactMechId" field="newFacilityContactMech"/>
+ <result-to-field result-name="newFacilityContactMech.contactMechId"/>
</call-service>
<else>
<set field="newFacilityContactMech.contactMechId" from-field="parameters.newContactMechId"/>
@@ -149,7 +149,7 @@
<call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
<default-message>Postal Address successfully created</default-message>
- <result-to-field result-name="contactMechId" field="newFacilityContactMech"/>
+ <result-to-field result-name="newFacilityContactMech.contactMechId"/>
</call-service>
<check-errors/>
@@ -197,7 +197,7 @@
<call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
<default-message>Telecom number successfully created</default-message>
- <result-to-field result-name="contactMechId" field="newFacilityContactMech"/>
+ <result-to-field result-name="newFacilityContactMech.contactMechId"/>
</call-service>
<set-service-fields service-name="createFacilityContactMech" map="parameters" to-map="createFacilityContactMechMap"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=740474&r1=740473&r2=740474&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Feb 3 22:08:23 2009
@@ -322,14 +322,14 @@
<set-service-fields service-name="createPartyContactMech" map="parameters" to-map="context"/>
<call-service service-name="createPartyContactMech" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
<set-service-fields service-name="createContactMech" map="parameters" to-map="context"/>
<call-service service-name="createContactMech" in-map-name="context">
<default-message>Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
<log level="info" message="ContactMech created"/>
</else>
@@ -366,7 +366,7 @@
<log level="info" message="Calling generic updateContactMech method"/>
<call-service service-name="updateContactMech" in-map-name="context">
<default-message>Contact Mechanism successfully updated.</default-message>
- <result-to-field result-name="contactMechId" field="newWorkEffortContactMech"/>
+ <result-to-field result-name="newWorkEffortContactMech.contactMechId"/>
</call-service>
<else>
<set from-field="parameters.newContactMechId" field="newWorkEffortContactMech.contactMechId"/>
@@ -401,7 +401,7 @@
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service service-name="createPartyPostalAddress" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
@@ -409,7 +409,7 @@
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="createPostalAddress">
<default-message>Postal Address successfully created</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
</else>
</if-not-empty>
@@ -453,7 +453,7 @@
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service service-name="createPartyTelecomNumber" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
@@ -461,7 +461,7 @@
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="createTelecomNumber">
<default-message>Telecom number successfully created</default-message>
- <result-to-field result-name="contactMechId" field="newValue"/>
+ <result-to-field result-name="newValue.contactMechId"/>
</call-service>
</else>
</if-not-empty>