svn commit: r730897 - /ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml

[hansbak-2]

Author: hansbak
Date: Fri Jan  2 18:55:52 2009
New Revision: 730897

URL: http://svn.apache.org/viewvc?rev=730897&view=rev
Log:
minilanguage syntax changes

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730897&r1=730896&r2=730897&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Fri Jan  2 18:55:52 2009
@@ -28,7 +28,7 @@
         <set-pk-fields value-field="content" map="parameters"/>
 
         <if-empty field="parameters.contentId">
-            <sequenced-id-to-env sequence-name="Content" env-name="content.contentId"/>
+            <sequenced-id sequence-name="Content" field="content.contentId"/>
         </if-empty>
 
         <if-empty field="content.statusId">
@@ -41,7 +41,7 @@
             <set field="content.statusId" from-field="statusItem.statusId"/>
         </if-empty>
 
-        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <now-timestamp field="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
         <set field="content.createdByUserLogin" from-field="userLogin.userLoginId"/>
         <set field="content.lastModifiedDate" from-field="nowTimestamp"/>
@@ -55,7 +55,7 @@
         <entity-one entity-name="Content" value-field="content" auto-field-map="true"/>
         <set-nonpk-fields value-field="content" map="parameters"/>
 
-        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <now-timestamp field="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
         <set field="content.lastModifiedDate" from-field="nowTimestamp"/>
 
@@ -77,7 +77,7 @@
         <set-pk-fields value-field="assoc" map="parameters"/>
         <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
 
-        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <now-timestamp field="nowTimestamp"/>
         <if-empty field="assoc.fromDate">
             <set field="assoc.fromDate" from-field="nowTimestamp"/>
         </if-empty>
@@ -96,7 +96,7 @@
         <entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/>
         <set-nonpk-fields value-field="assoc" map="parameters"/>
 
-        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <now-timestamp field="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
         <set field="content.lastModifiedDate" from-field="nowTimestamp"/>
 
@@ -208,11 +208,11 @@
             <set from-field="parameters.contentAssocTypeId" field="newContentAssoc.contentAssocTypeId"/>
             <set from-field="newUserLogin.userLoginId" field="newContentAssoc.createdByUserLogin"/>
             <set from-field="newUserLogin.userLoginId" field="newContentAssoc.lastModifiedByUserLogin"/>
-            <now-timestamp-to-env env-name="newContentAssoc.createdDate"/>
-            <now-timestamp-to-env env-name="newContentAssoc.lastModifiedDate"/>
+            <now-timestamp field="newContentAssoc.createdDate"/>
+            <now-timestamp field="newContentAssoc.lastModifiedDate"/>
             
             <if-empty field="parameters.fromDate">
-                <now-timestamp-to-env env-name="parameters.fromDate"/>
+                <now-timestamp field="parameters.fromDate"/>
                 <to-string field="parameters.fromDate"/>
             </if-empty>
             <set from-field="parameters.fromDate" field="newContentAssoc.fromDate"/>
@@ -248,7 +248,7 @@
     <!-- Methods for ContentRole -->
     <simple-method method-name="createContentRole" short-description="Create Content Role">
         <if-empty field="parameters.fromDate">
-            <now-timestamp-to-env env-name="parameters.fromDate"/>
+            <now-timestamp field="parameters.fromDate"/>
         </if-empty>
         <make-value value-field="partyRolePK" entity-name="PartyRole"/>
         <set-pk-fields value-field="partyRolePK" map="parameters"/>
@@ -283,7 +283,7 @@
         <find-by-and entity-name="ContentRole" map="lookupKeyValue" list="roleList"/>
         <iterate entry="contentRoleMap" list="roleList">
             <make-value entity-name="ContentRole" value-field="role" map="contentRoleMap"/>
-            <now-timestamp-to-env env-name="role.thruDate"/>
+            <now-timestamp field="role.thruDate"/>
             <store-value value-field="role"/>
         </iterate>
     </simple-method>
@@ -720,8 +720,8 @@
         <set from-field="parameters.newTopicDescription" field="content.description" />
         <set value="TOPIC" field="content.contentTypeId" />
         
-        <now-timestamp-to-env env-name="content.lastModifiedDate"/>
-        <now-timestamp-to-env env-name="content.createdDate"/>
+        <now-timestamp field="content.lastModifiedDate"/>
+        <now-timestamp field="content.createdDate"/>
         <set from-field="parameters.userLogin.userLoginId" field="content.lastModifiedByUserLogin"/>
         <set from-field="parameters.userLogin.userLoginId" field="content.createdByUserLogin"/>
 
@@ -776,7 +776,7 @@
         <check-errors/>
  -->
 
-        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <now-timestamp field="nowTimestamp"/>
  <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
  <!-- let's take a guess at what the dataResourceTypeId should be if it is empty -->
  <if-empty field="persistIn.dataResourceTypeId">
@@ -843,7 +843,7 @@
  <set-pk-fields value-field="commEventContentAssoc" map="parameters"/>
  <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
  <if-empty field="commEventContentAssoc.fromDate">
-    <now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/>
+    <now-timestamp field="commEventContentAssoc.fromDate"/>
  </if-empty>
  <create-value value-field="commEventContentAssoc" />
  <field-to-result field="commEventContentAssoc.fromDate" result-name="fromDate"/>