Author: jacopoc
Date: Sat Aug 21 05:50:29 2010
New Revision: 987700

URL: http://svn.apache.org/viewvc?rev=987700&view=rev
Log:
Simlified service definitions for CRUD operations on the TechDataCalendar* 
entities: this fixes some errors happening when the week and exception week 
were edited. Backported from rev. 987698 and 981865


Modified:
    
ofbiz/branches/release10.04/applications/manufacturing/servicedef/services_calendar.xml

Modified: 
ofbiz/branches/release10.04/applications/manufacturing/servicedef/services_calendar.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/servicedef/services_calendar.xml?rev=987700&r1=987699&r2=987700&view=diff
==============================================================================
--- 
ofbiz/branches/release10.04/applications/manufacturing/servicedef/services_calendar.xml
 (original)
+++ 
ofbiz/branches/release10.04/applications/manufacturing/servicedef/services_calendar.xml
 Sat Aug 21 05:50:29 2010
@@ -24,114 +24,74 @@ under the License.
     <version>1.0</version>
 
     <!-- Routing services -->
-    <service name="createCalendar" engine="simple"
+    <service name="createCalendar" engine="simple" 
default-entity-name="TechDataCalendar"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="createCalendar">
         <description>Create a calendar</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendar" engine="simple"
+    <service name="updateCalendar" engine="simple" 
default-entity-name="TechDataCalendar"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="updateCalendar">
         <description>Update a calendar</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendar" engine="simple"
+    <service name="removeCalendar" engine="simple" 
default-entity-name="TechDataCalendar"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="removeCalendar">
         <description>Remove a calendar</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createCalendarWeek" engine="simple"
+    <service name="createCalendarWeek" engine="simple" 
default-entity-name="TechDataCalendarWeek"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="createCalendarWeek">
         <description>Create a Calendar Week</description>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="mondayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="mondayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="tuesdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="tuesdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="wednesdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="wednesdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="thursdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="thursdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="fridayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="fridayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="saturdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="saturdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="sundayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="sundayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendarWeek" engine="simple"
+    <service name="updateCalendarWeek" engine="simple" 
default-entity-name="TechDataCalendarWeek"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="updateCalendarWeek">
         <description>Update a Calendar Week</description>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="mondayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="mondayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="tuesdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="tuesdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="wednesdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="wednesdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="thursdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="thursdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="fridayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="fridayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="saturdayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="saturdayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
-        <attribute name="sundayStartTime" type="java.sql.Time" mode="IN" 
optional="true"/>
-        <attribute name="sundayCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendarWeek" engine="simple"
+    <service name="removeCalendarWeek" engine="simple" 
default-entity-name="TechDataCalendarWeek"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="removeCalendarWeek">
         <description>Remove a Calendar Week</description>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createCalendarExceptionDay" engine="simple"
+    <service name="createCalendarExceptionDay" engine="simple" 
default-entity-name="TechDataCalendarExcDay"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="createCalendarExceptionDay">
         <description>Create a calendar ExceptionDay</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" 
mode="IN" optional="false"/>
-        <attribute name="exceptionCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendarExceptionDay" engine="simple"
+    <service name="updateCalendarExceptionDay" engine="simple" 
default-entity-name="TechDataCalendarExcDay"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="updateCalendarExceptionDay">
         <description>Update a calendar ExceptionDay</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" 
mode="IN" optional="false"/>
-        <attribute name="exceptionCapacity" type="BigDecimal" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendarExceptionDay" engine="simple"
+    <service name="removeCalendarExceptionDay" engine="simple" 
default-entity-name="TechDataCalendarExcDay"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="removeCalendarExceptionDay">
         <description>Update a calendar ExceptionDay</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" 
mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="createCalendarExceptionWeek" engine="simple"
+    <service name="createCalendarExceptionWeek" engine="simple" 
default-entity-name="TechDataCalendarExcWeek"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="createCalendarExceptionWeek">
         <description>Create a Calendar Exception Week</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStart" type="java.sql.Date" mode="IN" 
optional="false"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendarExceptionWeek" engine="simple"
+    <service name="updateCalendarExceptionWeek" engine="simple" 
default-entity-name="TechDataCalendarExcWeek"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="updateCalendarExceptionWeek">
         <description>Update a Calendar Exception Week</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStart" type="java.sql.Date" mode="IN" 
optional="false"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" 
optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendarExceptionWeek" engine="simple"
+    <service name="removeCalendarExceptionWeek" engine="simple" 
default-entity-name="TechDataCalendarExcWeek"
             
location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml"
 invoke="removeCalendarExceptionWeek">
         <description>Remove a Calendar Exception Week</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="exceptionDateStart" type="java.sql.Date" mode="IN" 
optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 </services>


Reply via email to