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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

jleroux@apache.org
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016
@@ -331,7 +331,7 @@ under the License.
     </request-map>
     <request-map uri="processCustomerSettings">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="processCustomerSettings"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="processCustomerSettings"/>
         <response name="success" type="request" value="anonCheckShipmentNeeded"/>
         <response name="error" type="view" value="custsetting"/>
     </request-map>
@@ -351,7 +351,7 @@ under the License.
     </request-map>
     <request-map uri="processShipSettings">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="processShipSettings"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="processShipSettings"/>
         <response name="success" type="request" value="setShipOptions"/>
         <response name="error" type="view" value="shipsetting"/>
     </request-map>
@@ -363,7 +363,7 @@ under the License.
 
     <request-map uri="processShipOptions">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="processShipOptions"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="processShipOptions"/>
         <response name="success" type="request" value="setShippingBeforePayment"/>
         <response name="error" type="view" value="optionsetting"/>
     </request-map>
@@ -433,7 +433,7 @@ under the License.
 
     <request-map uri="processPaymentSettings">
        <security https="true" auth="false"/>
-       <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+       <event type="groovy" path="component://ecommerce/minilang/order/ProcessPaymentSettings.groovy"/>
        <response name="success" type="request" value="reviewOrder"/>
        <response name="error" type="view" value="paymentinformation"/>
    </request-map>
@@ -466,7 +466,7 @@ under the License.
 
     <request-map uri="quickAnonProcessCustomerSettings">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="createUpdateCustomer"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/QuickAnonCustomerEvents.xml" invoke="createUpdateCustomer"/>
         <response name="success" type="request" value="quickAnonOrderReview"/>
         <response name="error" type="view" value="quickAnonCustSetting"/>
     </request-map>
@@ -478,14 +478,14 @@ under the License.
 
     <request-map uri="quickAnonProcessShipOptions">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="processShipOptions"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/QuickAnonCustomerEvents.xml" invoke="processShipOptions"/>
         <response name="success" type="view" value="quickAnonOptionSetting"/>
         <response name="error" type="view" value="quickAnonOptionSetting"/>
     </request-map>
 
     <request-map uri="quickAnonProcessShipOptionsUpdateOrderItems">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="processShipOptions"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/QuickAnonCustomerEvents.xml" invoke="processShipOptions"/>
         <response name="success" type="request" value="quickAnonUpdateShippingChargeOrderItems"/>
         <response name="error" type="view" value="quickAnonOrderItems"/>
     </request-map>
@@ -519,7 +519,7 @@ under the License.
 
     <request-map uri="quickAnonAddCreditCardToCart">
        <security https="true" auth="false"/>
-       <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+       <event type="groovy" path="component://ecommerce/minilang/order/ProcessPaymentSettings.groovy"/>
        <response name="success" type="view" value="quickAnonCcInfo"/>
        <response name="error" type="view" value="quickAnonCcInfo"/>
    </request-map>
@@ -533,21 +533,21 @@ under the License.
 
    <request-map uri="quickAnonAddEftAccountToCart">
        <security https="true" auth="false"/>
-       <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+       <event type="groovy" path="component://ecommerce/minilang/order/ProcessPaymentSettings.groovy"/>
        <response name="success" type="view" value="quickAnonEftInfo"/>
        <response name="error" type="view" value="quickAnonEftInfo"/>
    </request-map>
 
    <request-map uri="quickAnonEnterExtOffline">
         <security https="true" auth="false"/>
-        <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+        <event type="groovy" path="component://ecommerce/minilang/order/ProcessPaymentSettings.groovy"/>
         <response name="success" type="view" value="quickAnonOrderReview"/>
         <response name="error" type="view" value="quickAnonOrderReview"/>
    </request-map>
 
    <request-map uri="quickAnonAddGiftCardToCart">
        <security https="true" auth="false"/>
-       <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+       <event type="groovy" path="component://ecommerce/minilang/order/ProcessPaymentSettings.groovy"/>
        <response name="success" type="request" value="quickAnonGcInfo"/>
        <response name="error" type="view" value="quickAnonGcInfo"/>
    </request-map>
@@ -972,7 +972,7 @@ under the License.
     </request-map>
     <request-map uri="createcustomer">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="createCustomer"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="createCustomer"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="newcustomer"/>
     </request-map>
@@ -1090,14 +1090,14 @@ under the License.
     </request-map>
     <request-map uri="createCreditCard">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml" invoke="createCreditCard"/>
+        <event type="simple" path="component://accounting/minilang/payment/PaymentMethodEvents.xml" invoke="createCreditCard"/>
         <response name="success" type="view" value="editcreditcard"/>
         <response name="address" type="view" value="editcontactmech"/>
         <response name="error" type="view" value="editcreditcard"/>
     </request-map>
     <request-map uri="updateCreditCard">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml" invoke="updateCreditCard"/>
+        <event type="simple" path="component://accounting/minilang/payment/PaymentMethodEvents.xml" invoke="updateCreditCard"/>
         <response name="success" type="view" value="editcreditcard"/>
         <response name="address" type="view" value="editcontactmech"/>
         <response name="error" type="view" value="editcreditcard"/>
@@ -1126,20 +1126,20 @@ under the License.
     </request-map>
     <request-map uri="createEftAccount">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml" invoke="createEftAccount"/>
+        <event type="simple" path="component://accounting/minilang/payment/PaymentMethodEvents.xml" invoke="createEftAccount"/>
         <response name="success" type="view" value="editeftaccount"/>
         <response name="error" type="view" value="editeftaccount"/>
     </request-map>
     <request-map uri="updateEftAccount">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml" invoke="updateEftAccount"/>
+        <event type="simple" path="component://accounting/minilang/payment/PaymentMethodEvents.xml" invoke="updateEftAccount"/>
         <response name="success" type="view" value="editeftaccount"/>
         <response name="error" type="view" value="editeftaccount"/>
     </request-map>
 
     <request-map uri="deletePaymentMethod">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml" invoke="deletePaymentMethod"/>
+        <event type="simple" path="component://accounting/minilang/payment/PaymentMethodEvents.xml" invoke="deletePaymentMethod"/>
         <response name="success" type="view" value="viewprofile"/>
         <response name="error" type="view" value="viewprofile"/>
     </request-map>
