You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/06/10 14:04:33 UTC

svn commit: r1747712 [6/16] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ a...

Modified: ofbiz/trunk/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -171,7 +171,7 @@ under the License.
     </service>
 
     <service name="orderAdjustmentPermissionCheck" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderSimpleMethods.xml" invoke="orderAdjustmentPermissionCheck">
+            location="component://order/minilang/order/OrderSimpleMethods.xml" invoke="orderAdjustmentPermissionCheck">
         <description>Permission service for the creation and editing of order adjustments</description>
         <implements service="permissionInterface"/>
     </service>
@@ -192,7 +192,7 @@ under the License.
         <override name="orderId" optional="false"/>
     </service>
     <service name="deleteOrderAdjustment" default-entity-name="OrderAdjustment" engine="simple"
-        location="component://order/script/org/ofbiz/order/order/OrderSimpleMethods.xml" invoke="deleteOrderAdjustment">
+        location="component://order/minilang/order/OrderSimpleMethods.xml" invoke="deleteOrderAdjustment">
         <description>Delete an order adjustment record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>  <!-- needed for resetGrandTotal seca -->
@@ -347,7 +347,7 @@ under the License.
     </service>
 
     <service name="recreateOrderAdjustments" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="recreateOrderAdjustments">
+            location="component://order/minilang/order/OrderServices.xml" invoke="recreateOrderAdjustments">
         <description>Remove all existing order adjustments, recalc them and persist in OrderAdjustment.</description>
         <permission-service service-name="orderAdjustmentPermissionCheck" main-action="UPDATE"/>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
@@ -373,7 +373,7 @@ under the License.
     </service>
 
     <service name="updateOrderStatusFromReceipt" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderSimpleMethods.xml" invoke="updateOrderStatusFromReceipt">
+            location="component://order/minilang/order/OrderSimpleMethods.xml" invoke="updateOrderStatusFromReceipt">
         <description>Updates the (purchase) order/order item status based on receipt</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="currentStatusId" type="String" mode="OUT" optional="false"/>
@@ -400,7 +400,7 @@ under the License.
     </service>
 
     <service name="getOrderItemShipGroupEstimatedShipDate" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="getOrderItemShipGroupEstimatedShipDate" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="getOrderItemShipGroupEstimatedShipDate" auth="true">
         <description>Compute and return the OrderItemShipGroup estimated ship date based on the associated items.</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
@@ -440,7 +440,7 @@ under the License.
     </service>
 
     <service name="updateOrderNote" engine="simple" default-entity-name="OrderHeaderNote"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="updateOrderNote" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="updateOrderNote" auth="true">
         <description>Toggle Order Note and make it either Public or Private</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="noteId" type="String" mode="IN" optional="false"/>
@@ -470,7 +470,7 @@ under the License.
     </service>
     <!-- Order View Services -->
     <service name="getOrderedSummaryInformation" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="getOrderedSummaryInformation">
+            location="component://order/minilang/order/OrderServices.xml" invoke="getOrderedSummaryInformation">
         <description>Get Ordered Summary Information</description>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="roleTypeId" type="String" mode="IN" optional="true"/> <!-- defaults to PLACING_CUSTOMER -->
@@ -497,7 +497,7 @@ under the License.
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="shippingAmount" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
-    <service name="getOrderStatus" engine="simple" location="component://order/script/org/ofbiz/order/order/OrderServices.xml"
+    <service name="getOrderStatus" engine="simple" location="component://order/minilang/order/OrderServices.xml"
             invoke="getOrderStatus" auth="false">
         <description>Gets the order status</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
@@ -506,27 +506,27 @@ under the License.
 
     <!-- Order Delivery Services -->
     <service name="createOrderDeliverySchedule" default-entity-name="OrderDeliverySchedule" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderDeliveryServices.xml" invoke="createOrderDeliverySchedule">
+            location="component://order/minilang/order/OrderDeliveryServices.xml" invoke="createOrderDeliverySchedule">
         <description>Creates a delivery schedule for the specified order</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="orderItemSeqId" optional="true"/>
     </service>
     <service name="updateOrderDeliverySchedule" default-entity-name="OrderDeliverySchedule" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderDeliveryServices.xml" invoke="updateOrderDeliverySchedule">
+            location="component://order/minilang/order/OrderDeliveryServices.xml" invoke="updateOrderDeliverySchedule">
         <description>Update an existing delivery schedule for a specified purchase order</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="sendOrderDeliveryScheduleNotification" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderDeliveryServices.xml" invoke="sendOrderDeliveryScheduleNotification">
+            location="component://order/minilang/order/OrderDeliveryServices.xml" invoke="sendOrderDeliveryScheduleNotification">
         <description>Send Order Delivery Schedule Notification</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
     </service>
 
     <service name="checkSupplierRelatedOrderPermission" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderDeliveryServices.xml" invoke="checkSupplierRelatedOrderPermissionService">
+            location="component://order/minilang/order/OrderDeliveryServices.xml" invoke="checkSupplierRelatedOrderPermissionService">
         <description>Check Supplier Related Order Permission</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="checkAction" type="String" mode="IN" optional="true"/>
@@ -618,7 +618,7 @@ under the License.
     </service>
 
     <service name="getNextOrderId" engine="simple"
-        location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="getNextOrderId">
+        location="component://order/minilang/order/OrderServices.xml" invoke="getNextOrderId">
         <description>Get the Next Order ID According to Settings on the PartyAcctgPreference Entity for the given Party</description>
         <implements service="storeOrder" optional="true"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -627,7 +627,7 @@ under the License.
     </service>
 
     <service name="orderSequence_enforced" engine="simple"
