I merged, your changes already commited with mine, but it seems that because I used Toirtoise (on Windows) its merger did not take
care correctly of EOLs. Weird though, because it's the 1st time I cross such issue. I will take care next time...
> Author: mor
> Date: Mon Feb 2 18:32:40 2009
> New Revision: 740063
>
> URL:
http://svn.apache.org/viewvc?rev=740063&view=rev> Log:
> Formatting changes only, I think I was too early then Jacques committing similar simple-methods cleanups little later :)
>
> Modified:
> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
>
> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
> URL:
>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=740063&r1=740062&r2=740063&view=diff> ==============================================================================
> --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
> +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Feb 2 18:32:40 2009
> @@ -448,7 +448,9 @@
> <!-- see if we should continue now... -->
> <check-errors/>
> <log level="info" message="Setting up party ${tempMap.partyId} and shipping address ${addressPurposeContext} in cart"/>
> - <session-to-field field="cart" session-name="shoppingCart"/> <session-to-field field="userLogin"/> <log
> level="info" message="userLogin in Env ${userLogin} in parameters.userLogin ${parameters.userLogin}"/>
> + <session-to-field field="cart" session-name="shoppingCart"/>
> + <session-to-field field="userLogin"/>
> + <log level="info" message="userLogin in Env ${userLogin} in parameters.userLogin ${parameters.userLogin}"/>
> <if-empty field="userLogin">
> <call-object-method obj-field="session" method-name="removeAttribute">
> <string value="autoUserLogin"/>
> @@ -998,7 +1000,9 @@
> <call-service service-name="updatePassword" in-map-name="passwordCtx">
> <result-to-field result-name="updatedUserLogin"/>
> </call-service>
> - <set-current-user-login value-field="updatedUserLogin"/> <session-to-field field="userLogin"/>
> <if-compare field="userLogin.userLoginId" operator="equals" value="${updatedUserLogin.userLoginId}">
> + <set-current-user-login value-field="updatedUserLogin"/>
> + <session-to-field field="userLogin"/>
> + <if-compare field="userLogin.userLoginId" operator="equals" value="${updatedUserLogin.userLoginId}">
> <field-to-session field="updatedUserLogin" session-name="userLogin"/>
> </if-compare>
> <session-to-field field="userLogin"/>
>
> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
> URL:
>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=740063&r1=740062&r2=740063&view=diff> ==============================================================================
> --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
> +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Mon Feb 2 18:32:40 2009
> @@ -496,7 +496,9 @@
>
> <call-simple-method method-name="createUpdateUser"/>
> <!-- see if we should continue now... -->
> - <session-to-field field="cart" session-name="shoppingCart"/> <session-to-field field="userLogin"/>
> <if-empty field="userLogin">
> + <session-to-field field="cart" session-name="shoppingCart"/>
> + <session-to-field field="userLogin"/>
> + <if-empty field="userLogin">
> <call-object-method obj-field="session" method-name="removeAttribute">
> <string value="autoUserLogin"/>
> </call-object-method>
>
>
Locked