@@ -1176,7 +1176,7 @@ under the License.
 
     <request-map uri="updatePassword">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml" invoke="updatePassword"/>
+        <event type="simple" path="component://securityext/minilang/login/LoginSimpleEvents.xml" invoke="updatePassword"/>
         <response name="success" type="view" value="changepassword"/>
         <response name="error" type="view" value="changepassword"/>
     </request-map>
@@ -1307,7 +1307,7 @@ under the License.
     </request-map>
     <request-map uri="submitAnonContact">
         <security https="true" auth="false"/>
-        <event type="simple" invoke="createAnonContact" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml"/>
+        <event type="simple" invoke="createAnonContact" path="component://ecommerce/minilang/customer/CustomerEvents.xml"/>
         <response name="success" type="request-redirect" value="main"/>
         <response name="error" type="request" value="AnonContactus"/>
     </request-map>
@@ -1651,13 +1651,13 @@ under the License.
     </request-map>
     <request-map uri="getShipOptions">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="getShipOptions"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="getShipOptions"/>
         <response name="success" type="request" value="json"/>
         <response name="error" type="request" value="json"/>
     </request-map>
     <request-map uri="setShippingOption">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="setShippingOption"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="setShippingOption"/>
         <response name="success" type="request" value="json"/>
         <response name="error" type="request" value="json"/>
     </request-map>
@@ -1751,14 +1751,14 @@ under the License.
 
     <request-map uri="createCustomerProfile">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="createCustomerProfile"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="createCustomerProfile"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="newcustomer"/>
     </request-map>
 
     <request-map uri="updateCustomerProfile">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="updateCustomerProfile"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="updateCustomerProfile"/>
         <response name="success" type="view" value="viewprofile"/>
         <response name="error" type="view" value="EditProfile"/>
     </request-map>
@@ -1885,7 +1885,7 @@ under the License.
         <response name="success" type="view" value="productCategoryList" save-current-view="true"/>
     </request-map>
     <request-map uri="fromSetSessionLocale">
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="fromSetSessionLocale"/>
+        <event type="simple" path="component://ecommerce/minilang/customer/CustomerEvents.xml" invoke="fromSetSessionLocale"/>
         <response name="success" type="view-last" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>

Copied: ofbiz/trunk/specialpurpose/example/minilang/README.txt (from r1747658, ofbiz/trunk/specialpurpose/example/script/script.txt)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/minilang/README.txt?p2=ofbiz/trunk/specialpurpose/example/minilang/README.txt&p1=ofbiz/trunk/specialpurpose/example/script/script.txt&r1=1747658&r2=1747712&rev=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/script/script.txt (original)
+++ ofbiz/trunk/specialpurpose/example/minilang/README.txt Fri Jun 10 14:04:30 2016
@@ -17,4 +17,4 @@
 # under the License.
 #####################################################################
 
-The script directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file.
+The minilang directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file.

Modified: ofbiz/trunk/specialpurpose/example/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/example/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -47,7 +47,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="createExampleStatus" default-entity-name="ExampleStatus" engine="simple"
-            location="component://example/script/org/ofbiz/example/example/ExampleServices.xml" invoke="createExampleStatus" auth="true">
+            location="component://example/minilang/example/ExampleServices.xml" invoke="createExampleStatus" auth="true">
         <description>Create a ExampleStatus</description>
         <permission-service service-name="exampleGenericPermission" main-action="CREATE"/>
         <auto-attributes include="all" mode="IN" optional="false">
@@ -117,13 +117,13 @@ under the License.
 
     <!-- Permission Services -->
     <service name="exampleGenericPermission" engine="simple"
-             location="component://example/script/org/ofbiz/example/ExamplePermissionServices.xml" invoke="exampleGenericPermission">
+             location="component://example/minilang/ExamplePermissionServices.xml" invoke="exampleGenericPermission">
         <implements service="permissionInterface"/>
     </service>
 
     <!-- Example ServiceTest Service -->
     <service name="testCreateExampleService" engine="simple"
-             location="component://example/script/org/ofbiz/example/example/ExampleServices.xml" invoke="testCreateExampleService">
+             location="component://example/minilang/example/ExampleServices.xml" invoke="testCreateExampleService">
         <implements service="testServiceInterface"/>
     </service>
 </services>

Modified: ofbiz/trunk/specialpurpose/example/testdef/tests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/testdef/tests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/testdef/tests.xml (original)
+++ ofbiz/trunk/specialpurpose/example/testdef/tests.xml Fri Jun 10 14:04:30 2016
@@ -29,6 +29,6 @@ under the License.
         <service-test service-name="testCreateExampleService"/>
     </test-case>
     <test-case case-name="testCreateExampleService Direct Simple Method">
-        <simple-method-test location="component://example/script/org/ofbiz/example/example/ExampleServices.xml" name="testCreateExampleService"/>
+        <simple-method-test location="component://example/minilang/example/ExampleServices.xml" name="testCreateExampleService"/>
     </test-case>
 </test-suite>

Modified: ofbiz/trunk/specialpurpose/googlebase/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -71,7 +71,7 @@ under the License.
     
     <!-- Auto update to google base **scheduled service -->
     <service name="autoUpdateToGoogleBase" engine="simple"
-        location="component://googlebase/script/org/ofbiz/googlebase/GooglebaseServices.xml" invoke="autoUpdateToGoogleBase" auth="true" use-transaction="false">
+        location="component://googlebase/minilang/GooglebaseServices.xml" invoke="autoUpdateToGoogleBase" auth="true" use-transaction="false">
         <description>Auto update to google base</description>
         <attribute type="List" mode="OUT" name="allProductExportList" optional="true"/>
     </service>

Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016
@@ -55,7 +55,7 @@ under the License.
     </request-map>
     <request-map uri="startStopScheduledGbase">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://googlebase/script/org/ofbiz/googlebase/GooglebaseEvents.xml" invoke="startStopScheduledGbase"/>
+        <event type="simple" path="component://googlebase/minilang/GooglebaseEvents.xml" invoke="startStopScheduledGbase"/>
         <response name="success" type="view" value="GooglebaseAutoUpdate"/>
         <response name="error" type="view" value="GooglebaseAutoUpdate"/>
     </request-map>