-        location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="orderSequence_enforced">
+        location="component://order/minilang/order/OrderServices.xml" invoke="orderSequence_enforced">
         <implements service="getNextOrderId"/>
         <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/>
         <override name="orderId" type="Long" mode="OUT"/>
@@ -635,13 +635,13 @@ under the License.
 
     <!-- OrderHeader -->
     <service name="createOrderHeader" default-entity-name="OrderHeader" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createOrderHeader" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createOrderHeader" auth="true">
         <description>Create OrderHeader</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateOrderHeader" default-entity-name="OrderHeader" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="updateOrderHeader" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="updateOrderHeader" auth="true">
         <description>Update OrderHeader</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -674,7 +674,7 @@ under the License.
         <attribute name="shipGroupSeqId" type="String" mode="INOUT" optional="true"/>
     </service>
     <service name="updateOrderItemShipGroup" default-entity-name="OrderItemShipGroup" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="updateOrderItemShipGroup" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="updateOrderItemShipGroup" auth="true">
         <description>Updates OrderItemShipGroup.  The shipmentMethod field is of the format ${shipmentMethodTypeId}@${carrierPartyId}</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -692,7 +692,7 @@ under the License.
     </service>
 
     <service name="updateOrderContactMech" default-entity-name="OrderContactMech" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="updateOrderContactMech" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="updateOrderContactMech" auth="true">
         <description>Update Order Contact Mech</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <attribute name="oldContactMechId" type="String" mode="IN" optional="true"/>
@@ -739,7 +739,7 @@ under the License.
     </service>
 
     <service name="addPaymentMethodToOrder" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="addPaymentMethodToOrder" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="addPaymentMethodToOrder" auth="true">
         <description>Add Payment Method to Order.From this servicewe will call the createOrderPaymentPreference service to create OrderPaymentPreference</description>
         <attribute type="String" mode="IN" name="orderId" optional="false"/>
         <attribute type="String" mode="IN" name="paymentMethodId" optional="false"/>
@@ -870,7 +870,7 @@ under the License.
     </service>
 
     <service name="checkOrderIsOnBackOrder" engine="simple" auth="false"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="checkOrderIsOnBackOrder">
+            location="component://order/minilang/order/OrderServices.xml" invoke="checkOrderIsOnBackOrder">
         <description>Check if an Order is on Back Order</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="isBackOrder" type="Boolean" mode="OUT" optional="false"/>
@@ -911,7 +911,7 @@ under the License.
     </service>
 
     <service name="createOrderItemChange" engine="simple" auth="true" default-entity-name="OrderItemChange"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createOrderItemChange">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createOrderItemChange">
         <description>Creates a new OrderItemChange record</description>
         <auto-attributes mode="OUT" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -926,7 +926,7 @@ under the License.
     </service>
 
     <service name="createUpdateShippingAddress" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createUpdateShippingAddress" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createUpdateShippingAddress" auth="true">
         <description>Creates new shipping address and update existing address</description>
         <attribute name="productStoreId" mode="IN" type="String" optional="true"/>
         <attribute name="setDefaultShipping" mode="IN" type="String" optional="true"/>
@@ -947,7 +947,7 @@ under the License.
     </service>
 
     <service name="createUpdateBillingAddress" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createUpdateBillingAddress" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createUpdateBillingAddress" auth="true">
         <description>Creates new billing address and update existing address</description>
         <attribute name="productStoreId" mode="IN" type="String" optional="true"/>
         <attribute name="setDefaultBilling" mode="IN" type="String" optional="true"/>
@@ -969,7 +969,7 @@ under the License.
     </service>
 
     <service name="createUpdateCreditCard" engine="simple" auth="true" default-entity-name="CreditCard"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createUpdateCreditCard">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createUpdateCreditCard">
         <description>Create/Update credit card</description>
         <attribute name="expMonth" type="String" mode="IN" optional="false"/>
         <attribute name="expYear" type="String" mode="IN" optional="false"/>
@@ -988,7 +988,7 @@ under the License.
     </service>
 
    <service name="setUnitPriceAsLastPrice" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="setUnitPriceAsLastPrice" auth="false">
+            location="component://order/minilang/order/OrderServices.xml" invoke="setUnitPriceAsLastPrice" auth="false">
         <description>Sets unit price as last price for product</description>
         <attribute name="supplierPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="orderTypeId" type="String" mode="IN" optional="true"/>
@@ -1003,12 +1003,12 @@ under the License.
    </service>
 
     <service name="cancelAllBackOrders" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="cancelAllBackOrders" auth="true">
+            location="component://order/minilang/order/OrderServices.xml" invoke="cancelAllBackOrders" auth="true">
         <description>Cancels those back orders from suppliers whose cancel back order date (cancelBackOrderDate) has passed the current date</description>
     </service>
 
     <service name="updateShippingMethodAndCharges" engine="simple" 
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="updateShippingMethodAndCharges">
+            location="component://order/minilang/order/OrderServices.xml" invoke="updateShippingMethodAndCharges">
         <description>Compare order's shipping amount and new shipping amount(based on weight and dimension of packages).If new shipping amount is more then or less than default percentage (defined in shipment.properties) of Order's shipping amount, then shipping method and shipping charges are updated. And if new shipping amount is not more then or less than default percentage (defined in shipment.properties)% of Order's shipping amount then only shipping method is updated.Also updates record in ShipmentRouteSegment entity</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
@@ -1056,7 +1056,7 @@ under the License.
         </description>
         <attribute name="orderId" mode="IN" type="String" optional="false"/>
     </service>
