svn commit: r740035 - in /ofbiz/trunk/applications: content/script/org/ofbiz/content/content/ content/script/org/ofbiz/content/layout/ ecommerce/script/org/ofbiz/ecommerce/customer/ order/script/org/ofbiz/order/customer/ party/script/org/ofbiz/party/cu...

Author: jleroux
Date: Mon Feb  2 16:55:53 2009
New Revision: 740035

URL: http://svn.apache.org/viewvc?rev=740035&view=rev
Log:
<call-object-method obj-field="(.*)" obj-map="(.*)" method-name="(.*)" ret-field="(.*)" ret-map="(.*)"/> => <call-object-method obj-field="$2.$1" method-name="$3" ret-field="$5.$4"/>
<call-object-method obj-field="(.*)" obj-map-name="(.*)" method-name="(.*)" ret-field="(.*)" ret-map-name="(.*)"/> => <call-object-method obj-field="$2.$1" method-name="$3" ret-field="$5.$4"/>
<session-to-field field-name => <session-to-field field

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
    ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.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/user/UserEvents.xml
    ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?rev=740035&r1=740034&r2=740035&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Mon Feb  2 16:55:53 2009
@@ -49,7 +49,7 @@
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <string-to-list list="targetOperationList" string="CONTENT_CREATE"/>
         <set field="context.targetOperationList" from-field="targetOperationList"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <call-service in-map-name="context" service-name="createContent">
             <result-to-field field="contentId" result-name="contentId"/>
@@ -111,7 +111,7 @@
         <set field="context.contentPurposeList" from-field="contentPurposeList"/>
         <string-to-list list="targetOperationList" string="CONTENT_UPDATE"/>
         <set field="context.targetOperationList" from-field="targetOperationList"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
         <call-service in-map-name="context" service-name="updateContent">
             <result-to-field field="contentId" result-name="contentId"/>
         </call-service>
@@ -126,7 +126,7 @@
         <set field="context3.contentIdTo" from-field="parameters.contentIdTo"/>
         <set field="context3.contentIdFrom" from-field="parameters.contentId"/>
         <set field="context3.contentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
-        <session-to-field field-name="userLogin" map-name="context3" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context3" session-name="userLogin"/>
         <string-to-list list="contentPurposeList" string="_NA_"/>
         <set field="context3.contentPurposeList" from-field="contentPurposeList"/>
         <string-to-list list="targetOperationList" string="ASSOC_CONTENT"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=740035&r1=740034&r2=740035&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Mon Feb  2 16:55:53 2009
@@ -37,7 +37,7 @@
         <set field="context.contentPurposeList" from-field="contentPurposeList"/>
         <set field="context.targetOperationList" from-field="targetOperationList"/>
         <set field="context.currentContent" from-field="currentContent"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <call-service in-map-name="context" service-name="checkContentPermission">
             <result-to-field field="permissionStatus" result-name="permissionStatus"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=740035&r1=740034&r2=740035&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Mon Feb  2 16:55:53 2009
@@ -33,7 +33,7 @@
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <string-to-list list="targetOperationList" string="CONTENT_CREATE"/>
         <set field="context.targetOperationList" from-field="targetOperationList"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
         <set field="context.objectInfo" from-field="parameters.drObjectInfo"/>
         <set field="context.dataResourceTypeId" value="LOCAL_FILE"/>
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
@@ -62,7 +62,7 @@
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <string-to-list list="targetOperationList" string="CONTENT_CREATE"/>
         <set field="context.targetOperationList" from-field="targetOperationList"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
         <call-service in-map-name="context" service-name="checkContentPermission">
             <result-to-field field="permissionStatus" result-name="permissionStatus"/>
         </call-service>
@@ -105,7 +105,7 @@
         <set field="context.contentIdTo" from-field="parameters.contentIdTo"/>
         <set field="context.textData" from-field="parameters.textData"/>
 
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <set field="context.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
         <set field="context.mimeTypeId" value="text/plain"/>
@@ -163,7 +163,7 @@
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <set field="context.contentIdTo" from-field="parameters.contentIdTo"/>
         <set field="context.textData" from-field="parameters.textData"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
             <result-to-field result-name="contentId" field="contentId"/>
@@ -201,7 +201,7 @@
         <set field="context.contentPurposeTypeId" from-field="formInput.contentPurposeTypeId"/>
         <set field="context.contentIdTo" from-field="formInput.contentIdTo"/>
 
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <set field="context.dataResourceTypeId" value="IMAGE_OBJECT"/>
         <set field="context.mimeTypeId" value="text/plain"/>
@@ -259,7 +259,7 @@
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <set field="context.contentIdTo" from-field="parameters.contentIdTo"/>
 
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <set field="context.dataResourceTypeId" value="URL_RESOURCE"/>
         <set field="context.mimeTypeId" value="text/plain"/>
@@ -316,7 +316,7 @@
         <set field="context.dataResourceName" from-field="context.contentName"/>
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <set field="context.contentIdTo" from-field="parameters.contentIdTo"/>
-        <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="userLogin" map-name="context" session-name="userLogin"/>
 
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
             <result-to-field result-name="contentId" field="contentId"/>

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=740035&r1=740034&r2=740035&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 16:55:53 2009
@@ -448,9 +448,7 @@
         <!-- 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"/>
