svn commit: r734023 - in /ofbiz/trunk/applications/party: data/ScheduledJobs.xml script/org/ofbiz/party/communication/CommunicationEventServices.xml servicedef/services.xml

[lektran]

Author: lektran
Date: Mon Jan 12 20:28:01 2009
New Revision: 734023

URL: http://svn.apache.org/viewvc?rev=734023&view=rev
Log:
Reverting some stuff that I accidentally committed to the type cleanup branch which then made it's way into the trunk

Modified:
    ofbiz/trunk/applications/party/data/ScheduledJobs.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/trunk/applications/party/servicedef/services.xml

Modified: ofbiz/trunk/applications/party/data/ScheduledJobs.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/ScheduledJobs.xml?rev=734023&r1=734022&r2=734023&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/ScheduledJobs.xml (original)
+++ ofbiz/trunk/applications/party/data/ScheduledJobs.xml Mon Jan 12 20:28:01 2009
@@ -22,28 +22,5 @@
 <entity-engine-xml>
     <!-- create recurring job to check email communication events with the status COM_IN_PROGRESS to send these emails.. -->
     <TemporalExpression tempExprId="SENDEMAIL" tempExprTypeId="FREQUENCY" integer1="12" integer2="5"/>
-    <RuntimeData runtimeDataId="TESTID">
-        <runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<ofbiz-ser>
-  <map-HashMap>
-    <map-Entry>
-      <map-Key>
-        <std-String value="cookie"/>
-      </map-Key>
-      <map-Value>
-        <std-Integer value="1"/>
-      </map-Value>
-    </map-Entry>
-    <map-Entry>
-      <map-Key>
-        <std-String value="runtimeDataId"/>
-      </map-Key>
-      <map-Value>
-        <std-String value="TESTID"/>
-      </map-Value>
-    </map-Entry>
-  </map-HashMap>
-</ofbiz-ser>
-        ]]></runtimeInfo>
-    </RuntimeData>    <JobSandbox jobId="SENDEMAIL" jobName="Send Email" runtimeDataId="TESTID" runTime="2000-01-01 00:00:00.000" serviceName="sendEmailDated" poolId="pool" runAsUser="system" tempExprId="SENDEMAIL" maxRecurrenceCount="-1"/>
+    <JobSandbox jobId="SENDEMAIL" jobName="Send Email" runTime="2000-01-01 00:00:00.000" serviceName="sendEmailDated" poolId="pool" runAsUser="system" tempExprId="SENDEMAIL" maxRecurrenceCount="-1"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=734023&r1=734022&r2=734023&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Mon Jan 12 20:28:01 2009
@@ -360,23 +360,6 @@
             <set-service-fields service-name="sendCommEventAsEmail" map="communicationEvent" to-map="inMap"/>
             <call-service service-name="sendCommEventAsEmail" in-map-name="inMap" require-new-transaction="true"/>
         </iterate>
-        <set field="cookie" from-field="parameters.cookie" type="Integer"/>
-        <calculate field="cookie" type="Integer">
-            <calcop operator="add">
-                <number value="1"/>
-                <calcop operator="get" field="cookie"/>
-            </calcop>
-        </calculate>
-        <set field="pk.runtimeDataId" value="TESTID"/>
-        <find-by-primary-key map="pk" value-field="runtimeData" entity-name="RuntimeData"/>
-        <set field="newData.runtimeDataId" from-field="pk.runtimeDataId"/>
-        <set field="newData.cookie" from-field="cookie"/>
-        <call-class-method method-name="serialize" class-name="org.ofbiz.entity.serialize.XmlSerializer" ret-field="dummy">
-            <field field="newData" type="Object"/>
-        </call-class-method>
-        <log level="always" message="${dummy}"></log>
-        <set field="runtimeData.runtimeInfo" from-field="dummy"/>
-        <store-value value-field="runtimeData"/>
     </simple-method>
 
     <simple-method method-name="allocateMsgToParty" short-description="Allocate an emailaddress to an existing/new party, update the communication event accordingly">

Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=734023&r1=734022&r2=734023&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Mon Jan 12 20:28:01 2009
@@ -793,8 +793,6 @@
     <service name="sendEmailDated" engine="simple" use-transaction="false"
         location="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="sendEmailDated" auth="true">
         <description>Checks for email communication events with the status COM_IN_PROGRESS and a startdate which is expired, then send the email</description>
-        <attribute name="cookie" mode="IN" type="Integer" optional="true"/>
-        <attribute name="runtimeDataId" mode="IN" type="String" optional="false"></attribute>
     </service>