-    <service name="productAvailabalityByFacility" engine="simple" location="component://order/script/org/ofbiz/order/order/OrderServices.xml"
+    <service name="productAvailabalityByFacility" engine="simple" location="component://order/minilang/order/OrderServices.xml"
             invoke="productAvailabalityByFacility" auth="true">
         <description>
             Calculate ATP and QOH According For each facility
@@ -1103,7 +1103,7 @@ under the License.
     </service>
 
     <service name="createQuoteTerm" engine="simple" default-entity-name="QuoteTerm"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteTerm">
+        location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteTerm">
         <description>
             Create a new Quate term.
         </description>
@@ -1112,7 +1112,7 @@ under the License.
         <override name="quoteItemSeqId" type="String" mode="IN" optional="true"/>
     </service>
     <service name="updateQuoteTerm" engine="simple" default-entity-name="QuoteTerm"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="updateQuoteTerm">
+        location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuoteTerm">
         <description>
             Edit the Quate term.
         </description>
@@ -1120,7 +1120,7 @@ under the License.
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="deleteQuoteTerm" engine="simple" default-entity-name="QuoteTerm"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="deleteQuoteTerm">
+        location="component://order/minilang/quote/QuoteServices.xml" invoke="deleteQuoteTerm">
         <description>
             delete the Quate term.
         </description>
@@ -1129,18 +1129,18 @@ under the License.
     
     <!-- Use for link the payment and the invoice When Received Payment -->
     <service name="createOrderPaymentApplication" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createOrderPaymentApplication">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createOrderPaymentApplication">
         <description>Create Order Payment Application</description>
         <attribute name="paymentId" type="String" mode="IN" optional="false"/>
     </service>
     
     <service name="createTestOrderRentalProduct" engine="simple" auth="true"
-        location="component://order/script/org/ofbiz/order/test/ShoppingCartTests.xml" invoke="testCreateOrderRentalProduct">
+        location="component://order/minilang/test/ShoppingCartTests.xml" invoke="testCreateOrderRentalProduct">
         <description>Create Test Order Rental of an asset which is shipped from and returned to inventory</description>
     </service>
     
     <service name="testCreateShoppinCartAndOrder" engine="simple" auth="true"
-        location="component://order/script/org/ofbiz/order/test/ShoppingCartTests.xml" invoke="testCreateShoppinCartAndOrder">
+        location="component://order/minilang/test/ShoppingCartTests.xml" invoke="testCreateShoppinCartAndOrder">
         <description>Create an order using a shopping cart - only used internally in ShoppingCartTests.xml for test purpose</description>
         <attribute name="orderMap" type="Map" mode="OUT"/>
     </service>
@@ -1175,7 +1175,7 @@ under the License.
     </service>
     
     <service name="MoveItemBetweenShipGroups" engine="simple" 
-        location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="MoveItemBetweenShipGroups">
+        location="component://order/minilang/order/OrderServices.xml" invoke="MoveItemBetweenShipGroups">
         <description>Move order items between ship groups</description>
         <attribute name="orderId" type="String" mode="IN"/>
         <attribute name="orderItemSeqId" type="String" mode="IN"/>

Modified: ofbiz/trunk/applications/order/servicedef/services_checkout.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_checkout.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_checkout.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_checkout.xml Fri Jun 10 14:04:30 2016
@@ -21,7 +21,7 @@ under the License.
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
 
-    <service name="createUpdateCustomerAndShippingAddress" engine="simple" location="component://order/script/org/ofbiz/order/order/CheckoutServices.xml" auth="false" invoke="createUpdateCustomerAndShippingAddress">
+    <service name="createUpdateCustomerAndShippingAddress" engine="simple" location="component://order/minilang/order/CheckoutServices.xml" auth="false" invoke="createUpdateCustomerAndShippingAddress">
         <implements service="createUpdateShippingAddress"/>
         <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
         <attribute name="firstName" type="String" mode="IN" optional="true"/>
@@ -37,7 +37,7 @@ under the License.
         <attribute name="shipToPhoneContactMechId" type="String" mode="INOUT" optional="true"/>
     </service>
 
-    <service name="createUpdateBillingAddressAndPaymentMethod" engine="simple" location="component://order/script/org/ofbiz/order/order/CheckoutServices.xml" auth="false" invoke="createUpdateBillingAddressAndPaymentMethod">
+    <service name="createUpdateBillingAddressAndPaymentMethod" engine="simple" location="component://order/minilang/order/CheckoutServices.xml" auth="false" invoke="createUpdateBillingAddressAndPaymentMethod">
         <implements service="createUpdateBillingAddress"/>
         <implements service="createUpdateCreditCard"/>
         <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
@@ -51,7 +51,7 @@ under the License.
         <attribute name="billToPhoneContactMechId" mode="INOUT" type="String" optional="true"/>
     </service>
 
-    <service name="setAnonUserLogin" engine="simple" location="component://order/script/org/ofbiz/order/order/CheckoutServices.xml" auth="false" invoke="setAnonUserLogin">
+    <service name="setAnonUserLogin" engine="simple" location="component://order/minilang/order/CheckoutServices.xml" auth="false" invoke="setAnonUserLogin">
          <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
          <attribute name="partyId" type="String" mode="IN" optional="true"/>
     </service>

Modified: ofbiz/trunk/applications/order/servicedef/services_quote.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_quote.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_quote.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_quote.xml Fri Jun 10 14:04:30 2016
@@ -26,7 +26,7 @@ under the License.
 
     <!-- Quote -->
     <service name="getNextQuoteId" engine="simple"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="getNextQuoteId">