Modified: ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -22,23 +22,23 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
    <!-- Start Old Implementation to send data in XML format -->
     <service name="ConvertOfbizCartToGoogle" engine="simple" invoke="ConvertOfbizCartToGoogle" auth="false"
-        location="component://googlecheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml">
+        location="component://googleCheckout/minilang/ShoppingCartServices.xml">
         <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.WebShoppingCart" mode="IN" optional="false"/>
         <attribute name="googleCart" mode="OUT" type="Map" optional="false"/>
         <attribute name="flowSupport" mode="OUT" type="Map" optional="false"/>
         <attribute name="sendInitialAuthDetails" mode="OUT" type="Boolean" optional="false"/>
     </service>
     <service name="createXMLOutput" engine="simple" invoke="createXMLOutput" auth="false"
-        location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml">
+        location="component://googleCheckout/minilang/PrepareXMLTemplate.xml">
         <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.WebShoppingCart" mode="IN" optional="false"/>
     </service>
     <service name="transmitRequest" engine="simple" invoke="transmitRequest" auth="false"
-        location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml">
+        location="component://googleCheckout/minilang/PrepareXMLTemplate.xml">
         <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
         <attribute name="redirect" mode="OUT" type="String" optional="false"/>
     </service>
     <service name="connectToGoogleCheckoutServer" engine="simple" invoke="connectToGoogleCheckoutServer" auth="false"
-        location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml">
+        location="component://googleCheckout/minilang/PrepareXMLTemplate.xml">
         <attribute name="conn" mode="OUT" type="java.net.HttpURLConnection" optional="false"/>
     </service>
     <!-- End Old Implementation to send data in XML format -->

Modified: ofbiz/trunk/specialpurpose/hhfacility/servicedef/services_hhfacility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/servicedef/services_hhfacility.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/servicedef/services_hhfacility.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/servicedef/services_hhfacility.xml Fri Jun 10 14:04:30 2016
@@ -23,13 +23,13 @@ under the License.
     <description>Handheld Facility Demo Services</description>
 
     <service name="tc_ProductExists" engine="simple"
-        location="component://hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml" invoke="tc_ProductExists">
+        location="component://hhfacility/minilang/FacilityServices.xml" invoke="tc_ProductExists">
         <description>Check Product exists</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="tc_ReceiveProductQty" engine="simple"
-        location="component://hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml" invoke="tc_ReceiveProductQty">
+        location="component://hhfacility/minilang/FacilityServices.xml" invoke="tc_ReceiveProductQty">
         <description>Receive Product Qty to Facility</description>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -24,11 +24,11 @@ under the License.
 
     <!-- check access in permission service -->
     <service name="portalPermissionIsEmployee" engine="simple"
-        location="component://myportal/script/org/ofbiz/myportal/MyPortalServices.xml" invoke="portalPermissionIsEmployee">
+        location="component://myportal/minilang/MyPortalServices.xml" invoke="portalPermissionIsEmployee">
         <implements service="permissionInterface"/>
     </service>
     <service name="portalPermissionIsCustomer" engine="simple"
-        location="component://myportal/script/org/ofbiz/myportal/MyPortalServices.xml" invoke="portalPermissionIsCustomer">
+        location="component://myportal/minilang/MyPortalServices.xml" invoke="portalPermissionIsCustomer">
         <implements service="permissionInterface"/>
     </service>
 </services>

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016
@@ -42,7 +42,7 @@
     </request-map>
     <request-map uri="createRegister">
         <security https="true" auth="false"/>
-        <event type="simple" invoke="createRegister" path="component://myportal/script/org/ofbiz/myportal/Events.xml"/>
+        <event type="simple" invoke="createRegister" path="component://myportal/minilang/Events.xml"/>
         <response name="error" type="view" value="newRegisterLogin"/>
         <response name="resultPage" type="view" value="newRegisterLogin"/>
     </request-map>
@@ -63,7 +63,7 @@
     </request-map>
     <request-map uri="DuplicatePortalPage">
         <security https="true" auth="true"/>
-        <event  type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
+        <event  type="simple" invoke="duplicatePortalPage" path="component://common/minilang/PortalPageMethods.xml"/>
         <response name="success" type="view" value="EditPortalPage"/>
     </request-map>
     <request-map uri="NewPortalPage">

Modified: ofbiz/trunk/specialpurpose/oagis/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -31,33 +31,33 @@ under the License.
 
     <!-- Low Level CrUD Services -->
     <service name="createOagisMessageInfo" engine="simple" default-entity-name="OagisMessageInfo" require-new-transaction="true"
-            location="component://oagis/script/org/ofbiz/oagis/OagisMessageServices.xml" invoke="createOagisMessageInfo" auth="true">
+            location="component://oagis/minilang/OagisMessageServices.xml" invoke="createOagisMessageInfo" auth="true">
          <description>Create MessageInfo</description>
          <auto-attributes mode="IN" include="pk" optional="false"/>
          <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="updateOagisMessageInfo" engine="simple" default-entity-name="OagisMessageInfo" require-new-transaction="true"
-             location="component://oagis/script/org/ofbiz/oagis/OagisMessageServices.xml" invoke="updateOagisMessageInfo" auth="true">
+             location="component://oagis/minilang/OagisMessageServices.xml" invoke="updateOagisMessageInfo" auth="true">
         <description>Update MessageInfo</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="createOagisMessageErrorInfo" engine="simple" default-entity-name="OagisMessageErrorInfo"
-            location="component://oagis/script/org/ofbiz/oagis/OagisMessageServices.xml" invoke="createOagisMessageErrorInfo" auth="true">
+            location="component://oagis/minilang/OagisMessageServices.xml" invoke="createOagisMessageErrorInfo" auth="true">
          <description>Create MessageErrorInfo</description>
          <auto-attributes mode="IN" include="pk" optional="false"/>
          <auto-attributes mode="IN" include="nonpk" optional="true"/>
          <override name="errorSeqId" optional="true"/>
     </service>
     <service name="updateOagisMessageErrorInfo" engine="simple" default-entity-name="OagisMessageErrorInfo"
-             location="component://oagis/script/org/ofbiz/oagis/OagisMessageServices.xml" invoke="updateOagisMessageErrorInfo" auth="true">
+             location="component://oagis/minilang/OagisMessageServices.xml" invoke="updateOagisMessageErrorInfo" auth="true">
         <description>Update MessageErrorInfo</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
 
     <service name="createOagisMsgErrInfosFromErrMapList" engine="simple"
