svn commit: r1818244 - in /ofbiz/ofbiz-framework/trunk/applications: content/servicedef/secas.xml order/servicedef/services_shoppinglist.xml

[de...@apache.org]

Author: deepak
Date: Fri Dec 15 08:46:55 2017
New Revision: 1818244

URL: http://svn.apache.org/viewvc?rev=1818244&view=rev
Log:
Fixed xml validation error found while console read

Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml
    ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml?rev=1818244&r1=1818243&r2=1818244&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml Fri Dec 15 08:46:55 2017
@@ -138,10 +138,10 @@ under the License.
         <action service="createContentAssoc" mode="sync" run-as-user="system" result-to-result="true" />
     </eca>
     <eca service="createContent" event="commit">
+        <condition field-name="contentAssocTypeId" operator="is-not-empty"/>
+        <condition field-name="contentIdFrom" operator="is-not-empty"/>
         <set field-name="contentId" env-name="contentIdFrom"/>
         <set field-name="contentIdTo" env-name="contentId"/>
-        <condition field-name="contentAssocTypeId" operator="is-not-empty"/>
-        <condition field-name="contentId" operator="is-not-empty"/>
         <action service="createContentAssoc" mode="sync" run-as-user="system" result-to-result="true" />
     </eca>
 

Modified: ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml?rev=1818244&r1=1818243&r2=1818244&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml Fri Dec 15 08:46:55 2017
@@ -33,16 +33,16 @@ under the License.
     <service name="createShoppingList" engine="simple" auth="false"
             location="component://order/minilang/shoppinglist/ShoppingListServices.xml" invoke="createShoppingList">
         <description>Create a shopping list entity</description>
+        <permission-service service-name="checkShoppingListSecurity" main-action="CREATE"/>
         <implements service="createShoppingListRecurrence"/>
         <implements service="shoppingListInterface"/>
-        <permission-service service-name="checkShoppingListSecurity" main-action="CREATE"/>
         <attribute name="shoppingListId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="updateShoppingList" engine="simple" auth="true"
             location="component://order/minilang/shoppinglist/ShoppingListServices.xml" invoke="updateShoppingList">
         <description>Update a shopping list entity</description>
-        <implements service="createShoppingListRecurrence"/>
         <permission-service service-name="checkShoppingListSecurity" main-action="UPDATE"/>
+        <implements service="createShoppingListRecurrence"/>
         <implements service="shoppingListInterface"/>
         <attribute name="shoppingListId" type="String" mode="IN" optional="false"/>
     </service>
@@ -120,8 +120,8 @@ under the License.
     <service name="createShoppingListItem" engine="simple" auth="false"
             location="component://order/minilang/shoppinglist/ShoppingListServices.xml" invoke="createShoppingListItem">
         <description>Create a shopping list item</description>
-        <implements service="shoppingListItemInterface"/>
         <permission-service service-name="checkShoppingListItemSecurity" main-action="CREATE"/>
+        <implements service="shoppingListItemInterface"/>
         <attribute name="shoppingListId" type="String" mode="IN" optional="true"/>
         <attribute name="productStoreId" type="String" mode="INOUT" optional="true"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
@@ -130,8 +130,8 @@ under the License.
     <service name="updateShoppingListItem" engine="simple" auth="true"
             location="component://order/minilang/shoppinglist/ShoppingListServices.xml" invoke="updateShoppingListItem">
         <description>Update a shopping list item</description>
-        <implements service="shoppingListItemInterface"/>
         <permission-service service-name="checkShoppingListItemSecurity" main-action="UPDATE"/>
+        <implements service="shoppingListItemInterface"/>
         <attribute name="shoppingListItemSeqId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="removeShoppingListItem" engine="simple" auth="true"