+        location="component://order/minilang/quote/QuoteServices.xml" invoke="getNextQuoteId">
         <description>Get the Next Quote ID According to Settings on the PartyAcctgPreference Entity for the given Party</description>
         <implements service="createQuote"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -34,26 +34,26 @@ under the License.
     </service>
 
     <service name="quoteSequenceEnforced" engine="simple"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="quoteSequenceEnforced">
+        location="component://order/minilang/quote/QuoteServices.xml" invoke="quoteSequenceEnforced">
         <implements service="getNextQuoteId" optional="true"/>
         <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/>
         <override name="quoteId" type="Long" mode="OUT"/>
     </service>
 
     <service name="createQuote" default-entity-name="Quote" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuote" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuote" auth="true">
         <description>Create an Quote</description>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <auto-attributes include="pk" mode="OUT" optional="true"/>
     </service>
     <service name="updateQuote" default-entity-name="Quote" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="updateQuote" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuote" auth="true">
         <description>Update a Quote</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="copyQuote" default-entity-name="Quote" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="copyQuote" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="copyQuote" auth="true">
         <description>Copy a Quote</description>
         <auto-attributes include="pk" mode="INOUT" optional="false"/>
         <attribute name="copyQuoteRoles" type="String" mode="IN" optional="true"/>
@@ -64,43 +64,43 @@ under the License.
         <attribute name="copyQuoteTerms" type="String" mode="IN" optional="true"/>
     </service>
     <service name="checkUpdateQuoteStatus" default-entity-name="Quote" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="checkUpdateQuoteStatus" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="checkUpdateQuoteStatus" auth="true">
         <description>Set the Quote status to ordered.</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <!-- QuoteRole  -->
     <service name="createQuoteRole" default-entity-name="QuoteRole" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteRole" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteRole" auth="true">
         <description>Create a QuoteRole</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
     </service>
     <service name="removeQuoteRole" default-entity-name="QuoteRole" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="removeQuoteRole" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="removeQuoteRole" auth="true">
         <description>Remove a QuoteRole</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <!-- QuoteItem  -->
     <service name="createQuoteItem" default-entity-name="QuoteItem" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteItem" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteItem" auth="true">
         <description>Create a QuoteItem</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateQuoteItem" default-entity-name="QuoteItem" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="updateQuoteItem" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuoteItem" auth="true">
         <description>Update a QuoteItem</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeQuoteItem" default-entity-name="QuoteItem" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="removeQuoteItem" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="removeQuoteItem" auth="true">
         <description>Remove a QuoteItem</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="copyQuoteItem" default-entity-name="QuoteItem" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="copyQuoteItem" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="copyQuoteItem" auth="true">
         <description>Copy a QuoteItem</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -110,52 +110,52 @@ under the License.
     </service>
     <!-- QuoteAttribute  -->
     <service name="createQuoteAttribute" default-entity-name="QuoteAttribute" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteAttribute" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteAttribute" auth="true">
         <description>Create a QuoteAttribute</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateQuoteAttribute" default-entity-name="QuoteAttribute" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="updateQuoteAttribute" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuoteAttribute" auth="true">
         <description>Update a QuoteAttribute</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeQuoteAttribute" engine="simple" default-entity-name="QuoteAttribute"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="removeQuoteAttribute" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="removeQuoteAttribute" auth="true">
         <description>Remove a QuoteAttribute</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <!-- QuoteCoefficient  -->
     <service name="createQuoteCoefficient" default-entity-name="QuoteCoefficient" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteCoefficient" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteCoefficient" auth="true">
         <description>Create a QuoteCoefficient</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateQuoteCoefficient" default-entity-name="QuoteCoefficient" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="updateQuoteCoefficient" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuoteCoefficient" auth="true">
         <description>Update a QuoteCoefficient</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeQuoteCoefficient" engine="simple" default-entity-name="QuoteCoefficient"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="removeQuoteCoefficient" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="removeQuoteCoefficient" auth="true">
         <description>Remove a QuoteCoefficient</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <!-- Specialized Quote services -->
     <service name="createQuoteAndQuoteItemForRequest" engine="simple" default-entity-name="QuoteItem"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteAndQuoteItemForRequest" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteAndQuoteItemForRequest" auth="true">
         <description>Create a new Quote and Quote Item for a CustRequest</description>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <auto-attributes include="pk" mode="OUT" optional="true"/>
         <override name="custRequestId" optional="false"/>
     </service>
     <service name="autoUpdateQuotePrice" engine="simple" default-entity-name="QuoteItem"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="autoUpdateQuotePrice" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="autoUpdateQuotePrice" auth="true">
         <description>Update the QuoteItem price with the passed value (if present) or automatically from the averageCost</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <attribute name="manualQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/>
@@ -164,12 +164,12 @@ under the License.
         <attribute name="costToPriceMult" type="BigDecimal" mode="IN" optional="true"/>-->
     </service>
     <service name="autoCreateQuoteAdjustments" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="autoCreateQuoteAdjustments">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="autoCreateQuoteAdjustments">
         <description>Remove all existing quote adjustments, recalc them and persist in QuoteAdjustment.</description>
         <attribute name="quoteId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="createQuoteAdjustment" default-entity-name="QuoteAdjustment" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteAdjustment">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteAdjustment">
         <description>Creates a new quote adjustment record</description>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <auto-attributes mode="OUT" include="pk" optional="false"/>
@@ -177,19 +177,19 @@ under the License.
         <override name="quoteId" optional="false"/>
     </service>
     <service name="updateQuoteAdjustment" default-entity-name="QuoteAdjustment" engine="simple"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="updateQuoteAdjustment" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuoteAdjustment" auth="true">
         <description>Update a QuoteAdjustment</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeQuoteAdjustment" engine="simple" default-entity-name="QuoteAdjustment"