-            location="component://oagis/script/org/ofbiz/oagis/OagisMessageServices.xml" invoke="createOagisMsgErrInfosFromErrMapList" auth="true">
+            location="component://oagis/minilang/OagisMessageServices.xml" invoke="createOagisMsgErrInfosFromErrMapList" auth="true">
          <description>Create MessageErrorInfo From Error Map List</description>
         <auto-attributes entity-name="OagisMessageInfo" mode="IN" include="pk" optional="false"/>
          <attribute type="List" mode="IN" name="errorMapList" optional="true"/>

Copied: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml (from r1747658, ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml?p2=ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml&p1=ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml&r1=1747658&r2=1747712&rev=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml Fri Jun 10 14:04:30 2016
@@ -27,7 +27,7 @@
             <call-simple-method method-name="copyProject"/>
             <else>
                 <set field="parameters.currentStatusId" value="PRJ_ACTIVE"/>
-                <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
             </else>
         </if-not-empty>
         <set field="parameters.workEffortId" from-field="newEntity.workEffortId"/>
@@ -163,11 +163,11 @@
         <if-empty field="parameters.statusId">
             <set field="parameters.statusId" value="PTS_CREATED"/>
         </if-empty>
-        <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+        <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
         <set field="parameters.workEffortId" from-field="newEntity.workEffortId"/>
         <!-- optionally assign to party -->
         <if-not-empty field="parameters.partyId">
-            <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+            <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
         </if-not-empty>
         <!-- optionally enter estimated time and required skill -->
         <if-not-empty field="parameters.estimatedHours">
@@ -175,7 +175,7 @@
             <if-empty field="parameters.skillTypeId">
                 <set field="parameters.skillTypeId" value="_NA_"/>
             </if-empty>
-            <call-simple-method method-name="createWorkEffortSkillStandard" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+            <call-simple-method method-name="createWorkEffortSkillStandard" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
         </if-not-empty>
     </simple-method>
 
@@ -267,7 +267,7 @@
                     </if-compare>
                     <else>
                         <!-- new assignment -->
-                        <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                        <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
                     </else>
                 </if-not-empty>
             </else>
@@ -290,7 +290,7 @@
         <if-empty field="status">
             <now-timestamp field="parameters.actualCompletionDate"/>
             <set field="parameters.currentStatusId" value="PTS_COMPLETED"/>
-            <call-simple-method method-name="updateWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+            <call-simple-method method-name="updateWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
             <!-- check for related customer request, set these too to completed -->
             <entity-and list="custRequests" entity-name="CustRequestWorkEffort">
                 <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
@@ -487,7 +487,7 @@
             <set field="parameters.partyId" from-field="timesheet.partyId"/>
             <set field="parameters.roleTypeId" from-field="projectAssign.roleTypeId"/>
             <set field="parameters.statusId" value="PAS_ASSIGNED"/>
-            <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+            <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
         </if-empty>
         <check-errors/>
 
@@ -628,7 +628,7 @@
         </if-not-empty>
         <set field="parameters.currentStatusId" value="PRJ_ACTIVE"/>
         <clear-field field="parameters.workEffortId"/>
-        <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+        <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
         <set field="newProjectId" from-field="newEntity.workEffortId"/>
 
         <!-- copy assigned parties -->
@@ -640,7 +640,7 @@
                 <set field="parameters.partyId" from-field="party.partyId"/>
                 <set field="parameters.roleTypeId" from-field="party.roleTypeId"/>
                 <set field="parameters.statusId" value="PAS_ASSIGNED"/>
-                <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
             </iterate>
         </if-not-empty>
 
@@ -658,7 +658,7 @@
                 <set field="parameters.workEffortParentId" from-field="newProjectId"/>
                 <set field="parameters.currentStatusId" value="_NA_"/>
                 <clear-field field="parameters.workEffortId"/>
-                <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
                 <set field="newPhaseId" from-field="newEntity.workEffortId"/>
 
                 <get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/>
@@ -676,7 +676,7 @@
                         <set field="parameters.workEffortParentId" from-field="newPhaseId"/>
                         <set field="parameters.currentStatusId" value="PTS_CREATED"/>
                         <clear-field field="parameters.workEffortId"/>
-                        <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                        <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
                     </iterate>
                 </if-not-empty>
             </iterate>
@@ -860,7 +860,7 @@
                 <!-- get the planned/actual hours -->
                 <set field="lowInfo" from-field="task"/>
                 <set field="parameters.hoursPartyId" from-field="task.partyId"/>
-                <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                <call-simple-method method-name="getHours" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
                 <set field="projectParty.plannedHours" from-field="highInfo.plannedHours" type="Double"/>
                 <set field="projectParty.actualHours" from-field="highInfo.actualHours" type="Double"/>
             </iterate>
@@ -919,7 +919,7 @@
                 <set field="lowInfo" from-field="task"/>
                 <set field="parameters.hoursPartyId" from-field="task.partyId"/>
                 <get-related-one value-field="task" relation-name="WorkEffort" to-value-field="lowInfo"/>
-                <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+                <call-simple-method method-name="getHours" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
                 <set field="taskParty.plannedHours" from-field="highInfo.plannedHours" type="Double"/>
                 <set field="taskParty.actualHours" from-field="highInfo.actualHours" type="Double"/>
                 <set field="taskParty.originalActualHours" from-field="highInfo.originalActualHours" type="Double"/>
@@ -1371,7 +1371,7 @@
                     <else>
                         <!-- create new timesheet -->
                         <set field="parameters.requiredDate" from-field="parameters.fromDate"/>
-                        <call-simple-method method-name="createTimesheetForThisWeek" xml-resource="component://workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml"/>
+                        <call-simple-method method-name="createTimesheetForThisWeek" xml-resource="component://workeffort/minilang/timesheet/TimesheetServices.xml"/>
                         <set field="parameters.timesheetId" from-field="newEntity.timesheetId"/>
                     </else>
                 </if-not-empty>
@@ -1386,9 +1386,9 @@
           <first-from-list entry="taskRole" list="taskRoles"/>
           <set field="parameters.roleTypeId" from-field="taskRole.roleTypeId"/>
           <set field="parameters.statusId" value="PAS_ASSIGNED"/>
-          <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+          <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
         </if-empty>
-        <call-simple-method method-name="createTimeEntry" xml-resource="component://workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml"/>
+        <call-simple-method method-name="createTimeEntry" xml-resource="component://workeffort/minilang/timesheet/TimesheetServices.xml"/>
     </simple-method>
 
     <simple-method method-name="addProjectTimeToNewInvoice" short-description="add all reported time on all completed timesheets from all workefforts for a project">

Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -23,7 +23,7 @@ under the License.
     <description>Project Manager service definitions.</description>
 
     <service name="createTimeEntryInTimesheet" default-entity-name="TimeEntry" engine="simple" auth="true"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="createTimeEntryInTimesheet">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="createTimeEntryInTimesheet">
         <description>Creates TimeEntry and searches for a timesheetId, if required it will create a weekly time sheet, it also assigns the party to the task</description>
         <permission-service service-name="projectMgrPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
@@ -34,7 +34,7 @@ under the License.
     </service>
 
     <service name="createProjectTimesheet" engine="simple" default-entity-name="Timesheet"
-        location="component://workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="createTimesheetForThisWeek">
+        location="component://workeffort/minilang/timesheet/TimesheetServices.xml" invoke="createTimesheetForThisWeek">
         <description>Creates Timesheet for this week if no required date specified.</description>
         <permission-service service-name="projectMgrPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
@@ -46,7 +46,7 @@ under the License.
     </service>
 
     <service name="projectMgrPermission" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml" invoke="projectMgrPermission">
+        location="component://projectmgr/minilang/ProjectPermissionServices.xml" invoke="projectMgrPermission">
         <implements service="permissionInterface"/>
         <attribute name="projectId" type="String" mode="IN" optional="true"/>
         <attribute name="phaseId" type="String" mode="IN" optional="true"/>
@@ -58,12 +58,12 @@ under the License.
     </service>
     
     <service name="projectMgrRequestPermission" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml" invoke="projectMgrRequestPermission">
+        location="component://projectmgr/minilang/ProjectPermissionServices.xml" invoke="projectMgrRequestPermission">
         <implements service="permissionInterface"/>
     </service>
     
     <service name="updateTimeEntryByWorkeffort" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="updateTimeEntryByWorkeffort">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="updateTimeEntryByWorkeffort">
         <description>Update workeffort by workeffortId and timesheetId </description>
         <permission-service service-name="projectMgrPermission" main-action="UPDATE"/>
         <attribute name="timesheetId" type="String" mode="INOUT" optional="false"/>
@@ -82,7 +82,7 @@ under the License.
     </service>
 
     <service name="getProject" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getProject">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getProject">
         <description>Get project information and related phase and task info.</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="true"/>
@@ -91,7 +91,7 @@ under the License.
     </service>
 
     <service name="createProject" engine="simple" default-entity-name="WorkEffort"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="createProject">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="createProject">
         <description>Copy a project planning from a template.</description>
         <permission-service service-name="projectMgrPermission" main-action="CREATE"/>
         <implements service="interfaceWorkEffort"/>
@@ -112,7 +112,7 @@ under the License.
     </service>
 
     <service name="updateProject" default-entity-name="WorkEffort" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="updateProject">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="updateProject">
         <description>Update a Project</description>
         <permission-service service-name="projectMgrPermission" main-action="UPDATE"/>
         <implements service="interfaceWorkEffort"/>
@@ -123,7 +123,7 @@ under the License.
     </service>
 
     <service name="createProjectTask" engine="simple" default-entity-name="WorkEffort"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="createProjectTask">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="createProjectTask">
         <description>Create a new task and optionally assign to a resource.</description>
         <permission-service service-name="projectMgrPermission" main-action="CREATE"/>
         <implements service="interfaceWorkEffort"/>
@@ -144,7 +144,7 @@ under the License.
     </service>
 
     <service name="copyProject" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="copyProject">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="copyProject">
         <description>Copy a project planning data but ignore the actual data.</description>
         <permission-service service-name="projectMgrPermission" main-action="CREATE"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="false"/>
@@ -153,7 +153,7 @@ under the License.
     </service>
 
     <service name="copyProjectToTemplate" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="copyProjectToTemplate">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="copyProjectToTemplate">
         <description>Copy a project planning data to a template project.</description>
         <permission-service service-name="projectMgrPermission" main-action="CREATE"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="false"/>
@@ -162,14 +162,14 @@ under the License.
     </service>
 
     <service name="scheduleProject" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="scheduleProject">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="scheduleProject">
         <description>(re) calculate the estimated start and enddates of tasks within a project</description>
         <permission-service service-name="projectMgrPermission" main-action="UPDATE"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="true"/>
     </service>
 
     <service name="getProjectIdAndNameFromTask" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getProjectIdAndNameFromTask">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getProjectIdAndNameFromTask">
         <description>Get the projectId and Name when a phase or task is provided.</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="taskId" type="String" mode="INOUT" optional="true"/>
@@ -183,7 +183,7 @@ under the License.
     </service>
 
     <service name="getProjectPhaseList" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getProjectPhaseList">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getProjectPhaseList">
         <description>Get project phase information and related task info.</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="true"/>
@@ -191,7 +191,7 @@ under the License.
     </service>
 
     <service name="getProjectTaskList" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getProjectTaskList">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getProjectTaskList">
         <description>Get project phase information and related task info.</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="true"/>
@@ -199,7 +199,7 @@ under the License.
     </service>
 
     <service name="getProjectTask" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getProjectTask">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getProjectTask">
         <description>Get project task information and related timesheet info.</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="hoursPartyId" type="String" mode="IN" optional="true"/>
@@ -210,7 +210,7 @@ under the License.
     </service>
 
     <service name="getProjectsByParties" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getProjectsByParties">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getProjectsByParties">
         <description>Get project information by party</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="projectId" type="String" mode="INOUT" optional="true"/>
@@ -219,7 +219,7 @@ under the License.
     </service>
 
     <service name="getTasksByParties" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="getTasksByParties">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="getTasksByParties">
         <description>Get project information by party</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <attribute name="workEffortId" type="String" mode="INOUT" optional="true"/>
@@ -228,7 +228,7 @@ under the License.
     </service>
 
     <service name="updateTaskAndRelatedInfo" default-entity-name="WorkEffort" engine="simple"
-            location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="updateTaskAndRelatedInfo">
+            location="component://projectmgr/minilang/ProjectServices.xml" invoke="updateTaskAndRelatedInfo">
         <description>Update a task and related info</description>
         <permission-service service-name="projectMgrPermission" main-action="VIEW"/>
         <implements service="interfaceWorkEffort"/>
@@ -241,7 +241,7 @@ under the License.
     </service>
 
      <service name="updateTaskAssigment" default-entity-name="WorkEffortPartyAssignment" engine="simple"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="updateTaskAssigment">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="updateTaskAssigment">
         <description>Update a WorkEffortPartyAssignment Entity, including set enddate and create new</description>
         <permission-service service-name="projectMgrPermission" main-action="UPDATE"/>
         <attribute name="workEffortId" type="String" mode="INOUT"/>
@@ -256,7 +256,7 @@ under the License.
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
     <service name="addProjectTimeToNewInvoice" engine="simple" auth="true"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="addProjectTimeToNewInvoice">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="addProjectTimeToNewInvoice">
         <description>Add Project Time to a new Invoice</description>
         <attribute name="projectId" type="String" mode="IN" optional="false"/>
         <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/>
@@ -266,7 +266,7 @@ under the License.
         <attribute name="reCreate" type="String" mode="IN" optional="true"/>
     </service>
     <service name="addValidationPartiesToTask" engine="simple" auth="true"
-        location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml" invoke="addValidationPartiesToTask">
+        location="component://projectmgr/minilang/ProjectServices.xml" invoke="addValidationPartiesToTask">
         <description>SECA to add either project-testing or -approval parties to a task when a task is set to complete</description>
         <attribute name="workEffortId" type="String" mode="IN" optional="true"/>
         <attribute name="partyId" type="String" mode="IN" optional="true"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016
@@ -115,7 +115,7 @@
     </request-map>
     <request-map uri="addResource">
         <security https="true" auth="true"/>
-        <event type="simple" invoke="addProjectMgrResource" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml"/>
+        <event type="simple" invoke="addProjectMgrResource" path="component://projectmgr/minilang/ProjectSimpleEvents.xml"/>
         <response name="success" type="view" value="FindResource"/>
     </request-map>
     <request-map uri="removeResource">
@@ -151,7 +151,7 @@
     </request-map>
     <request-map uri="setTaskStatusToComplete">
         <security https="true" auth="true"/>
-        <event type="simple" invoke="setTaskStatusToComplete" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml"/>
+        <event type="simple" invoke="setTaskStatusToComplete" path="component://projectmgr/minilang/ProjectSimpleEvents.xml"/>
         <response name="success" type="view" value="taskView"/>
     </request-map>
     <request-map uri="setTaskStatus">
@@ -258,7 +258,7 @@
 
     <request-map uri="createTaskAndAssoc">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <event type="simple" path="component://workeffort/minilang/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
         <response name="success" type="view" value="EditProjectTasks"/>
         <response name="error" type="view" value="EditProjectTasks"/>
     </request-map>
@@ -279,7 +279,7 @@
 
     <request-map uri="createTaskListAndAssoc">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <event type="simple" path="component://workeffort/minilang/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
         <response name="success" type="view" value="Dependencies"/>
         <response name="error" type="view" value="Dependencies"/>
     </request-map>
@@ -296,7 +296,7 @@
     </request-map>
     <request-map uri="createPhaseAndAssoc">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <event type="simple" path="component://workeffort/minilang/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
         <response name="success" type="view" value="FindPhase"/>
         <response name="error" type="view" value="FindPhase"/>
     </request-map>
@@ -418,7 +418,7 @@
     </request-map>
     <request-map uri="createTaskNote">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+        <event type="simple" path="component://workeffort/minilang/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
         <response name="success" type="view" value="EditTaskNotes"/>
         <response name="error" type="view" value="EditTaskNotes"/>
     </request-map>
@@ -450,7 +450,7 @@
     </request-map>
     <request-map uri="createNewNotesForProject">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+        <event type="simple" path="component://workeffort/minilang/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
         <response name="success" type="view" value="projectView"/>
         <response name="error" type="view" value="projectView"/>
     </request-map>
@@ -460,7 +460,7 @@
     </request-map>
     <request-map uri="createNewNotesForTask">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+        <event type="simple" path="component://workeffort/minilang/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
         <response name="success" type="view" value="taskView"/>
         <response name="error" type="view" value="taskView"/>
     </request-map>
@@ -518,7 +518,7 @@
     </request-map>
     <request-map uri="acceptRequestAndConnectToTask">
         <security https="true" auth="true"/>
-        <event type="simple" invoke="acceptRequestAndConnectToTask" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml"/>
+        <event type="simple" invoke="acceptRequestAndConnectToTask" path="component://projectmgr/minilang/ProjectSimpleEvents.xml"/>
         <response name="success" type="request" value="taskView"/>
         <response name="error" type="view" value="EditTaskFromRequest"/>
     </request-map>
@@ -528,7 +528,7 @@
     </request-map>
     <request-map uri="createrequest">
         <security https="true" auth="true"/>
-        <event type="simple" invoke="CreateCustRequestAndAssignTaskToPerson" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml"/>
+        <event type="simple" invoke="CreateCustRequestAndAssignTaskToPerson" path="component://projectmgr/minilang/ProjectSimpleEvents.xml"/>
         <response name="success" type="view-last-noparam" value="RequestList"/>
         <response name="error" type="view" value="EditRequest"/>
     </request-map>
@@ -623,12 +623,12 @@
     </request-map>
     <request-map uri="createProjectContent">
         <security auth="true" https="true"/>
-        <event type="simple" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml" invoke="createWorkEffortContent"/>
+        <event type="simple" path="component://projectmgr/minilang/ProjectSimpleEvents.xml" invoke="createWorkEffortContent"/>
         <response name="success" type="request-redirect" value="EditProjectContents"/>
     </request-map>
     <request-map uri="updateProjectContent">
         <security auth="true" https="true"/>
-        <event type="simple" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml" invoke="updateWorkEffortContent"/>
+        <event type="simple" path="component://projectmgr/minilang/ProjectSimpleEvents.xml" invoke="updateWorkEffortContent"/>
         <response name="success" type="view" value="EditProjectContents"/>
     </request-map>
     <request-map uri="deleteProjectContent">
@@ -643,12 +643,12 @@
     </request-map>
     <request-map uri="createTaskContent">
         <security auth="true" https="true"/>
-        <event type="simple" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml" invoke="createWorkEffortContent"/>
+        <event type="simple" path="component://projectmgr/minilang/ProjectSimpleEvents.xml" invoke="createWorkEffortContent"/>
         <response name="success" type="request-redirect" value="EditTaskContents"/>
     </request-map>
     <request-map uri="updateTaskContent">
         <security auth="true" https="true"/>
-        <event type="simple" path="component://projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml" invoke="updateWorkEffortContent"/>
+        <event type="simple" path="component://projectmgr/minilang/ProjectSimpleEvents.xml" invoke="updateWorkEffortContent"/>
         <response name="success" type="view" value="EditTaskContents"/>
     </request-map>
     <request-map uri="deleteTaskContent">

Copied: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml (from r1747658, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml?p2=ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml&p1=ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml&r1=1747658&r2=1747712&rev=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml Fri Jun 10 14:04:30 2016
@@ -3415,7 +3415,7 @@
         <set field="contentMap.userLogin" from-field="systemUserLogin"/>
         <set field="partycontent.userLogin" from-field="systemUserLogin"/>
         <set field="contentAssoc.userLogin" from-field="systemUserLogin"/>
-        <call-simple-method method-name="createCommunicationEventContent" xml-resource="component://party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml"/>
+        <call-simple-method method-name="createCommunicationEventContent" xml-resource="component://party/minilang/communication/CommunicationEventEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="updateScrumTimeEntry" short-description="Update TimeEntry in the Scrum component">

Copied: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml (from r1747658, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml?p2=ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml&p1=ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml&r1=1747658&r2=1747712&rev=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml Fri Jun 10 14:04:30 2016
@@ -1170,7 +1170,7 @@
                     <else>
                         <!-- new assignment -->
                         <call-simple-method method-name="assignPartyToWorkEffort"
-                            xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" />
+                            xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" />
                     </else>
                 </if-not-empty>
             </else>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml Fri Jun 10 14:04:30 2016
@@ -34,6 +34,6 @@ under the License.
         <set field="noteData.noteParty" from-field="userLogin"/>
         <set field="noteData.partyId" value="admin"/>
         <set field="noteData.noteDateTime" value="2010-10-13" type="Timestamp"/>
-        <call-simple-method method-name="createDailyNote" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createDailyNote" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/MyWorkTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/MyWorkTests.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/MyWorkTests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/MyWorkTests.xml Fri Jun 10 14:04:30 2016
@@ -54,7 +54,7 @@ under the License.
         <set field="parameters.workEffortId" value="DEMO-SPRINT-1"/>
         <set field="parameters.taskId" value="DEMO-TASK-2"/>
         <set field="parameters.partyId" value="SCRUMTEAM-2"/>
-        <call-simple-method method-name="updateTask" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="updateTask" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testRemoveTaskAssignToMe" short-description="Test remove task assign to me" login-required="false">

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml Fri Jun 10 14:04:30 2016
@@ -30,7 +30,7 @@ under the License.
         <set field="parameters.custRequestName" value="TEST Product Backlog"/>
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.description" value="TEST Product Backlog"/>
-        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testCreateProductBacklogByProductOwner" short-description="Test Create Product Backlog" login-required="false">
@@ -42,7 +42,7 @@ under the License.
         <set field="parameters.custRequestName" value="TEST Product Backlog"/>
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.description" value="TEST Product Backlog"/>
-        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testCreateProductBacklogByScrumMaster" short-description="Test Create Product Backlog" login-required="false">
@@ -54,7 +54,7 @@ under the License.
         <set field="parameters.custRequestName" value="TEST Product Backlog"/>
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.description" value="TEST Product Backlog"/>
-        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testUpdateProductBacklogByAdmin" short-description="Test Update Product Backlog" login-required="false">
@@ -67,7 +67,7 @@ under the License.
         <set field="parameters.custRequestName" value="TEST Product Backlog"/>
         <set field="parameters.noteInfo" value="TestNote"/>
         <set field="parameters.description" value="TEST Product Backlog"/>
-        <call-simple-method method-name="updateProductBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="updateProductBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testUpdateProductBacklogByProductOwner" short-description="Test Update Product Backlog" login-required="false">
@@ -84,7 +84,7 @@ under the License.
         <set field="parameters.noteId" value="NOTE-1"/>
         <set field="parameters.noteInfo" value="TestNote"/>
         <set field="parameters.valueAcsr" value=""/>
-        <call-simple-method method-name="updateProductBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="updateProductBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testDeleteProductBacklogByAdmin" short-description="Test Delete Product Backlog" login-required="false">
@@ -99,7 +99,7 @@ under the License.
             <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
         </entity-one>
         <if-compare operator="equals" value="CRQ_ACCEPTED" field="result.statusId">
-            <call-simple-method method-name="deleteCustRequest" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+            <call-simple-method method-name="deleteCustRequest" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
         </if-compare>
     </simple-method>
     
@@ -115,7 +115,7 @@ under the License.
             <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
         </entity-one>
         <if-compare operator="equals" value="CRQ_ACCEPTED" field="result.statusId">
-            <call-simple-method method-name="deleteCustRequest" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+            <call-simple-method method-name="deleteCustRequest" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
         </if-compare>
     </simple-method>
     
@@ -127,7 +127,7 @@ under the License.
         <set field="parameters.userLogin" from-field="userLogin"/>
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.custRequestId" value="TEST7"/>
-        <call-simple-method method-name="deleteCustRequest" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="deleteCustRequest" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testCreateBacklogSetStatus" short-description=" Test Set Status Create Product Backlog" login-required="false">
@@ -139,7 +139,7 @@ under the License.
         <set field="parameters.custRequestName" value="TEST Product Backlog"/>
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.description" value ="TEST Product Backlog"/>
-        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createProductBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testCreateDefaultBacklogs" short-description="Test Create DefaultBacklogs" login-required="false">
@@ -156,7 +156,7 @@ under the License.
         <set field="parameters.workEffortTypeId" value="SCRUM_TASK_IMPL"/>
         <set field="parameters.workEffortPurposeTypeId" value="SCRUM_DEFAULT_TASK"/>
         <set field="parameters.currentStatusId" value="STS_CREATED"/>
-        <call-simple-method method-name="createDefaultTask" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml" />
+        <call-simple-method method-name="createDefaultTask" xml-resource="component://scrum/minilang/ScrumEvents.xml" />
     </simple-method>
     
     <simple-method method-name="testCreateProductBacklogCategory" short-description="Test Create Product Backlog Category" login-required="false">
@@ -167,7 +167,7 @@ under the License.
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.custRequestId" value="TEST11"/>
         <set field="parameters.custRequestName" value="Backlog"/>
-        <call-simple-method method-name="createProductBacklogCategory" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createProductBacklogCategory" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testUpdateProductBacklogCategory" short-description="Test Update Product Backlog Category" login-required="false">
@@ -178,7 +178,7 @@ under the License.
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.custRequestId" value="TEST10"/>
         <set field="parameters.custRequestName" value="Backlog"/>
-        <call-simple-method method-name="updateProductBacklogCategory" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="updateProductBacklogCategory" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testNewProductBacklogEmail" short-description="Test New Product Backlog Email" login-required="false">

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductTest.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductTest.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductTest.xml Fri Jun 10 14:04:30 2016
@@ -33,7 +33,7 @@ under the License.
             <set field="parameters.statusId" value="PRODUCT_ACTIVE"/>
             <set field="parameters.partyId" value="DemoCustomer-1"/>
             <set field="parameters.partyCompany" value="Demo Scrum Company[DemoScrumCompany] - Scrum Product Owner (DemoCustomer-1)"/>
-            <call-simple-method method-name="createProductAndRole" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+            <call-simple-method method-name="createProductAndRole" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
         </simple-method>
         
         <simple-method method-name="testUpdateProductByAdmin" short-description="" login-required="false">
@@ -49,7 +49,7 @@ under the License.
             <set field="parameters.partyId" value="DemoCustomer-1"/>
             <set field="parameters.partyCompany" value="Demo Scrum Company[DemoScrumCompany] - Scrum Product Owner (DemoCustomer-1)"/>
             <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
-            <call-simple-method method-name="updateProduct" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+            <call-simple-method method-name="updateProduct" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
         </simple-method>
         
         <!-- Billing -->

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/QATests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/QATests.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/QATests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/QATests.xml Fri Jun 10 14:04:30 2016
@@ -37,6 +37,6 @@ under the License.
             <set field="formInput.formInput.resourceStatusId" value="CTNT_PUBLISHED"/>
             <set field="formInput.formInput.workEffortContentTypeId" value="CREATED_MEDIA"/>
             <set field="formInput.formInput.partyId" value="SCRUMTEAM-1"/>
-            <call-simple-method method-name="createTestTask" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+            <call-simple-method method-name="createTestTask" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
         </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml Fri Jun 10 14:04:30 2016
@@ -33,7 +33,7 @@ under the License.
         <set field="parameters.workEffortTypeId" value="SCRUM_PROJECT"/>
         <set field="parameters.partyId" value="DemoCustomer-1"/>
         <set field="parameters.userLogin" from-field="userLogin"/>
-        <call-simple-method method-name="createScrumProject" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createScrumProject" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testUpdateScrumProjectByProductOwner" short-description="Test Create Scrum Project" login-required="false">
@@ -48,7 +48,7 @@ under the License.
         <set field="parameters.workEffortTypeId" value="SCRUM_PROJECT"/>
         <set field="parameters.partyId" value="DemoCustomer-1"/>
         <set field="parameters.userLogin" from-field="userLogin"/>
-        <call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testUpdateScrumProjectByScrumMaster" short-description="Test Create Scrum Project" login-required="false">
@@ -63,7 +63,7 @@ under the License.
         <set field="parameters.workEffortTypeId" value="SCRUM_PROJECT"/>
         <set field="parameters.partyId" value="SCRUMASTER"/>
         <set field="parameters.userLogin" from-field="userLogin"/>
-        <call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testCloseScrumProject" short-description="Test Close Scrum Project " login-required="false">
@@ -74,7 +74,7 @@ under the License.
         <set field="parameters.workEffortId" value="DEMO-PROJECT-1"/>
         <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
         <set field="parameters.currentStatusId" value="SPJ_CLOSED" />
-        <call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml" />
+        <call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/minilang/ScrumEvents.xml" />
     </simple-method>
     
 </simple-methods>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml?rev=1747712&r1=1747658&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml Fri Jun 10 14:04:30 2016
@@ -28,7 +28,7 @@ under the License.
         <set field="parameters.sprintBacklogs" value="1"/>
         <set field="parameters.projectId" value="DEMO-PROJECT-1"/>
         <set field="parameters.sprintId" value="DEMO-SPRINT-1"/>
-        <call-simple-method method-name="createSprintBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createSprintBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testcreateSprintBacklogByScrummaster" short-description="" login-required="false">
@@ -39,7 +39,7 @@ under the License.
         <set field="parameters.sprintBacklogs" value="1"/>
         <set field="parameters.projectId" value="DEMO-PROJECT-1"/>
         <set field="parameters.sprintId" value="DEMO-SPRINT-1"/>
-        <call-simple-method method-name="createSprintBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="createSprintBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
     <simple-method method-name="testdeleteSprintBacklogByAdmin" short-description="" login-required="false">
@@ -49,7 +49,7 @@ under the License.
         <set-current-user-login value-field="userLogin"/>
         <set field="parameters.custRequestId" value="TEST1"/>
         <set field="parameters.sprintId" value="DEMO-SPRINT-1"/>
-        <call-simple-method method-name="deleteSprintBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="deleteSprintBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
     
      <simple-method method-name="testdeleteSprintBacklogByScurmmaster" short-description="" login-required="false">
@@ -59,6 +59,6 @@ under the License.
         <set-current-user-login value-field="userLogin"/>
         <set field="parameters.custRequestId" value="TEST2"/>
         <set field="parameters.sprintId" value="DEMO-SPRINT-1"/>
-        <call-simple-method method-name="deleteSprintBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
+        <call-simple-method method-name="deleteSprintBacklog" xml-resource="component://scrum/minilang/ScrumEvents.xml"/>
     </simple-method>
 </simple-methods>