Author: jleroux
Date: Mon Sep 1 08:16:43 2014
New Revision: 1621699
URL: http://svn.apache.org/r1621699
Log:
A patch from Nicolas Malin for "Convert CostComponent and Subscription entites
CRUD service from simple to entity-auto"
https://issues.apache.org/jira/browse/OFBIZ-5742
I converted CRUD service to entity-auto for :
CostComponent
Subscription (only update)
SubscriptionResource
SubscriptionCommEvent
I ran manual test create/update/delete from product and subscription screen
with success and ./ant clean-all load-demo run-tests without error
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
ofbiz/trunk/applications/product/servicedef/services_cost.xml
ofbiz/trunk/applications/product/servicedef/services_subscription.xml
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=1621699&r1=1621698&r2=1621699&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
Mon Sep 1 08:16:43 2014
@@ -21,25 +21,6 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd";>
<!-- CostComponent services -->
- <simple-method method-name="createCostComponent" short-description="Create
a CostComponent">
- <make-value value-field="newEntity" entity-name="CostComponent"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="CostComponent"
field="newEntity.costComponentId"/>
- <field-to-result field="newEntity.costComponentId"
result-name="costComponentId"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="newEntity.fromDate"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateCostComponent" short-description="Update
a CostComponent">
- <entity-one entity-name="CostComponent" value-field="costComponent"/>
- <set-nonpk-fields map="parameters" value-field="costComponent"/>
- <store-value value-field="costComponent"/>
- </simple-method>
- <simple-method method-name="deleteCostComponent" short-description="Delete
a CostComponent">
- <entity-one entity-name="CostComponent" value-field="costComponent"/>
- <remove-value value-field="costComponent"/>
- </simple-method>
<simple-method method-name="cancelCostComponents"
short-description="Cancels CostComponents">
<set from-field="parameters.costComponentId"
field="costsAndMap.costComponentId"/>
<set from-field="parameters.productId" field="costsAndMap.productId"/>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=1621699&r1=1621698&r2=1621699&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
Mon Sep 1 08:16:43 2014
@@ -48,11 +48,6 @@ under the License.
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
- <simple-method method-name="updateSubscription" short-description="Update
a Subscription">
- <entity-one entity-name="Subscription" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
<simple-method method-name="isSubscribed" short-description="check if a
party has a subscription">
<set field="pfInput.inputFields" from-field="parameters"/>
@@ -83,35 +78,6 @@ under the License.
</if-not-empty>
</simple-method>
- <simple-method method-name="createSubscriptionResource"
short-description="Create a SubscriptionResource">
- <make-value entity-name="SubscriptionResource"
value-field="newEntity"/>
- <sequenced-id sequence-name="SubscriptionResource"
field="newEntity.subscriptionResourceId"/>
- <field-to-result field="newEntity.subscriptionResourceId"
result-name="subscriptionResourceId"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateSubscriptionResource"
short-description="Update a SubscriptionResource">
- <entity-one entity-name="SubscriptionResource"
value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
- <simple-method method-name="createProductSubscriptionResource"
short-description="Create a ProductSubscriptionResource">
- <make-value entity-name="ProductSubscriptionResource"
value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp
field="newEntity.fromDate"/></if-empty>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateProductSubscriptionResource"
short-description="Update a ProductSubscriptionResource">
- <entity-one entity-name="ProductSubscriptionResource"
value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteProductSubscriptionResource"
short-description="Delete a ProductSubscriptionResource">
- <entity-one entity-name="ProductSubscriptionResource"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<simple-method method-name="updateSubscriptionAttribute"
short-description="Create (when not exist) or update (when exist) a
Subscription attribute">
<field-to-result field="parameters.subscriptionId"
result-name="subscriptionId"/>
<entity-one entity-name="SubscriptionAttribute"
value-field="lookedUpValue"/>
@@ -127,17 +93,6 @@ under the License.
</if-empty>
</simple-method>
- <simple-method method-name="createSubscriptionCommEvent"
short-description="Create a Subscription Communication Event">
- <make-value value-field="newEntity"
entity-name="SubscriptionCommEvent"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="removeSubscriptionCommEvent"
short-description="Remove a Subscription Communication Event">
- <entity-one entity-name="SubscriptionCommEvent"
value-field="eventSubscription"/>
- <remove-value value-field="eventSubscription"/>
- </simple-method>
-
<!-- ============== Permission Checking Service ============= -->
<simple-method method-name="subscriptionPermissionCheck"
short-description="Subscription permission checking logic">
<set field="primaryPermission" value="CATALOG"/>
Modified: ofbiz/trunk/applications/product/servicedef/services_cost.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_cost.xml?rev=1621699&r1=1621698&r2=1621699&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_cost.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_cost.xml Mon Sep 1
08:16:43 2014
@@ -24,21 +24,18 @@ under the License.
<vendor>OFBiz</vendor>
<version>1.0</version>
- <service name="createCostComponent" default-entity-name="CostComponent"
engine="simple"
-
location="component://product/script/org/ofbiz/product/cost/CostServices.xml"
invoke="createCostComponent" auth="true">
+ <service name="createCostComponent" default-entity-name="CostComponent"
engine="entity-auto" invoke="create" auth="true">
<description>Create a CostComponent</description>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes include="pk" mode="OUT" optional="false"/>
<!--<override name="costComponentTypeId" optional="false"/>-->
</service>
- <service name="updateCostComponent" default-entity-name="CostComponent"
engine="simple"
-
location="component://product/script/org/ofbiz/product/cost/CostServices.xml"
invoke="updateCostComponent" auth="true">
+ <service name="updateCostComponent" default-entity-name="CostComponent"
engine="entity-auto" invoke="update" auth="true">
<description>Update a CostComponent</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteCostComponent" default-entity-name="CostComponent"
engine="simple"
-
location="component://product/script/org/ofbiz/product/cost/CostServices.xml"
invoke="deleteCostComponent" auth="true">
+ <service name="deleteCostComponent" default-entity-name="CostComponent"
engine="entity-auto" invoke="delete" auth="true">
<description>Delete a CostComponent</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
Modified: ofbiz/trunk/applications/product/servicedef/services_subscription.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_subscription.xml?rev=1621699&r1=1621698&r2=1621699&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_subscription.xml
(original)
+++ ofbiz/trunk/applications/product/servicedef/services_subscription.xml Mon
Sep 1 08:16:43 2014
@@ -30,8 +30,7 @@ under the License.
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateSubscription" default-entity-name="Subscription"
auth="true" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="updateSubscription">
+ <service name="updateSubscription" default-entity-name="Subscription"
auth="true" engine="entity-auto" invoke="update">
<description>Update a Subscription Record</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -57,38 +56,33 @@ under the License.
<attribute name="subscription" type="org.ofbiz.entity.GenericValue"
mode="OUT" optional="true"/>
</service>
- <service name="createSubscriptionResource"
default-entity-name="SubscriptionResource" auth="true" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="createSubscriptionResource">
+ <service name="createSubscriptionResource"
default-entity-name="SubscriptionResource" auth="true" engine="entity-auto"
invoke="create">
<description>Create a SubscriptionResource Record</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="CREATE"/>
<auto-attributes include="pk" mode="OUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateSubscriptionResource"
default-entity-name="SubscriptionResource" auth="true" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="updateSubscriptionResource">
+ <service name="updateSubscriptionResource"
default-entity-name="SubscriptionResource" auth="true" engine="entity-auto"
invoke="update">
<description>Update a SubscriptionResource Record</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="createProductSubscriptionResource"
default-entity-name="ProductSubscriptionResource" auth="true" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="createProductSubscriptionResource">
+ <service name="createProductSubscriptionResource"
default-entity-name="ProductSubscriptionResource" auth="true"
engine="entity-auto" invoke="create">
<description>Create a ProductSubscriptionResource Record</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="updateProductSubscriptionResource"
default-entity-name="ProductSubscriptionResource" auth="true" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="updateProductSubscriptionResource">
+ <service name="updateProductSubscriptionResource"
default-entity-name="ProductSubscriptionResource" auth="true"
engine="entity-auto" invoke="update">
<description>Update a ProductSubscriptionResource Record</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteProductSubscriptionResource"
default-entity-name="ProductSubscriptionResource" auth="true" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="deleteProductSubscriptionResource">
+ <service name="deleteProductSubscriptionResource"
default-entity-name="ProductSubscriptionResource" auth="true"
engine="entity-auto" invoke="delete">
<description>Delete a ProductSubscriptionResource Record</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -139,17 +133,15 @@ under the License.
<attribute name="attrValue" type="String" mode="IN" optional="true"/>
</service>
- <service name="createSubscriptionCommEvent" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="createSubscriptionCommEvent" auth="true">
+ <service name="createSubscriptionCommEvent"
default-entity-name="SubscriptionCommEvent" engine="entity-auto"
invoke="create" auth="true">
<description>Create a Subscription Communication Event</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="CREATE"/>
- <auto-attributes entity-name="SubscriptionCommEvent" include="pk"
mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="removeSubscriptionCommEvent" engine="simple"
-
location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml"
invoke="removeSubscriptionCommEvent" auth="true">
+ <service name="removeSubscriptionCommEvent"
default-entity-name="SubscriptionCommEvent" engine="entity-auto"
invoke="delete" auth="true">
<description>Remove a Subscription Communication Event</description>
<permission-service service-name="subscriptionPermissionCheck"
main-action="DELETE"/>
- <auto-attributes entity-name="SubscriptionCommEvent" include="pk"
mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<service name="subscriptionPermissionCheck" engine="simple"