-                location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="removeQuoteAdjustment" auth="true">
+                location="component://order/minilang/quote/QuoteServices.xml" invoke="removeQuoteAdjustment" auth="true">
         <description>Remove a QuoteAdjustment</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="createQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteWorkEffort">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteWorkEffort">
         <description>Creates a new QuoteWorkEffort record and WorkEffort record</description>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <auto-attributes mode="INOUT" include="pk" optional="true"/>
@@ -199,26 +199,26 @@ under the License.
         <override name="workEffortId" optional="false"/>
     </service>
     <service name="deleteQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="deleteQuoteWorkEffort">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="deleteQuoteWorkEffort">
         <description>Creates a new QuoteWorkEffort record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
     <service name="createQuoteFromCart" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteFromCart">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteFromCart">
         <description>Creates a new quote from a shopping cart</description>
         <attribute name="cart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
         <attribute name="applyStorePromotions" type="String" mode="IN" optional="true"/>
         <attribute name="quoteId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createQuoteFromShoppingList" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteFromShoppingList">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteFromShoppingList">
         <description>Creates a new quote from a shopping list</description>
         <attribute name="shoppingListId" type="String" mode="IN" optional="false"/>
         <attribute name="applyStorePromotions" type="String" mode="IN" optional="true"/>
         <attribute name="quoteId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createQuoteFromCustRequest" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteFromCustRequest">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteFromCustRequest">
         <description>Creates a new quote from a customer request</description>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
         <attribute name="quoteTypeId" type="String" mode="IN" optional="true"/>
@@ -252,7 +252,7 @@ under the License.
         <attribute name="quoteId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createQuoteNote" engine="simple"
-            location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteNote" auth="true">
+            location="component://order/minilang/quote/QuoteServices.xml" invoke="createQuoteNote" auth="true">
         <description>Create a note item and associate with a quote</description>
         <attribute name="quoteId" type="String" mode="IN"/>
         <attribute name="noteInfo" type="String" mode="IN" allow-html="any"/>

Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Fri Jun 10 14:04:30 2016
@@ -26,7 +26,7 @@ under the License.
 
     <!-- Customer Request Services -->
     <service name="custRequestPermissionCheck" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="custRequestPermissionCheck">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="custRequestPermissionCheck">
         <description>
             Performs a security check for CustRequest. The user, if enters a request for someone else,
             must have one of the base ORDERMGR_CRQ CRUD+ADMIN permissions.
@@ -35,7 +35,7 @@ under the License.
         <attribute name="fromPartyId" type="String" mode="IN" optional="true"/>
     </service>
     <service name="createCustRequest" engine="simple" default-entity-name="CustRequest"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequest" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequest" auth="true">
         <description>Create a custRequest record and optionally create a custRequest item.</description>
         <permission-service service-name="custRequestPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
@@ -47,7 +47,7 @@ under the License.
         <override name="story" allow-html="any"/>
     </service>
     <service name="updateCustRequest" engine="simple" default-entity-name="CustRequest"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequest" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="updateCustRequest" auth="true">
         <description>Update a custRequest record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -59,13 +59,13 @@ under the License.
     </service>
 
     <service name="deleteCustRequest" engine="simple" default-entity-name="CustRequest"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="deleteCustRequest" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="deleteCustRequest" auth="true">
         <description>Delete a custRequest record in draft status</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createCustRequestAttribute" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestAttribute" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestAttribute" auth="true">
         <description>Create CustRequestAttribute record</description>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
         <attribute name="attrName" type="String" mode="IN" optional="false"/>
@@ -73,7 +73,7 @@ under the License.
     </service>
 
    <service name="updateCustRequestAttribute" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequestAttribute" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="updateCustRequestAttribute" auth="true">
         <description>Update CustRequestAttribute record</description>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
         <attribute name="attrName" type="String" mode="IN" optional="false"/>
@@ -81,7 +81,7 @@ under the License.
     </service>
 
     <service name="createCustRequestItem" engine="simple" default-entity-name="CustRequestItem"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestItem" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestItem" auth="true">
         <description>Create a CustRequestItem record</description>
         <auto-attributes include="pk" mode="INOUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -90,7 +90,7 @@ under the License.
         <override name="description" allow-html="any"/>
     </service>
     <service name="updateCustRequestItem" engine="simple" default-entity-name="CustRequestItem"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequestItem" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="updateCustRequestItem" auth="true">
         <description>Update a CustRequestItem record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -98,7 +98,7 @@ under the License.
         <override name="description" allow-html="any"/>
     </service>
     <service name="copyCustRequestItem" default-entity-name="CustRequestItem" engine="simple"
-                location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="copyCustRequestItem" auth="true">
+                location="component://order/minilang/request/CustRequestServices.xml" invoke="copyCustRequestItem" auth="true">
         <description>Copy a CustRequest</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -108,30 +108,30 @@ under the License.
     </service>
 
     <service name="createCustRequestParty" engine="simple" default-entity-name="CustRequestParty"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestParty" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestParty" auth="true">
         <description>Create a CustRequestParty record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <override name="fromDate" mode="IN" type="Timestamp" optional="true"/>
     </service>
     <service name="updateCustRequestParty" engine="simple" default-entity-name="CustRequestParty"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequestParty" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="updateCustRequestParty" auth="true">
         <description>Update CustRequestParty record</description>
         <auto-attributes mode="IN" include="pk" optional="true"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="deleteCustRequestParty" engine="simple" default-entity-name="CustRequestParty"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="deleteCustRequestParty" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="deleteCustRequestParty" auth="true">
         <description>Delete a CustRequestParty record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
     <service name="expireCustRequestParty" engine="simple" default-entity-name="CustRequestParty"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="expireCustRequestParty" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="expireCustRequestParty" auth="true">
         <description>Delete a CustRequestParty record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
     <service name="createCustRequestNote" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestNote" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestNote" auth="true">
         <description>Create a note for a CustRequest</description>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
         <attribute name="noteInfo" type="String" mode="IN" optional="false" allow-html="any"/>
