Modified: ofbiz/trunk/applications/accounting/servicedef/services_payment.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_payment.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_payment.xml Fri Jun 10 14:04:30 2016 @@ -26,7 +26,7 @@ under the License. <!-- Payment services --> <service name="createPayment" engine="simple" default-entity-name="Payment" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPayment" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPayment" auth="true"> <description>Create a Payment. If a paymentMethodId is supplied, paymentMethodTypeId is gotten from paymentMethod. Otherwise, it must be supplied. If no paymentMethodTypeId and no paymentMethodId is supplied, then an error will be returned. </description> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -38,14 +38,14 @@ under the License. </service> <service name="updatePayment" engine="simple" default-entity-name="Payment" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="updatePayment" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="updatePayment" auth="true"> <description>Update a Payment</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="setPaymentStatus" engine="simple" default-entity-name="Payment" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="setPaymentStatus" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="setPaymentStatus" auth="true"> <description>Change the status of a Payment</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="false"/> @@ -59,14 +59,14 @@ under the License. </service> <service name="quickSendPayment" engine="simple" default-entity-name="Payment" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="quickSendPayment"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="quickSendPayment"> <description>Updates a Payment and then marks it as PMNT_SENT</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="createPaymentApplication" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentApplication" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentApplication" auth="true"> <description>Create a payment application</description> <attribute name="paymentId" type="String" mode="IN" optional="false"/> <attribute name="toPaymentId" type="String" mode="IN" optional="true"/> @@ -100,7 +100,7 @@ under the License. <override name="paymentId" optional="false"/> </service> <service name="removePaymentApplication" default-entity-name="PaymentApplication" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="removePaymentApplication"> + location="component://accounting/minilang/invoice/InvoiceServices.xml" invoke="removePaymentApplication"> <description>Delete a paymentApplication record.</description> <permission-service service-name="acctgInvoicePermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> @@ -108,7 +108,7 @@ under the License. </service> <service name="createPaymentAndApplication" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentAndApplication" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentAndApplication" auth="true"> <description>Create a payment and a payment application for the full amount</description> <auto-attributes entity-name="Payment" include="nonpk" mode="IN" optional="true"/> <auto-attributes entity-name="Payment" include="pk" mode="INOUT" optional="true"/> @@ -126,14 +126,14 @@ under the License. </service> <service name="getInvoicePaymentInfoList" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="getInvoicePaymentInfoList" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="getInvoicePaymentInfoList" auth="true"> <description>Create a list with information on payment due dates and amounts for the invoice; one of invoiceId or invoice must be provided.</description> <attribute name="invoiceId" type="String" mode="IN" optional="true"/> <attribute name="invoice" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> <attribute name="invoicePaymentInfoList" type="List" mode="OUT" optional="false"/> </service> <service name="getInvoicePaymentInfoListByDueDateOffset" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="getInvoicePaymentInfoListByDueDateOffset" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="getInvoicePaymentInfoListByDueDateOffset" auth="true"> <description>Create a list with information on payment due dates and amounts.</description> <attribute name="invoiceTypeId" type="String" mode="IN" optional="false"/> <attribute name="daysOffset" type="Long" mode="IN" optional="false"/> @@ -142,7 +142,7 @@ under the License. <attribute name="invoicePaymentInfoList" type="List" mode="OUT" optional="true"/> </service> <service name="voidPayment" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="voidPayment" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="voidPayment" auth="true"> <description>Sets payment status to PMNT_VOID, removes all PaymentApplications, changes related invoice statuses to INVOICE_READY if status is INVOICE_PAID, and reverses related AcctgTrans by calling copyAcctgTransAndEntries service</description> <attribute name="paymentId" mode="IN" optional="false" type="String"/> @@ -150,19 +150,19 @@ under the License. <attribute name="statusId" type="String" mode="OUT" optional="true"/> </service> <service name="getPaymentRunningTotal" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="getPaymentRunningTotal" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="getPaymentRunningTotal" auth="true"> <description>calculate running total for payments</description> <attribute name="paymentIds" type="List" mode="IN" optional="false"/> <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/> <attribute name="paymentRunningTotal" type="String" mode="OUT" optional="false"/> </service> <service name="cancelPaymentBatch" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="cancelPaymentBatch" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="cancelPaymentBatch" auth="true"> <description>cancel payment batch</description> <attribute name="paymentGroupId" type="String" mode="IN" optional="false"/> </service> <service name="createPaymentAndPaymentGroupForInvoices" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentAndPaymentGroupForInvoices" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentAndPaymentGroupForInvoices" auth="true"> <description>Creates Payments, Payment Application and Payment Group for the same</description> <attribute name="organizationPartyId" type="String" mode="IN" optional="false"/> <attribute name="checkStartNumber" type="Long" mode="IN" optional="true"/> @@ -173,7 +173,7 @@ under the License. <attribute name="errorMessage" type="String" optional="true" mode="OUT"/> </service> <service name="createPaymentAndApplicationForParty" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentAndApplicationForParty" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentAndApplicationForParty" auth="true"> <description>create Payment and PaymentApplications for multiple invoices for one party</description> <attribute name="organizationPartyId" type="String" mode="INOUT" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="false"/> @@ -187,7 +187,7 @@ under the License. <attribute name="amount" type="BigDecimal" mode="OUT" optional="true"/> </service> <service name="createPaymentGroupAndMember" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentGroupAndMember" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentGroupAndMember" auth="true"> <attribute name="paymentIds" type="List" mode="IN" optional="false"/> <attribute name="paymentGroupTypeId" type="String" mode="IN" optional="false"/> <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/> @@ -195,38 +195,38 @@ under the License. <attribute name="paymentGroupId" type="String" mode="OUT" optional="false"/> </service> <service name="cancelCheckRunPayments" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="cancelCheckRunPayments" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="cancelCheckRunPayments" auth="true"> <description>Cancel all payments for payment group</description> <attribute name="paymentGroupId" type="String" mode="IN" optional="false"/> </service> <service name="createFinAccoutnTransFromPayment" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createFinAccoutnTransFromPayment" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createFinAccoutnTransFromPayment" auth="true"> <auto-attributes entity-name="FinAccountTrans" include="nonpk" mode="IN" optional="true"/> <auto-attributes entity-name="FinAccountTrans" include="pk" mode="INOUT" optional="true"/> <attribute name="invoiceIds" type="List" mode="IN" optional="true"/> </service> <service name="getPayments" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="getPayments" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="getPayments" auth="true"> <description>Get list of payment</description> <attribute name="paymentGroupId" type="String" mode="IN" optional="true"/> <attribute name="finAccountTransId" type="String" mode="IN" optional="true"/> <attribute name="payments" type="List" mode="OUT" optional="true"/> </service> <service name="getPaymentGroupReconciliationId" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="getPaymentGroupReconciliationId" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="getPaymentGroupReconciliationId" auth="true"> <description>Get ReconciliationId associated to paymentGroup</description> <attribute name="paymentGroupId" type="String" mode="IN" optional="false"/> <attribute name="glReconciliationId" type="String" mode="OUT" optional="true"/> </service> <service name="checkAndCreateBatchForValidPayments" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="checkAndCreateBatchForValidPayments" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="checkAndCreateBatchForValidPayments" auth="true"> <description>Check the valid(unbatched) payment and create batch for same</description> <implements service="createPaymentGroupAndMember"/> </service> <service name="massChangePaymentStatus" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="massChangePaymentStatus" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="massChangePaymentStatus" auth="true"> <description>Set status of Payments in bulk.</description> <attribute name="paymentIds" type="List" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="false"/> @@ -234,7 +234,7 @@ under the License. </service> <service name="createPaymentFromOrder" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentFromOrder" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentFromOrder" auth="true"> <description>Create Payment from Order when payment does exist yet and not disabled by accounting config</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="paymentId" type="String" mode="OUT" optional="true"/> @@ -244,7 +244,7 @@ under the License. </service> <service name="createMatchingPaymentApplication" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createMatchingPaymentApplication" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createMatchingPaymentApplication" auth="true"> <description>Create a payment application if either the invoice of payment could be found</description> <attribute name="paymentId" type="String" mode="IN" optional="true"/> <attribute name="invoiceId" type="String" mode="IN" optional="true"/> @@ -252,7 +252,7 @@ under the License. <!-- Payment content services --> <service name="createPaymentContent" default-entity-name="PaymentContent" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentContent" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="createPaymentContent" auth="true"> <description>Add Content To Payment</description> <auto-attributes include="pk" mode="INOUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -260,7 +260,7 @@ under the License. <override name="fromDate" optional="true"/> </service> <service name="updatePaymentContent" default-entity-name="PaymentContent" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="updatePaymentContent" auth="true"> + location="component://accounting/minilang/payment/PaymentServices.xml" invoke="updatePaymentContent" auth="true"> <description>Update Content To Payment</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml Fri Jun 10 14:04:30 2016 @@ -25,61 +25,61 @@ under the License. <version>1.0</version> <!-- Payment Gateway Config Method services --> - <service name="updatePaymentGatewayConfig" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfig"> + <service name="updatePaymentGatewayConfig" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfig"> <description>Update Payment Gateway Config</description> <auto-attributes entity-name="PaymentGatewayConfig" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayConfig" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigSagePay" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigSagePay"> + <service name="updatePaymentGatewayConfigSagePay" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigSagePay"> <description>Update Payment Gateway Config SagePay</description> <auto-attributes entity-name="PaymentGatewaySagePay" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewaySagePay" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigAuthorizeNet" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigAuthorizeNet"> + <service name="updatePaymentGatewayConfigAuthorizeNet" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigAuthorizeNet"> <description>Update Payment Gateway Config Authorize Dot Net</description> <auto-attributes entity-name="PaymentGatewayAuthorizeNet" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayAuthorizeNet" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigClearCommerce" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigClearCommerce"> + <service name="updatePaymentGatewayConfigClearCommerce" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigClearCommerce"> <description>Update Payment Gateway Config Clear Commerce</description> <auto-attributes entity-name="PaymentGatewayClearCommerce" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayClearCommerce" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigCyberSource" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigCyberSource"> + <service name="updatePaymentGatewayConfigCyberSource" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigCyberSource"> <description>Update Payment Gateway Config CyberSource</description> <auto-attributes entity-name="PaymentGatewayCyberSource" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayCyberSource" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigPayflowPro" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayflowPro"> + <service name="updatePaymentGatewayConfigPayflowPro" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayflowPro"> <description>Update Payment Gateway Config Payflow Pro</description> <auto-attributes entity-name="PaymentGatewayPayflowPro" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayPayflowPro" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigPayPal" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayPal"> + <service name="updatePaymentGatewayConfigPayPal" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayPal"> <description>Update Payment Gateway Config PayPal</description> <auto-attributes entity-name="PaymentGatewayPayPal" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayPayPal" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigWorldPay" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigWorldPay"> + <service name="updatePaymentGatewayConfigWorldPay" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigWorldPay"> <description>Update Payment Gateway Config WorldPay</description> <auto-attributes entity-name="PaymentGatewayWorldPay" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayWorldPay" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigType" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigType"> + <service name="updatePaymentGatewayConfigType" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigType"> <description>Update Payment Gateway Config Type</description> <auto-attributes entity-name="PaymentGatewayConfigType" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayConfigType" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePaymentGatewayConfigSecurePay" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigSecurePay"> + <service name="updatePaymentGatewayConfigSecurePay" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigSecurePay"> <description>Update Payment Gateway Config SecurePay</description> <auto-attributes entity-name="PaymentGatewaySecurePay" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewaySecurePay" include="nonpk" mode="IN" optional="true"/> @@ -90,7 +90,7 @@ under the License. <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> - <service name="updatePaymentGatewayConfigiDEAL" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigiDEAL"> + <service name="updatePaymentGatewayConfigiDEAL" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigiDEAL"> <description>Update Payment Gateway Config iDEAL</description> <auto-attributes entity-name="PaymentGatewayiDEAL" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayiDEAL" include="nonpk" mode="IN" optional="true"/> Modified: ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml Fri Jun 10 14:04:30 2016 @@ -167,20 +167,20 @@ under the License. </service> <service name="setPaymentMethodAddress" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="setPaymentMethodAddress" auth="true"> + location="component://accounting/minilang/payment/PaymentMethodServices.xml" invoke="setPaymentMethodAddress" auth="true"> <description>Set the inital payment method address.</description> <attribute name="paymentMethodId" type="String" mode="IN" optional="false"/> <attribute name="contactMechId" type="String" mode="IN" optional="false"/> </service> <service name="updatePaymentMethodAddress" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="updatePaymentMethodAddress" auth="true" use-transaction="false"> + location="component://accounting/minilang/payment/PaymentMethodServices.xml" invoke="updatePaymentMethodAddress" auth="true" use-transaction="false"> <description>Finds CreditCards and EftAccounts that use the oldContactMechId and updates to the contactMechId</description> <attribute name="contactMechId" type="String" mode="IN" optional="false"/> <attribute name="oldContactMechId" type="String" mode="IN" optional="false"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> </service> <service name="createPayPalPaymentMethod" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="createPayPalPaymentMethod" auth="true"> + location="component://accounting/minilang/payment/PaymentMethodServices.xml" invoke="createPayPalPaymentMethod" auth="true"> <description>Create a PayPal Payment Method</description> <auto-attributes mode="INOUT" entity-name="PayPalPaymentMethod" include="pk" optional="true"/> <auto-attributes mode="IN" entity-name="PayPalPaymentMethod" include="nonpk" optional="true"/> @@ -190,7 +190,7 @@ under the License. <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> </service> <service name="updatePayPalPaymentMethod" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="updatePayPalPaymentMethod" auth="true"> + location="component://accounting/minilang/payment/PaymentMethodServices.xml" invoke="updatePayPalPaymentMethod" auth="true"> <description>Update a PayPal Payment Method</description> <attribute name="paymentMethodId" mode="INOUT" type="String" optional="false"/> <auto-attributes mode="IN" entity-name="PayPalPaymentMethod" include="nonpk" optional="true"/> @@ -823,7 +823,7 @@ under the License. <!-- Payment Group Member --> <service name="createPaymentGroupMember" default-entity-name="PaymentGroupMember" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="createPaymentGroupMember" auth="true"> + location="component://accounting/minilang/payment/PaymentMethodServices.xml" invoke="createPaymentGroupMember" auth="true"> <description>Check For Outgoing/Incoming Payment And Create Payment Group Member</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -839,7 +839,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="expirePaymentGroupMember" default-entity-name="PaymentGroupMember" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="expirePaymentGroupMember" auth="true"> + location="component://accounting/minilang/payment/PaymentMethodServices.xml" invoke="expirePaymentGroupMember" auth="true"> <description>expire a Payment Group Member</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> Modified: ofbiz/trunk/applications/accounting/servicedef/services_perm.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_perm.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_perm.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_perm.xml Fri Jun 10 14:04:30 2016 @@ -24,73 +24,73 @@ under the License. <vendor>OFBiz</vendor> <version>1.0</version> <service name="acctgAgreementPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgAgreementPermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgAgreementPermissionCheck"> <description>Accounting Agreement Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgBasePermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="basePermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="basePermissionCheck"> <description>Accounting Basic Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgBillingAcctCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgBillingAcctCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgBillingAcctCheck"> <description>Basic Billing Account Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgCommissionPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="commissionPermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="commissionPermissionCheck"> <description>Accounting Commission Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgCostPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgCostPermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgCostPermissionCheck"> <description>Accounting Cost Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgFinAcctPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgFinAcctPermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgFinAcctPermissionCheck"> <description>Accounting Financial Account Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgFxPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgFxPermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgFxPermissionCheck"> <description>Accounting Foreign Exchange Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgInvoicePermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgInvoicePermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgInvoicePermissionCheck"> <description>Accounting Invoice Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgPrefPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="preferencePermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="preferencePermissionCheck"> <description>Accounting Preferences Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="acctgTransactionPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgTransactionPermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="acctgTransactionPermissionCheck"> <description>Basic General Ledger Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="basicGeneralLedgerPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="basePermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="basePermissionCheck"> <description>Basic General Ledger Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="fixedAssetPermissionCheck" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="basePermissionCheck"> + location="component://accounting/minilang/permissions/PermissionServices.xml" invoke="basePermissionCheck"> <description>Fixed Asset Permission Checking Logic</description> <implements service="permissionInterface"/> </service> Modified: ofbiz/trunk/applications/accounting/servicedef/services_rate.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_rate.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_rate.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_rate.xml Fri Jun 10 14:04:30 2016 @@ -25,21 +25,21 @@ under the License. <version>1.0</version> <service name="updateRateAmount" default-entity-name="RateAmount" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml" invoke="updateRateAmount"> + location="component://accounting/minilang/rate/RateServices.xml" invoke="updateRateAmount"> <description>Create/update Rate Amount</description> <auto-attributes include="all" mode="IN" optional="true"/> <override name="rateTypeId" optional="false"/> <override name="rateAmount" optional="false"/> </service> <service name="deleteRateAmount" default-entity-name="RateAmount" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml" invoke="deleteRateAmount"> + location="component://accounting/minilang/rate/RateServices.xml" invoke="deleteRateAmount"> <description>Delete (expire) Rate Amount</description> <auto-attributes include="pk" mode="IN" optional="true"/> <override name="rateTypeId" optional="false"/> <override name="fromDate" optional="false"/> </service> <service name="getRateAmount" default-entity-name="RateAmount" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml" invoke="getRateAmount"> + location="component://accounting/minilang/rate/RateServices.xml" invoke="getRateAmount"> <description>Get Rate Amount</description> <auto-attributes include="pk" mode="IN" optional="true"/> <attribute name="level" type="String" mode="OUT" optional="true"/><!-- the level the amount was retrieved from(specific -> general): workEffort, party, emplPositionType, rateType or 'null' if not found--> @@ -52,7 +52,7 @@ under the License. <!-- PartyRate Services --> <service name="updatePartyRate" default-entity-name="PartyRate" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml" invoke="updatePartyRate"> + location="component://accounting/minilang/rate/RateServices.xml" invoke="updatePartyRate"> <description>Creates PartyRate</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -63,7 +63,7 @@ under the License. <override name="fromDate" optional="true"/> </service> <service name="deletePartyRate" default-entity-name="PartyRate" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml" invoke="deletePartyRate"> + location="component://accounting/minilang/rate/RateServices.xml" invoke="deletePartyRate"> <description>Deletes PartyRate</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="rateAmountFromDate" type="Timestamp" mode="IN" optional="true"/><!-- to be able to expire rateamount specific to a party records....--> Modified: ofbiz/trunk/applications/accounting/servicedef/services_tax.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_tax.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_tax.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_tax.xml Fri Jun 10 14:04:30 2016 @@ -120,7 +120,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteTaxAuthorityCategory" default-entity-name="TaxAuthorityCategory" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthorityCategory"> + location="component://accounting/minilang/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthorityCategory"> <description>Delete TaxAuthorityCategory</description> <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -166,7 +166,7 @@ under the License. <!-- PartyTaxAuthInfo --> <service name="createPartyTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createPartyTaxAuthInfo"> + location="component://accounting/minilang/tax/TaxAuthorityServices.xml" invoke="createPartyTaxAuthInfo"> <description>Create PartyTaxAuthInfo</description> <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -174,7 +174,7 @@ under the License. <override name="fromDate" optional="true"/> </service> <service name="updatePartyTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updatePartyTaxAuthInfo"> + location="component://accounting/minilang/tax/TaxAuthorityServices.xml" invoke="updatePartyTaxAuthInfo"> <description>Update PartyTaxAuthInfo</description> <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -187,7 +187,7 @@ under the License. </service> <service name="createCustomerTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true" - location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createCustomerTaxAuthInfo"> + location="component://accounting/minilang/tax/TaxAuthorityServices.xml" invoke="createCustomerTaxAuthInfo"> <description>Create Customer PartyTaxAuthInfo</description> <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/accounting/servicedef/services_upgrade.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_upgrade.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_upgrade.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_upgrade.xml Fri Jun 10 14:04:30 2016 @@ -24,7 +24,7 @@ under the License. <vendor>OFBiz</vendor> <service name="migrateStatusToGlReconciliation" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/UpgradeServices.xml" invoke="migrateStatusToGlReconciliation"> + location="component://accounting/minilang/UpgradeServices.xml" invoke="migrateStatusToGlReconciliation"> <description> Migrate statusId to GlReconciliation entity, this service can be used to upgrade existing data i.e it sets the statusId(new field in entity) to "Created" if reconciledBalance found empty otherwise sets "Reconciled". @@ -34,7 +34,7 @@ under the License. </service> <service name="migrateStatusToFinAccountTrans" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/UpgradeServices.xml" invoke="migrateStatusToFinAccountTrans"> + location="component://accounting/minilang/UpgradeServices.xml" invoke="migrateStatusToFinAccountTrans"> <description> Migrate statusId to FinAccountTrans entity, this service can be used to upgrade existing data i.e it sets the statusId(new field in entity) to "Approved" if found empty. @@ -44,13 +44,13 @@ under the License. </service> <service name="migrateFixedAssetMaintMeter" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/UpgradeServices.xml" invoke="migrateFixedAssetMaintMeter" auth="true"> + location="component://accounting/minilang/UpgradeServices.xml" invoke="migrateFixedAssetMaintMeter" auth="true"> <description>Copy the FixedAssetMaintMeter entity to FixedAssetMeter. FixedAssetMeter.readingDate will be replaced with FixedAssetMaintMeter.createdStamp.</description> <permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/> </service> <service name="migrateAgreementWorkEffortAppl" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/UpgradeServices.xml" invoke="migrateAgreementWorkEffortAppl" auth="true"> + location="component://accounting/minilang/UpgradeServices.xml" invoke="migrateAgreementWorkEffortAppl" auth="true"> <description>Copy the AgreementWorkEffortAppl entity to AgreementWorkEffortApplic</description> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/> </service> Modified: ofbiz/trunk/applications/accounting/testdef/accountingtests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/testdef/accountingtests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/testdef/accountingtests.xml (original) +++ ofbiz/trunk/applications/accounting/testdef/accountingtests.xml Fri Jun 10 14:04:30 2016 @@ -32,9 +32,9 @@ </test-case> <test-case case-name="auto-accounting-transaction-tests-sales"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTestsSales.xml"/> + <simple-method-test location="component://accounting/minilang/test/AutoAcctgTransTestsSales.xml"/> </test-case> <test-case case-name="auto-accounting-transaction-tests-purchase"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTestsPurchase.xml"/> + <simple-method-test location="component://accounting/minilang/test/AutoAcctgTransTestsPurchase.xml"/> </test-case> </test-suite> Modified: ofbiz/trunk/applications/accounting/testdef/fixedassettests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/testdef/fixedassettests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/testdef/fixedassettests.xml (original) +++ ofbiz/trunk/applications/accounting/testdef/fixedassettests.xml Fri Jun 10 14:04:30 2016 @@ -23,7 +23,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd";> <test-case case-name="fixedasset-tests"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/FixedAssetTests.xml"/> + <simple-method-test location="component://accounting/minilang/test/FixedAssetTests.xml"/> </test-case> </test-suite> Modified: ofbiz/trunk/applications/accounting/testdef/invoicetests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/testdef/invoicetests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/testdef/invoicetests.xml (original) +++ ofbiz/trunk/applications/accounting/testdef/invoicetests.xml Fri Jun 10 14:04:30 2016 @@ -23,9 +23,9 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd";> <test-case case-name="auto-invoice-tests"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml"/> + <simple-method-test location="component://accounting/minilang/test/AutoInvoiceTests.xml"/> </test-case> <test-case case-name="invoice-per-shipment-tests"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/InvoicePerShipmentTests.xml"/> + <simple-method-test location="component://accounting/minilang/test/InvoicePerShipmentTests.xml"/> </test-case> </test-suite> Modified: ofbiz/trunk/applications/accounting/testdef/paymentappltests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/testdef/paymentappltests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/testdef/paymentappltests.xml (original) +++ ofbiz/trunk/applications/accounting/testdef/paymentappltests.xml Fri Jun 10 14:04:30 2016 @@ -26,7 +26,7 @@ <entity-xml action="load" entity-xml-url="component://accounting/testdef/data/PaymentApplicationTestsData.xml"/> </test-case> <test-case case-name="application-tests"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml"/> + <simple-method-test location="component://accounting/minilang/test/PaymentApplicationTests.xml"/> </test-case> </test-suite> Modified: ofbiz/trunk/applications/accounting/testdef/paymenttests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/testdef/paymenttests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/testdef/paymenttests.xml (original) +++ ofbiz/trunk/applications/accounting/testdef/paymenttests.xml Fri Jun 10 14:04:30 2016 @@ -23,7 +23,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd";> <test-case case-name="auto-payment-tests"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml"/> + <simple-method-test location="component://accounting/minilang/test/AutoPaymentTests.xml"/> </test-case> <!-- enable when sandbox is available and configured --> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016 @@ -187,7 +187,7 @@ under the License. </request-map> <request-map uri="createInvoiceItemPayrol"> <security https="true" auth="true"/> - <event type="simple" invoke="createInvoiceItemPayrol" path="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml"/> + <event type="simple" invoke="createInvoiceItemPayrol" path="component://accounting/minilang/invoice/InvoiceEvents.xml"/> <response name="success" type="view" value="listInvoiceItems"/> <response name="error" type="view" value="listInvoiceItems"/> </request-map> Modified: ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml?rev=1747712&r1=1747586&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml (original) +++ ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml Fri Jun 10 14:04:30 2016 @@ -336,7 +336,7 @@ <set field="parameters.roleTypeId" value="CUSTOMER"/> <set field="organizationPartyId" from-field="parameters.partyId"/> <set field="personContext.partyId" from-field="parameters.customerPartyId"/> - <call-simple-method method-name="createUser" xml-resource="component://party/script/org/ofbiz/party/user/UserEvents.xml"/> + <call-simple-method method-name="createUser" xml-resource="component://party/minilang/user/UserEvents.xml"/> </simple-method> <simple-method method-name="createFacilityAndContactMech" short-description="create Facility and ContactMech"> @@ -528,7 +528,7 @@ <set field="checkAction" value="CREATE"/> <else><set field="checkAction" value="UPDATE"/></else> </if-empty> - <call-simple-method method-name="checkCategoryRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/category/CategoryServices.xml"/> + <call-simple-method method-name="checkCategoryRelatedPermission" xml-resource="component://product/minilang/product/category/CategoryServices.xml"/> <check-errors/> <if-empty field="parameters.currencyUomId"> Modified: ofbiz/trunk/applications/commonext/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/servicedef/services.xml (original) +++ ofbiz/trunk/applications/commonext/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -25,33 +25,33 @@ under the License. <version>1.0</version> <service name="createSystemInfoNote" engine="simple" default-entity-name="NoteData" - location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="createSystemInfoNote"> + location="component://commonext/minilang/SystemInfoServices.xml" invoke="createSystemInfoNote"> <description>Create a system info note</description> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSystemInfoNote" engine="simple" default-entity-name="NoteData" - location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="deleteSystemInfoNote"> + location="component://commonext/minilang/SystemInfoServices.xml" invoke="deleteSystemInfoNote"> <description>Delete a system info note</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="deleteAllSystemNotes" engine="simple" auth="true" - location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="deleteAllSystemNotes"> + location="component://commonext/minilang/SystemInfoServices.xml" invoke="deleteAllSystemNotes"> <description>Delete all system notes for the logged on party</description> </service> <service name="getSystemInfoNotes" engine="simple" auth="true" - location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="getSystemInfoNotes"> + location="component://commonext/minilang/SystemInfoServices.xml" invoke="getSystemInfoNotes"> <description>Get system notes for the logged on party</description> <attribute name="systemInfoNotes" type="List" mode="OUT" optional="true"/> </service> <service name="getLastSystemInfoNote" engine="simple" auth="false" - location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="getLastSystemInfoNote"> + location="component://commonext/minilang/SystemInfoServices.xml" invoke="getLastSystemInfoNote"> <description>Get last system note for the logged on party</description> <attribute name="lastSystemInfoNote1" type="GenericValue" mode="OUT" optional="true"/> <attribute name="lastSystemInfoNote2" type="GenericValue" mode="OUT" optional="true"/> <attribute name="lastSystemInfoNote3" type="GenericValue" mode="OUT" optional="true"/> </service> <service name="getSystemInfoStatus" engine="simple" auth="true" - location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="getSystemInfoStatus"> + location="component://commonext/minilang/SystemInfoServices.xml" invoke="getSystemInfoStatus"> <description>Get system status for the logged on party</description> <attribute name="systemInfoStatus" type="List" mode="OUT" optional="true"/> </service> Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016 @@ -70,7 +70,7 @@ </request-map> <request-map uri="createProductStore"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createProductStoreWithDefaultSetting"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createProductStoreWithDefaultSetting"/> <response name="success" type="view" value="EditProductStore"/> <response name="error" type="view" value="EditProductStore"/> </request-map> @@ -83,14 +83,14 @@ <request-map uri="createOrganization"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createOrganization"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createOrganization"/> <response name="success" type="view" value="initialsetup"/> <response name="error" type="view" value="initialsetup"/> </request-map> <request-map uri="OrganizationToComplete"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="setupDefaultGeneralLedger"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="setupDefaultGeneralLedger"/> <response name="success" type="url" value="/catalog"/> <response name="error" type="view" value="initialsetup"/> </request-map> @@ -105,7 +105,7 @@ </request-map> <request-map uri="CreateFacility"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createFacilityAndContactMech"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createFacilityAndContactMech"/> <response name="success" type="view" value="EditFacility"/> <response name="error" type="view" value="EditFacility"/> </request-map> @@ -123,7 +123,7 @@ </request-map> <request-map uri="createWebSite"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createDefaultWebSite"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createDefaultWebSite"/> <response name="success" type="view" value="EditWebSite"/> <response name="error" type="view" value="EditWebSite"/> </request-map> @@ -140,7 +140,7 @@ </request-map> <request-map uri="createProdCatalog"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createProdCatalogAndProductStoreCatalog"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createProdCatalogAndProductStoreCatalog"/> <response name="success" type="view" value="firstproduct"/> <response name="error" type="view" value="firstproduct"/> </request-map> @@ -157,7 +157,7 @@ </request-map> <request-map uri="createProductCategory"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createProductCategoryAndAddToProdCatalog"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createProductCategoryAndAddToProdCatalog"/> <response name="success" type="view" value="EditCategory"/> <response name="error" type="view" value="EditCategory"/> </request-map> @@ -174,7 +174,7 @@ </request-map> <request-map uri="createUpdateProduct"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createUpdateProductInCategory"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createUpdateProductInCategory"/> <response name="success" type="view" value="EditProduct"/> <response name="error" type="view" value="EditProduct"/> </request-map> @@ -185,7 +185,7 @@ </request-map> <request-map uri="createCustomer"> <security https="true" auth="true"/> - <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createCustomer"/> + <event type="simple" path="component://commonext/minilang/setup/SetupEvents.xml" invoke="createCustomer"/> <response name="success" type="view" value="firstcustomer"/> <response name="error" type="view" value="firstcustomer"/> </request-map> Modified: ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml?rev=1747712&r1=1747586&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml (original) +++ ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml Fri Jun 10 14:04:30 2016 @@ -92,11 +92,11 @@ under the License. <log level="always" message="in createLayoutText."/> <log level="always" message="parameters: ${parameters}"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="dataResourceIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentAssocIn" in-map-name="parameters" out-map-name="context"/> <log level="always" message="context: ${context}"/> @@ -151,11 +151,11 @@ under the License. <log level="always" message="in updateLayoutText."/> <log level="always" message="parameters: ${parameters}"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="dataResourceIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentAssocIn" in-map-name="parameters" out-map-name="context"/> <log level="always" message="context: ${context}"/> @@ -189,11 +189,11 @@ under the License. <log level="always" message="formInput: ${formInput}"/> <log level="always" message="byteWrap: ${byteWrap}"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentIn" in-map-name="formInput" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="dataResourceIn" in-map-name="formInput" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentAssocIn" in-map-name="formInput" out-map-name="context"/> <log level="always" message="context: ${context}"/> @@ -247,11 +247,11 @@ under the License. <log level="always" message="in createLayoutUrl"/> <log level="always" message="parameters: ${parameters}"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="dataResourceIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentAssocIn" in-map-name="parameters" out-map-name="context"/> <log level="always" message="context: ${context}"/> @@ -305,11 +305,11 @@ under the License. <log level="always" message="in updateLayoutUrl."/> <log level="always" message="parameters: ${parameters}"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="dataResourceIn" in-map-name="parameters" out-map-name="context"/> - <call-map-processor xml-resource="component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml" + <call-map-processor xml-resource="component://content/minilang/ContentManagementMapProcessors.xml" processor-name="contentAssocIn" in-map-name="parameters" out-map-name="context"/> <log level="always" message="context: ${context}"/> Modified: ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml Fri Jun 10 14:04:30 2016 @@ -22,17 +22,17 @@ <simple-method method-name="contentManagerPermission" short-description="Check user has Content Manager permission"> <set field="primaryPermission" value="CONTENTMGR"/> - <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </simple-method> <simple-method method-name="contentManagerRolePermission" short-description="Check user has Content Manager permission"> <set field="primaryPermission" value="CONTENTMGR"/> <set field="altPermission" value="CONTENTMGR_ROLE"/> - <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </simple-method> <simple-method method-name="genericContentPermission" short-description="Generic Service for Content Permissions"> <set field="primaryPermission" value="CONTENTMGR"/> - <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- setting the roleEntity or this service --> <set field="roleEntityField" value="contentId"/> @@ -112,13 +112,13 @@ <set field="primaryPermission" value="CONTENTMGR"/> <set field="mainAction" value="VIEW"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </if-empty> <!-- check content role permission --> <set field="primaryPermission" value="CONTENTMGR_ROLE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- must have the security permission to continue --> <if> @@ -162,7 +162,7 @@ <set field="primaryPermission" value="CONTENTMGR"/> <set field="mainAction" value="CREATE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </if-empty> <!-- ownerContentId can be set from a calling method --> @@ -183,7 +183,7 @@ <!-- check role permission? --> <set field="primaryPermission" value="CONTENTMGR_ROLE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- must have the security permission to continue --> <if> @@ -284,7 +284,7 @@ <set field="primaryPermission" value="CONTENTMGR"/> <set field="mainAction" value="UPDATE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </if-empty> <!-- contentId is required for update checking --> @@ -311,7 +311,7 @@ <!-- check role permission --> <set field="primaryPermission" value="CONTENTMGR_ROLE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- must have permission to continue --> <if> Modified: ofbiz/trunk/applications/content/minilang/permission/DataResourcePermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/permission/DataResourcePermissionServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/permission/DataResourcePermissionServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/permission/DataResourcePermissionServices.xml Fri Jun 10 14:04:30 2016 @@ -22,7 +22,7 @@ <simple-method method-name="genericDataResourcePermission" short-description="Generic Service for DataResource Permissions"> <set field="primaryPermission" value="CONTENTMGR"/> - <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- setting the roleEntity or this service --> <set field="roleEntityField" value="dataResourceId"/> @@ -81,13 +81,13 @@ <set field="primaryPermission" value="CONTENTMGR"/> <set field="mainAction" value="VIEW"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </if-empty> <!-- check role permission --> <set field="primaryPermission" value="CONTENTMGR_ROLE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </simple-method> <!-- DataResource Create Permission --> @@ -97,13 +97,13 @@ <set field="primaryPermission" value="CONTENTMGR"/> <set field="mainAction" value="CREATE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </if-empty> <!-- check role permission --> <set field="primaryPermission" value="CONTENTMGR_ROLE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- this is about the same as the VIEW permission; but left as a unique service for extending purposes --> </simple-method> @@ -115,7 +115,7 @@ <set field="primaryPermission" value="CONTENTMGR"/> <set field="mainAction" value="UPDATE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> </if-empty> <!-- dataResourceId is required for update checking --> @@ -132,7 +132,7 @@ <!-- check role permission --> <set field="primaryPermission" value="CONTENTMGR_ROLE"/> <call-simple-method method-name="genericBasePermissionCheck" - xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> <!-- must have permission to continue --> <if> @@ -155,7 +155,7 @@ <!-- check ownership of this record --> <set field="checkId" from-field="dataResourceId"/> - <call-simple-method method-name="checkOwnership" xml-resource="component://content/script/org/ofbiz/content/permission/ContentPermissionServices.xml"/> + <call-simple-method method-name="checkOwnership" xml-resource="component://content/minilang/permission/ContentPermissionServices.xml"/> </then> </if> </simple-method>