@@ -1000,9 +998,7 @@
                 <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=740035&r1=740034&r2=740035&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 16:55:53 2009
@@ -496,9 +496,7 @@
         
         <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>

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=740035&r1=740034&r2=740035&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 Mon Feb  2 16:55:53 2009
@@ -238,7 +238,7 @@
             <set field="ulLookup.userLoginId" value="anonymous"/>
             <find-by-primary-key entity-name="UserLogin" map="ulLookup" value-field="userLogin"/>
             <set field="userLogin.partyId" from-field="tempMap.partyId"/>
-            <set-current-user-login value-name="userLogin"/>
+            <set-current-user-login value-field="userLogin"/>
             <else><!-- of an anonymous vistor is coming back, update the party id in the userLogin object -->
                 <if-compare field="userLogin.userLoginId" value="anonymous" operator="equals">
                     <set field="userLogin.partyId" from-field="tempMap.partyId"/>

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=740035&r1=740034&r2=740035&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 Mon Feb  2 16:55:53 2009
@@ -40,11 +40,12 @@
 
         <!-- if username and/or password should be lowercased, do that now -->
         <if-compare field="username_lowercase" operator="equals" value="true">
-            <call-object-method obj-field="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/>
+            <call-object-method obj-field="" method-name="" ></call-object-method>
+            <call-object-method obj-field="parameters.USERNAME" method-name="toLowerCase" ret-field="parameters.USERNAME"/>
         </if-compare>
         <if-compare field="password_lowercase" operator="equals" value="true">
-            <call-object-method obj-field="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/>
-            <call-object-method obj-field="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/>
+            <call-object-method obj-field="parameters.PASSWORD" method-name="toLowerCase" ret-field="parameters.PASSWORD"/>
+            <call-object-method obj-field="parameters.CONFIRM_PASSWORD" method-name="toLowerCase" ret-field="parameters.CONFIRM_PASSWORD"/>
         </if-compare>
 
         <!-- Create the UserLogin Record -->
@@ -247,7 +248,7 @@
         <set field="partyDataSource.fromDate" from-field="nowStamp" />
         <set field="partyDataSource.isCreate" value="Y" />
         <!-- get the visit from the session to get the visitId -->
-        <session-to-field field-name="visit"/>
+        <session-to-field field="visit"/>
     <set from-field="visit.visitId" field="partyDataSource.visitId"/>
 
 
@@ -262,7 +263,7 @@
             <result-to-field result-name="partyId" field="tempMap"/>
             <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
         </call-service>
-        <set-current-user-login value-name="createdUserLogin"/>
+        <set-current-user-login value-field="createdUserLogin"/>
 
         <!-- now that we have the partyId, put it where it needs to go... -->
         <set field="partyDataSource.partyId" from-field="tempMap.partyId" />

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=740035&r1=740034&r2=740035&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 Mon Feb  2 16:55:53 2009
@@ -71,11 +71,11 @@
 
         <!-- if username and/or password should be lowercased, do that now -->
         <if-compare field="username_lowercase" operator="equals" value="true">
-            <call-object-method obj-field="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/>
+            <call-object-method obj-field="parameters.USERNAME" method-name="toLowerCase" ret-field="parameters.USERNAME"/>
         </if-compare>
         <if-compare field="password_lowercase" operator="equals" value="true">
-            <call-object-method obj-field="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/>
-            <call-object-method obj-field="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/>
+            <call-object-method obj-field="parameters.PASSWORD" method-name="toLowerCase" ret-field="parameters.PASSWORD"/>
+            <call-object-method obj-field="parameters.CONFIRM_PASSWORD" method-name="toLowerCase" ret-field="parameters.CONFIRM_PASSWORD"/>
         </if-compare>
 
         <!-- Create the UserLogin Record -->
@@ -286,7 +286,7 @@
         <set field="partyDataSource.fromDate" from-field="nowStamp" />
         <set field="partyDataSource.isCreate" value="Y" />
         <!-- get the visit from the session to get the visitId -->
-        <session-to-field field-name="visit"/>
+        <session-to-field field="visit"/>
         <set from-field="visit.visitId" field="partyDataSource.visitId"/>
 
         <!-- now that everything is validated & setup, check to see if there are errors, then call the services -->
@@ -318,7 +318,7 @@
             <!-- create the UserLogin manually to get around ordering and security constraints in the service -->
             <set field="newUserLogin.partyId" from-field="tempMap.partyId" />
             <create-value value-field="newUserLogin"/>
-            <set-current-user-login value-name="newUserLogin"/>
+            <set-current-user-login value-field="newUserLogin"/>
         </if-not-empty>
 
         <create-value value-field="partyDataSource"/>

Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml?rev=740035&r1=740034&r2=740035&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml Mon Feb  2 16:55:53 2009
@@ -35,7 +35,7 @@
             <default-message resource="SecurityextUiLabels" property="loginmapprocs.password_successfully_updated"/>
             <result-to-field result-name="updatedUserLogin" field="updatedUserLogin"/>
         </call-service>
-        <session-to-field field-name="userLogin"/>
+        <session-to-field field="userLogin"/>
         <if-compare-field field="userLogin.userLoginId" operator="equals" to-field="updatedUserLogin.userLoginId">
             <field-to-session field-name="updatedUserLogin" session-name="userLogin"/>
         </if-compare-field>