@@ -140,14 +140,14 @@ under the License.
         <attribute name="custRequestName" type="String" mode="OUT" optional="true"/><!-- for notification services -->
     </service>
     <service name="updateCustRequestNote" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequestNote" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="updateCustRequestNote" auth="true">
         <description>Update CustRequest Note</description>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
         <attribute name="noteId" type="String" mode="IN" optional="false" allow-html="any"/>
         <attribute name="noteInfo" type="String" mode="IN" optional="true"/>
     </service>
     <service name="createCustRequestItemNote" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestItemNote" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestItemNote" auth="true">
         <description>Create a note for a CustRequestItem</description>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
         <attribute name="custRequestItemSeqId" type="String" mode="IN" optional="false"/>
@@ -158,14 +158,14 @@ under the License.
         <attribute name="custRequestName" type="String" mode="OUT" optional="true"/><!-- for notification services -->
     </service>
     <service name="createCustRequestFromCart" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestFromCart">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestFromCart">
         <description>Creates a new request from a shopping cart</description>
         <attribute name="cart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
         <attribute name="custRequestName" type="String" mode="IN" optional="true"/>
         <attribute name="custRequestId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createCustRequestFromShoppingList" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestFromShoppingList">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestFromShoppingList">
         <description>Creates a new quote from a shopping list</description>
         <attribute name="shoppingListId" type="String" mode="IN" optional="false"/>
         <attribute name="custRequestId" type="String" mode="OUT" optional="false"/>
@@ -173,13 +173,13 @@ under the License.
 
     <!-- Services for finding Associated CustRequests -->
     <service name="getCustRequestsByRole" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="getCustRequestsByRole" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="getCustRequestsByRole" auth="true">
         <description>Get CustRequests Associated By Role</description>
         <attribute name="roleTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="custRequestAndRoles" type="java.util.List" mode="OUT" optional="false"/>
     </service>
     <service name="setCustRequestStatus" engine="simple"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="setCustRequestStatus" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="setCustRequestStatus" auth="true">
         <description>Set the Customer Request  Status</description>
         <attribute name="custRequestId" type="String" mode="INOUT" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="false"/>
@@ -190,7 +190,7 @@ under the License.
         <attribute name="webSiteId" type="String" mode="IN" optional="true"/><!-- for notification services -->
     </service>
     <service name="createCustRequestFromCommEvent" engine="simple" default-entity-name="CommunicationEvent"
-            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestFromCommEvent" auth="true">
+            location="component://order/minilang/request/CustRequestServices.xml" invoke="createCustRequestFromCommEvent" auth="true">
         <description>Create a Customer request from a commEvent(email)</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -204,7 +204,7 @@ under the License.
 
     <!-- custRequest content services -->
     <service name="createCustRequestContent" engine="simple"
-        location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml"
+        location="component://order/minilang/request/CustRequestServices.xml"
         invoke="createCustRequestContent"
         default-entity-name="CustRequestContent" auth="true">
         <description>Create a Customer Request Content</description>
@@ -213,7 +213,7 @@ under the License.
         <override name="fromDate" optional="true"/>
     </service>
     <service name="deleteCustRequestContent" engine="simple"
-        location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml"
+        location="component://order/minilang/request/CustRequestServices.xml"
         invoke="deleteCustRequestContent"
         default-entity-name="CustRequestContent" auth="true">
         <description>Update a Customer Request Content</description>

Modified: ofbiz/trunk/applications/order/servicedef/services_requirement.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_requirement.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_requirement.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_requirement.xml Fri Jun 10 14:04:30 2016
@@ -35,7 +35,7 @@ under the License.
         </auto-attributes>
     </service>
     <service name="createRequirement" engine="simple"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="createRequirement">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="createRequirement">
         <description>Create a new requirement</description>
         <implements service="requirementInterface"/>
         <attribute name="requirementTypeId" type="String" mode="IN" optional="false"/>
@@ -44,7 +44,7 @@ under the License.
         <attribute name="requirementId" type="String" mode="INOUT" optional="true"/>
     </service>
     <service name="updateRequirement" engine="simple"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="updateRequirement">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="updateRequirement">
         <description>Update an existing requirement</description>
         <implements service="requirementInterface"/>
         <attribute name="requirementId" type="String" mode="IN" optional="false"/>
@@ -52,32 +52,32 @@ under the License.
     </service>
 
     <service name="deleteRequirement" engine="simple"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="deleteRequirement">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="deleteRequirement">
         <description>Delete a requirement</description>
         <attribute name="requirementId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="createRequirementRole" default-entity-name="RequirementRole" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="createRequirementRole">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="createRequirementRole">
         <description>Creates a new party role for the requirement</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
     <service name="updateRequirementRole" default-entity-name="RequirementRole" engine="simple"
-                location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="updateRequirementRole" auth="true">
+                location="component://order/minilang/requirement/RequirementServices.xml" invoke="updateRequirementRole" auth="true">
         <description>Update a RequirementRole</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeRequirementRole" engine="simple" default-entity-name="RequirementRole"
