svn commit: r741488 - in /ofbiz/trunk/applications/content/script/org/ofbiz/content: content/ContentEvents.xml content/ContentPermissionEvents.xml layout/LayoutEvents.xml

Author: jleroux
Date: Fri Feb  6 09:22:56 2009
New Revision: 741488

URL: http://svn.apache.org/viewvc?rev=741488&view=rev
Log:
<session-to-field field.*="(.*)" map.*="(.*)" session-name="(.*)"/> => <session-to-field field="$2.$1" session-name="$3"/>

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

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=741488&r1=741487&r2=741488&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 Fri Feb  6 09:22:56 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context3" session-name="userLogin"/>
+        <session-to-field field="context3.userLogin" 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=741488&r1=741487&r2=741488&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 Fri Feb  6 09:22:56 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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=741488&r1=741487&r2=741488&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 Fri Feb  6 09:22:56 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" 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="userLogin" map-name="context" session-name="userLogin"/>
+        <session-to-field field="context.userLogin" session-name="userLogin"/>
 
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
             <result-to-field result-name="contentId" field="contentId"/>