-                location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="removeRequirementRole" auth="true">
+                location="component://order/minilang/requirement/RequirementServices.xml" invoke="removeRequirementRole" auth="true">
         <description>Remove a RequirementRole</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="associatedRequirementWithRequestItem" engine="simple"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="associateRequirementWithRequestItem">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="associateRequirementWithRequestItem">
         <description>Creates a CustRequestItem/Requirement association</description>
         <attribute name="requirementId" type="String" mode="IN" optional="false"/>
         <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
@@ -85,7 +85,7 @@ under the License.
     </service>
 
     <service name="addRequirementTask" engine="simple"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="addTaskToRequirement">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="addTaskToRequirement">
         <description>Associate an existing task w/ a requirement</description>
         <attribute name="requirementId" type="String" mode="IN" optional="false"/>
         <attribute name="workEffortId" type="String" mode="IN" optional="false"/>
@@ -110,7 +110,7 @@ under the License.
         <auto-attributes entity-name="OrderRequirementCommitment" include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="checkCreateOrderRequirement" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="checkCreateOrderRequirement">
+            location="component://order/minilang/order/OrderServices.xml" invoke="checkCreateOrderRequirement">
         <description>Create OrderRequirementCommitment and Requirement for items with automatic requirement upon ordering</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/>
@@ -119,7 +119,7 @@ under the License.
         <attribute name="requirementId" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="checkCreateStockRequirementQoh" engine="simple" auth="true" default-entity-name="ItemIssuance"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="checkCreateStockRequirementQoh">
+            location="component://order/minilang/order/OrderServices.xml" invoke="checkCreateStockRequirementQoh">
         <description>Create a Product Requirement based on QOH inventory</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
@@ -128,7 +128,7 @@ under the License.
         <attribute name="requirementId" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="checkCreateStockRequirementAtp" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="checkCreateStockRequirementAtp">
+            location="component://order/minilang/order/OrderServices.xml" invoke="checkCreateStockRequirementAtp">
         <description>Create a Product Requirement based on ATP inventory</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
@@ -139,7 +139,7 @@ under the License.
         <attribute name="requirementId" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="createRequirementFromItemATP" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createRequirementFromItemATP">
+            location="component://order/minilang/order/OrderServices.xml" invoke="createRequirementFromItemATP">
         <description>Create OrderRequirementCommitment and Requirement for items with requirement based on ATP stock levels</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
@@ -151,7 +151,7 @@ under the License.
     </service>
 
     <service name="checkCreateProductRequirementForFacility" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="checkCreateProductRequirementForFacility">
+            location="component://order/minilang/order/OrderServices.xml" invoke="checkCreateProductRequirementForFacility">
         <description>Create Requirements for all the products in a facility with QOH under the minimum stock level</description>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="defaultRequirementMethodId" type="String" mode="IN" optional="true"/>
@@ -165,13 +165,13 @@ under the License.
     </service>
 
     <service name="autoAssignRequirementToSupplier" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="autoAssignRequirementToSupplier">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="autoAssignRequirementToSupplier">
         <description>If the requirement is a product requirement (purchasing) try to assign it to the primary supplier</description>
         <attribute name="requirementId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="createTransferFromRequirement" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/requirement/RequirementServices.xml" invoke="createTransferFromRequirement">
+            location="component://order/minilang/requirement/RequirementServices.xml" invoke="createTransferFromRequirement">
         <description>Create the inventory transfers required to fulfill the requirement.</description>
         <attribute mode="IN" name="requirementId" optional="false" type="String"/>
         <attribute mode="IN" name="fromFacilityId" optional="false" type="String"/>

Modified: ofbiz/trunk/applications/order/servicedef/services_return.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_return.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_return.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_return.xml Fri Jun 10 14:04:30 2016
@@ -25,7 +25,7 @@ under the License.
 
     <!-- Order Return Services -->
     <service name="quickReturnOrder" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="quickReturnFromOrder">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="quickReturnFromOrder">
         <description>Quick Return Order</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="returnReasonId" type="String" mode="IN" optional="true"/>
@@ -35,28 +35,28 @@ under the License.
         <attribute name="returnId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createReturnHeader" default-entity-name="ReturnHeader" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnHeader">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnHeader">
         <description>Create a new ReturnHeader</description>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="returnHeaderTypeId" optional="false"/>
     </service>
     <service name="updateReturnHeader" default-entity-name="ReturnHeader" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="updateReturnHeader">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="updateReturnHeader">
         <description>Update a ReturnHeader</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createReturnItemBilling" engine="simple" default-entity-name="ReturnItemBilling"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnItemBilling">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnItemBilling">
         <description>Create a new return item billing record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="createReturnItem" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnItem">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnItem">
         <description>Create a new ReturnItem in the RETURN_REQUESTED status, based on returnableQuantity and returnablePrice from the
                      getReturnableQuantity service.  This can be called by the customer to request a return for himself or by a user with
                      ORDERMGR_CREATE, but, if the former, the returnPrice will be overriden by the returnablePrice from getReturnableQuantity.</description>
@@ -72,25 +72,25 @@ under the License.
         <override name="returnQuantity" optional="false"/>
     </service>
     <service name="updateReturnItem" engine="simple" default-entity-name="ReturnItem"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="updateReturnItem">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="updateReturnItem">
         <description>Update a ReturnItem and related adjustments</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="updateReturnItemsStatus" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="updateReturnItemsStatus">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="updateReturnItemsStatus">
         <description>Update ReturnItem(s) Status</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="removeReturnItem" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="removeReturnItem">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="removeReturnItem">
         <description>Remove a ReturnItem and related adjustments</description>
         <auto-attributes entity-name="ReturnItem" include="pk" mode="IN" optional="false"/>
     </service>
     <service name="createReturnItemResponse" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnItemResponse">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnItemResponse">
             <description>Creates a ReturnItemResponse record.</description>
         <auto-attributes entity-name="ReturnItemResponse" include="nonpk" mode="IN" optional="true"/>
         <attribute name="returnItemResponseId" type="String" mode="OUT" optional="false"/>
@@ -102,13 +102,13 @@ under the License.
         <attribute name="returnItemResponseId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="cancelReturnItems" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="cancelReturnItems">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="cancelReturnItems">
         <description>Cancel ReturnItems and set their status to "RETURN_CANCELLED"</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="cancelReplacementOrderItems" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="cancelReplacementOrderItems">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="cancelReplacementOrderItems">
         <description>Cancel the associated OrderItems of the replacement order, if any.</description>
         <auto-attributes entity-name="ReturnItem" include="pk" mode="IN" optional="false"/>
     </service>
@@ -132,12 +132,12 @@ under the License.
         <attribute name="originalReturnQuantity" type="BigDecimal" mode="IN" optional="true"/>
         <override name="returnAdjustmentId" optional="false"/>
     </service>
-    <service name="removeReturnAdjustment" engine="simple" location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml"
+    <service name="removeReturnAdjustment" engine="simple" location="component://order/minilang/order/OrderReturnServices.xml"
                  invoke="removeReturnAdjustment">
         <description>Simple remove service</description>
         <auto-attributes entity-name="ReturnAdjustment" include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="createReturnAndItemOrAdjustment" engine="simple" location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml"
+    <service name="createReturnAndItemOrAdjustment" engine="simple" location="component://order/minilang/order/OrderReturnServices.xml"
                  invoke="createReturnAndItemOrAdjustment">
         <description>If returnId is null, create a return; then create Return Item or Adjustment based on the parameters passed in</description>
         <auto-attributes mode="IN" include="nonpk" entity-name="ReturnHeader" optional="true"/>
@@ -234,37 +234,37 @@ under the License.
         <attribute name="returnTypeId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processWaitReplacementReturn" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processWaitReplacementReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processWaitReplacementReturn">
         <description>Process the replacements in a wait return</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processWaitReplacementReservedReturn" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processWaitReplacementReservedReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processWaitReplacementReservedReturn">
         <description>Process the replacements in a wait reserved return when the return is accepted and then received</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processCrossShipReplacementReturn" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processCrossShipReplacementReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processCrossShipReplacementReturn">
         <description>Process the replacements in a cross-ship return</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processRepairReplacementReturn" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processRepairReplacementReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processRepairReplacementReturn">
         <description>Process the replacements in a repair return</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processReplaceImmediatelyReturn" engine="simple" auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processReplaceImmediatelyReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processReplaceImmediatelyReturn">
         <description>Process the replacements in a Immediate Return</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processRefundOnlyReturn" engine="simple"  auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processRefundOnlyReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processRefundOnlyReturn">
         <description>Process the Refund in a return</description>    
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="processRefundImmediatelyReturn" engine="simple"  auth="true"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="processRefundImmediatelyReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="processRefundImmediatelyReturn">
         <description>Process the Immediate Refund in a return</description>    
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
     </service>
@@ -281,7 +281,7 @@ under the License.
 
     <!-- other return services -->
     <service name="updateReturnStatusFromReceipt" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="updateReturnStatusFromReceipt">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="updateReturnStatusFromReceipt">
         <description>Update return/item status when items have been received</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
         <attribute name="returnHeaderStatus" type="String" mode="OUT" optional="false"/>
@@ -320,33 +320,33 @@ under the License.
     </service>
 
     <service name="createReturnItemShipment" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnItemShipment">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnItemShipment">
         <description>Create a new ReturnItemShipment</description>
         <auto-attributes entity-name="ReturnItemShipment" include="all" mode="IN" optional="false"/>
     </service>
 
     <service name="getStatusItemsForReturn" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="getStatusItemsForReturn">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="getStatusItemsForReturn">
         <description>Get the return status associated with customer/vendor return</description>
         <attribute name="returnHeaderTypeId" type="String" mode="IN" optional="false"/>
         <attribute name="statusItems" type="List" mode="OUT" optional="false"/>
     </service>
 
     <service name="createExchangeOrderAssoc" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createExchangeOrderAssoc">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createExchangeOrderAssoc">
         <description>Associate exchange order with original order in OrderItemAssoc entity</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="originOrderId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="addProductsBackToCategory" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="addProductsBackToCategory">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="addProductsBackToCategory">
         <description>Add product(s) back to category if it has no active category</description>
         <attribute name="returnId" type="String" mode="IN" optional="true"/>
         <attribute name="inventoryItemId" type="String" mode="IN" optional="true"/>
     </service>
     <service name="createReturnStatus" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnStatus">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnStatus">
         <description>Create Return Status</description>
         <attribute name="returnId" type="String" mode="IN" optional="false"/>
         <attribute name="returnItemSeqId" type="String" mode="IN" optional="true"/>
@@ -359,7 +359,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateReturnContactMech" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="updateReturnContactMech" auth="true" default-entity-name="ReturnContactMech">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="updateReturnContactMech" auth="true" default-entity-name="ReturnContactMech">
         <description>Update Return Contact Mech</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <attribute name="oldContactMechId" type="String" mode="IN" optional="true"/>
@@ -371,7 +371,7 @@ under the License.
 
     <!-- Item Return Service -->
     <service name="createReturnItemForRental" engine="simple"
-            location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnItemForRental">
+            location="component://order/minilang/order/OrderReturnServices.xml" invoke="createReturnItemForRental">
         <description>Create the return item for rental (which items has product type is ASSET_USAGE_OUT_IN)</description>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="returnId" type="String" mode="OUT" optional="false"/>