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

Modified: ofbiz/trunk/applications/humanres/minilang/permission/HumanResPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/permission/HumanResPermissionServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/permission/HumanResPermissionServices.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/permission/HumanResPermissionServices.xml Fri Jun 10 14:04:30 2016
@@ -22,6 +22,6 @@
 
     <simple-method method-name="humanResManagerPermission" short-description="Check user has Humanres Manager permission">
         <set field="primaryPermission" value="HUMANRES"/>
-        <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-methods>

Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -67,7 +67,7 @@ under the License.
     </service>
 
     <service name="createPartySkill" engine="simple" default-entity-name="PartySkill"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createPartySkill" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="createPartySkill" auth="true">
         <description>Create Skill for a Party</description>
         <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -255,7 +255,7 @@ under the License.
     </service>
 
     <service name="deletePayHistory" engine="simple" default-entity-name="PayHistory"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="deletePayHistory" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="deletePayHistory" auth="true">
         <description>Delete Pay History</description>
         <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -284,7 +284,7 @@ under the License.
     </service>
 
     <service name="createSalaryStep" engine="simple" default-entity-name="SalaryStep"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createSalaryStep" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="createSalaryStep" auth="true">
         <description>Create Salary Step</description>
         <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -293,7 +293,7 @@ under the License.
     </service>
 
     <service name="updateSalaryStep" engine="simple" default-entity-name="SalaryStep"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="updateSalaryStep" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="updateSalaryStep" auth="true">
         <description>Update Salary Step</description>
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -391,7 +391,7 @@ under the License.
     </service>
 
     <service name="createEmplPositionReportingStruct" engine="simple" default-entity-name="EmplPositionReportingStruct"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplPositionReportingStruct" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="createEmplPositionReportingStruct" auth="true">
         <description>Create Employee Position Reporting Structure</description>
         <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -455,7 +455,7 @@ under the License.
     </service>
 
     <service name="humanResManagerPermission" engine="simple"
-        location="component://humanres/script/org/ofbiz/humanres/permission/HumanResPermissionServices.xml" invoke="humanResManagerPermission" auth="true">
+        location="component://humanres/minilang/permission/HumanResPermissionServices.xml" invoke="humanResManagerPermission" auth="true">
         <implements service="permissionInterface"/>
     </service>
 
@@ -480,7 +480,7 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
     <service name="createEmployee" engine="simple"
-        location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createEmployee">
+        location="component://humanres/minilang/HumanResServices.xml" invoke="createEmployee">
         <description>Create an Employee its role and contact details</description>
         <auto-attributes entity-name="Person" mode="IN" optional="true">
             <exclude field-name="partyId"/>
@@ -561,7 +561,7 @@ under the License.
     </service>
 
     <service name="updateEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="updateEmplPositionTypeRate" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="updateEmplPositionTypeRate" auth="true">
         <description>Update Valid EmplPositionTypeRate</description>
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -573,7 +573,7 @@ under the License.
     </service>
 
     <service name="deleteEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="deleteEmplPositionTypeRate" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="deleteEmplPositionTypeRate" auth="true">
         <description>Delete Valid EmplPositionTypeRate</description>
         <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -602,7 +602,7 @@ under the License.
     </service>
     
     <service name="createEmplLeave" engine="simple" default-entity-name="EmplLeave"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplLeave" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="createEmplLeave" auth="true">
         <description>Create Employee Leave</description>
         <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -649,7 +649,7 @@ under the License.
     </service>
 
     <service name="getCurrentPartyEmploymentData" engine="simple"
-        location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="getCurrentPartyEmploymentData" auth="true">
+        location="component://humanres/minilang/HumanResServices.xml" invoke="getCurrentPartyEmploymentData" auth="true">
         <description>Delete Valid LeaveType</description>
         <permission-service service-name="humanResManagerPermission" main-action="VIEW"/>
         <attribute name="partyId" type="String" mode="IN"/>
@@ -779,7 +779,7 @@ under the License.
     </service>
 
     <service name="applyTraining" engine="simple" default-entity-name="PersonTraining"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="applyTraining" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="applyTraining" auth="true">
         <description>Create Training Request</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -790,7 +790,7 @@ under the License.
     </service>
 
     <service name="assignTraining" engine="simple" default-entity-name="PersonTraining"
-             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="assignTraining" auth="true">
+             location="component://humanres/minilang/HumanResServices.xml" invoke="assignTraining" auth="true">
         <description>Create Training Request</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>

Modified: ofbiz/trunk/applications/humanres/servicedef/services_upgrade.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services_upgrade.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services_upgrade.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services_upgrade.xml Fri Jun 10 14:04:30 2016
@@ -24,7 +24,7 @@ under the License.
     <vendor>OFBiz</vendor>
 
     <service name="migrateSalaryStep" engine="simple"
-            location="component://humanres/script/org/ofbiz/humanres/UpgradeServices.xml" invoke="migrateSalaryStep">
+            location="component://humanres/minilang/UpgradeServices.xml" invoke="migrateSalaryStep">
         <description>
             Migrate data from OldSalaryStep to SalaryStep.
             Since revision 1709214 (2015-10-18) the entity SalaryStep has been deprecated.

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016
@@ -1054,13 +1054,13 @@ under the License.
     </request-map>
     <request-map uri="createInternalOrg">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="createInternalOrg"/>
+        <event type="simple" path="component://humanres/minilang/HumanResEvents.xml" invoke="createInternalOrg"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
     <request-map uri="removeInternalOrg">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeInternalOrg"/>
+        <event type="simple" path="component://humanres/minilang/HumanResEvents.xml" invoke="removeInternalOrg"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
@@ -1079,7 +1079,7 @@ under the License.
     </request-map>
     <request-map uri="createPublicHoliday">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="createPublicHoliday"/>
+        <event type="simple" path="component://humanres/minilang/HumanResEvents.xml" invoke="createPublicHoliday"/>
         <response name="success" type="request-redirect-noparam" value="PublicHoliday"/>
         <response name="error" type="view" value="PublicHoliday"/>
     </request-map>

Modified: ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml Fri Jun 10 14:04:30 2016
@@ -61,7 +61,7 @@ under the License.
     <simple-method method-name="eventEditBOM" short-description="Add, update, delete components in BOM">
         <if-compare value="UPDATE" field="parameters.UPDATE_MODE" operator="equals">
             <set-service-fields service-name="updateProductAssoc" map="parameters" to-map="context"/>
-            <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml"
+            <call-map-processor xml-resource="component://manufacturing/minilang/bom/BomMapProcs.xml"
                                 processor-name="prepareUpdateBOMAssoc"
                                 in-map-name="parameters" out-map-name="context"/>
             <check-errors/>
@@ -70,7 +70,7 @@ under the License.
         </if-compare>
         <if-compare value="CREATE" field="parameters.UPDATE_MODE" operator="equals">
             <set-service-fields service-name="createBOMAssoc" map="parameters" to-map="context"/>
-            <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml"
+            <call-map-processor xml-resource="component://manufacturing/minilang/bom/BomMapProcs.xml"
                                 processor-name="prepareUpdateBOMAssoc"
                                 in-map-name="parameters" out-map-name="context"/>
             <check-errors/>
@@ -86,7 +86,7 @@ under the License.
         </if-compare>
         <if-compare value="DELETE" field="parameters.UPDATE_MODE" operator="equals">
             <set-service-fields service-name="deleteProductAssoc" map="parameters" to-map="context"/>
-            <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml"
+            <call-map-processor xml-resource="component://manufacturing/minilang/bom/BomMapProcs.xml"
                                 processor-name="prepareDeleteProductAssoc"
                                 in-map-name="parameters" out-map-name="context"/>
             <check-errors/>

Modified: ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml Fri Jun 10 14:04:30 2016
@@ -47,7 +47,7 @@ under the License.
         <field-to-result field="parameters.productionRunId" result-name="productionRunId" />
         <field-to-result field="parameters.fromDate" result-name="fromDate" />
         <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" />
         
     </simple-method>
     <simple-method method-name="createProductionRunAssoc" short-description="Associate the production run to another production run">

Modified: ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml Fri Jun 10 14:04:30 2016
@@ -26,7 +26,7 @@ under the License.
             <make-value value-field="lookupPKMap" entity-name="WorkEffort"/>
             <set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/>
             <find-by-primary-key entity-name="WorkEffort" map="lookupPKMap" value-field="lookedUpValue"/>
-            <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
+            <call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml"
                 processor-name="copyRoutingTask" in-map-name="lookedUpValue" out-map-name="context"/>
             <call-service service-name="createWorkEffort" in-map-name="context">
                 <default-message resource="ManufacturingUiLabels" property="ManufacturingRoutingTaskCopiedSuccessfully"/>
@@ -36,7 +36,7 @@ under the License.
         <if-empty field="parameters.fromDate">
             <now-timestamp field="parameters.fromDate"/>
         </if-empty>
-        <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
+        <call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/>
         <check-errors/>
         <set value="Y" field="context1.create"/>
@@ -49,7 +49,7 @@ under the License.
             </add-error>
             <check-errors/>
         </if-compare>
-        <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
+        <call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context2"/>
         <check-errors/>
         <call-service service-name="createWorkEffortAssoc" in-map-name="context2">
@@ -58,7 +58,7 @@ under the License.
     </simple-method>
 
     <simple-method method-name="updateRoutingTaskAssoc" short-description="check if there is no pb with date and SeqId and call service updateWorkEffortAssoc">
-        <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
+        <call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/>
          <check-errors/>
         <call-service service-name="checkRoutingTaskAssoc" in-map-name="context1">
@@ -70,7 +70,7 @@ under the License.
             </add-error>
             <check-errors/>
         </if-compare>
-        <call-map-processor xml-resource="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
+        <call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context2"/>
         <check-errors/>
         <call-service service-name="updateWorkEffortAssoc" in-map-name="context2">

Modified: ofbiz/trunk/applications/manufacturing/servicedef/services_bom.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/servicedef/services_bom.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/servicedef/services_bom.xml (original)
+++ ofbiz/trunk/applications/manufacturing/servicedef/services_bom.xml Fri Jun 10 14:04:30 2016
@@ -26,7 +26,7 @@ under the License.
 
     <!-- Bill of Materials services -->
     <service name="createBOMAssoc" default-entity-name="ProductAssoc" engine="simple"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="createBOMAssoc" auth="true">
+                location="component://manufacturing/minilang/bom/BomSimpleMethods.xml" invoke="createBOMAssoc" auth="true">
         <description>Add Product to Product Association</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -34,7 +34,7 @@ under the License.
         <override name="fromDate" optional="true"/>
     </service>
     <service name="copyBOMAssocs" default-entity-name="ProductAssoc" engine="simple"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="copyBOMAssocs" auth="true">
+                location="component://manufacturing/minilang/bom/BomSimpleMethods.xml" invoke="copyBOMAssocs" auth="true">
         <description>Copy BOM associations from one product to another</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <attribute name="copyToProductId" type="String" optional="false" mode="IN"/>
@@ -43,7 +43,7 @@ under the License.
     </service>
 
     <service name="updateProductManufacturingRule" engine="simple" default-entity-name="ProductManufacturingRule"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="updateProductManufacturingRule">
+            location="component://manufacturing/minilang/bom/BomSimpleMethods.xml" invoke="updateProductManufacturingRule">
         <description>Update a Product Manufacturing Rule</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
@@ -54,7 +54,7 @@ under the License.
     </service>
 
     <service name="addProductManufacturingRule" engine="simple" default-entity-name="ProductManufacturingRule"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="addProductManufacturingRule">
+            location="component://manufacturing/minilang/bom/BomSimpleMethods.xml" invoke="addProductManufacturingRule">
         <description>Create a Product Manufacturing Rule</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
@@ -65,7 +65,7 @@ under the License.
     </service>
 
     <service name="deleteProductManufacturingRule" engine="simple"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="deleteProductManufacturingRule">
+            location="component://manufacturing/minilang/bom/BomSimpleMethods.xml" invoke="deleteProductManufacturingRule">
         <description>Remove a Product Manufacturing Rule</description>
         <attribute name="ruleId" form-label="${uiLabelMap.ManufacturingRuleId}" type="String" mode="IN" optional="false"/>
     </service>

Modified: ofbiz/trunk/applications/manufacturing/servicedef/services_calendar.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/servicedef/services_calendar.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/servicedef/services_calendar.xml (original)
+++ ofbiz/trunk/applications/manufacturing/servicedef/services_calendar.xml Fri Jun 10 14:04:30 2016
@@ -25,72 +25,72 @@ under the License.
 
     <!-- Routing services -->
     <service name="createCalendar" engine="simple" default-entity-name="TechDataCalendar"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendar">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="createCalendar">
         <description>Create a calendar</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateCalendar" engine="simple" default-entity-name="TechDataCalendar"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendar">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="updateCalendar">
         <description>Update a calendar</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeCalendar" engine="simple" default-entity-name="TechDataCalendar"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendar">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="removeCalendar">
         <description>Remove a calendar</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendarWeek">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="createCalendarWeek">
         <description>Create a Calendar Week</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarWeek">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="updateCalendarWeek">
         <description>Update a Calendar Week</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarWeek">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="removeCalendarWeek">
         <description>Remove a Calendar Week</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createCalendarExceptionDay" engine="simple" default-entity-name="TechDataCalendarExcDay"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendarExceptionDay">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="createCalendarExceptionDay">
         <description>Create a calendar ExceptionDay</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateCalendarExceptionDay" engine="simple" default-entity-name="TechDataCalendarExcDay"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionDay">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionDay">
         <description>Update a calendar ExceptionDay</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeCalendarExceptionDay" engine="simple" default-entity-name="TechDataCalendarExcDay"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionDay">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionDay">
         <description>Update a calendar ExceptionDay</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="createCalendarExceptionWeek" engine="simple" default-entity-name="TechDataCalendarExcWeek"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendarExceptionWeek">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="createCalendarExceptionWeek">
         <description>Create a Calendar Exception Week</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateCalendarExceptionWeek" engine="simple" default-entity-name="TechDataCalendarExcWeek"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionWeek">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionWeek">
         <description>Update a Calendar Exception Week</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeCalendarExceptionWeek" engine="simple" default-entity-name="TechDataCalendarExcWeek"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionWeek">
+            location="component://manufacturing/minilang/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionWeek">
         <description>Remove a Calendar Exception Week</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>

Modified: ofbiz/trunk/applications/manufacturing/servicedef/services_formula.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/servicedef/services_formula.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/servicedef/services_formula.xml (original)
+++ ofbiz/trunk/applications/manufacturing/servicedef/services_formula.xml Fri Jun 10 14:04:30 2016
@@ -30,12 +30,12 @@ under the License.
         <attribute mode="OUT" name="quantity" optional="false" type="BigDecimal"/>
     </service>
     <service name="exampleComponentFormula" engine="simple" auth="true"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml" invoke="exampleComponentFormula">
+            location="component://manufacturing/minilang/bom/BomFormulas.xml" invoke="exampleComponentFormula">
         <description>Example bom formula</description>
         <implements service="interfaceBomFormula"/>
     </service>
     <service name="linearComponentFormula" engine="simple" auth="true"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml" invoke="linearComponentConsumptionFormula">
+            location="component://manufacturing/minilang/bom/BomFormulas.xml" invoke="linearComponentConsumptionFormula">
         <description>Formula that computes the quantity of linear component in bom</description>
         <implements service="interfaceBomFormula"/>
     </service>
@@ -45,7 +45,7 @@ under the License.
         <attribute mode="OUT" name="totalTime" optional="false" type="BigDecimal"/>
     </service>
     <service name="exampleTaskFormula" engine="simple" auth="false"
-            location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml" invoke="exampleTaskFormula">
+            location="component://manufacturing/minilang/techdata/TaskFormulae.xml" invoke="exampleTaskFormula">
         <description>Formula that computes the estimated manufacturing time of a given task</description>
         <implements service="interfaceTaskFormula"/>
     </service>

Modified: ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml (original)
+++ ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml Fri Jun 10 14:04:30 2016
@@ -39,7 +39,7 @@ under the License.
         <attribute name="estimatedCompletionDate" type="java.sql.Timestamp" mode="OUT" optional="true"/>
     </service>
     <service name="createProductionRunPartyAssign" engine="simple"
-        location="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml" invoke="createProductionRunPartyAssign" auth="false">
+        location="component://manufacturing/minilang/jobshopmgt/ProductionRunServices.xml" invoke="createProductionRunPartyAssign" auth="false">
         <description>
             Associate a party to the production run
         </description>
@@ -50,7 +50,7 @@ under the License.
         <attribute name="fromDate" type="java.sql.Timestamp" mode="INOUT" optional="true"/>
     </service>
     <service name="createProductionRunAssoc" engine="simple"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml" invoke="createProductionRunAssoc" auth="false">
+                location="component://manufacturing/minilang/jobshopmgt/ProductionRunServices.xml" invoke="createProductionRunAssoc" auth="false">
         <description>
             Associate the production run to another production run
         </description>
@@ -193,7 +193,7 @@ under the License.
         <attribute name="productId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="issueProductionRunTask" engine="simple"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml" invoke="issueProductionRunTask" auth="false">
+                location="component://manufacturing/minilang/jobshopmgt/ProductionRunServices.xml" invoke="issueProductionRunTask" auth="false">
         <description>
             Issues the Inventory for a Production Run Task.
             Note that this skips the normal inventory reservation process.
@@ -204,7 +204,7 @@ under the License.
         <attribute name="failIfItemsAreNotOnHand" type="String" mode="IN" optional="true"/>
     </service>
     <service name="issueProductionRunTaskComponent" engine="simple"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml" invoke="issueProductionRunTaskComponent" auth="false">
+                location="component://manufacturing/minilang/jobshopmgt/ProductionRunServices.xml" invoke="issueProductionRunTaskComponent" auth="false">
         <description>
             Issues the Inventory for a Production Run Task Component. For more info see the issueProductionRunTask service.
             If fromDate is passed, then the WorkEffortGoodStandard record with pk composed of (workEffortId|productId|fromDate)
@@ -231,7 +231,7 @@ under the License.
         <attribute name="description" type="String" mode="IN" optional="true"/>
     </service>
     <service name="issueInventoryItemToWorkEffort" engine="simple"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml" invoke="issueInventoryItemToWorkEffort" auth="false">
+                location="component://manufacturing/minilang/jobshopmgt/ProductionRunServices.xml" invoke="issueInventoryItemToWorkEffort" auth="false">
         <description>
             Issue one InventoryItem (or part of it) to a WorkEffort.
             Note that this skips the normal inventory reservation process.

Modified: ofbiz/trunk/applications/manufacturing/servicedef/services_routing.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/servicedef/services_routing.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/servicedef/services_routing.xml (original)
+++ ofbiz/trunk/applications/manufacturing/servicedef/services_routing.xml Fri Jun 10 14:04:30 2016
@@ -42,7 +42,7 @@ under the License.
         <attribute name="sequenceNumNotOk" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="getProductRouting" engine="simple" auth="true"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml" invoke="getProductRouting">
+                location="component://manufacturing/minilang/routing/RoutingServices.xml" invoke="getProductRouting">
         <description>Get the product's routing and routing tasks</description>
         <attribute mode="IN" name="productId" optional="false" type="String"/>
         <attribute mode="IN" name="workEffortId" optional="true" type="String"/>
@@ -52,7 +52,7 @@ under the License.
         <attribute mode="OUT" name="tasks" type="java.util.List" optional="true"/>
     </service>
     <service name="getRoutingTaskAssocs" engine="simple" auth="true"
-                location="component://manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml" invoke="getRoutingTaskAssocs">
+                location="component://manufacturing/minilang/routing/RoutingServices.xml" invoke="getRoutingTaskAssocs">
         <description>Get the routing task assocs of a given routing</description>
         <attribute mode="IN" name="workEffortId" optional="false" type="String"/>
         <attribute mode="OUT" name="routingTaskAssocs" type="java.util.List" optional="true"/>

Modified: ofbiz/trunk/applications/manufacturing/testdef/productionruntests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/testdef/productionruntests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/testdef/productionruntests.xml (original)
+++ ofbiz/trunk/applications/manufacturing/testdef/productionruntests.xml Fri Jun 10 14:04:30 2016
@@ -26,6 +26,6 @@
     </test-case>
 
     <test-case case-name="production-run-tests">
-        <simple-method-test location="component://manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml"/>
+        <simple-method-test location="component://manufacturing/minilang/test/ProductionRunTests.xml"/>
     </test-case>
 </test-suite>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016
@@ -254,13 +254,13 @@ under the License.
     </request-map>
     <request-map uri="AddRoutingTaskAssoc">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml" invoke="addRoutingTaskAssoc"/>
+        <event type="simple" path="component://manufacturing/minilang/techdata/RoutingSimpleEvents.xml" invoke="addRoutingTaskAssoc"/>
         <response name="success" type="view" value="EditRoutingTaskAssoc"/>
         <response name="error" type="view" value="EditRoutingTaskAssoc"/>
     </request-map>
     <request-map uri="UpdateRoutingTaskAssoc">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml" invoke="updateRoutingTaskAssoc"/>
+        <event type="simple" path="component://manufacturing/minilang/techdata/RoutingSimpleEvents.xml" invoke="updateRoutingTaskAssoc"/>
         <response name="success" type="view" value="EditRoutingTaskAssoc"/>
         <response name="error" type="view" value="EditRoutingTaskAssoc"/>
     </request-map>
@@ -378,7 +378,7 @@ under the License.
     </request-map>
     <request-map uri="UpdateProductBom">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="eventEditBOM"/>
+        <event type="simple" path="component://manufacturing/minilang/bom/BomSimpleMethods.xml" invoke="eventEditBOM"/>
         <response name="success" type="view" value="EditProductBom"/>
         <response name="error" type="view" value="EditProductBom"/>
     </request-map>
@@ -433,7 +433,7 @@ under the License.
     </request-map>
     <request-map uri="createProductionRun">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="createProductionRun"/>
+        <event type="simple" path="component://manufacturing/minilang/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="createProductionRun"/>
         <response name="createProductionRunsForProductBom" type="request" value="createProductionRunsForProductBom"/>
         <response name="createProductionRunSingle" type="request" value="createProductionRunSingle"/>
     </request-map>
@@ -542,12 +542,12 @@ under the License.
     </request-map>
     <request-map uri="addProductionRunRoutingTask">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="addProductionRunRoutingTask"/>
+        <event type="simple" path="component://manufacturing/minilang/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="addProductionRunRoutingTask"/>
         <response name="success" type="view" value="ProductionRunTasks"/>
     </request-map>
     <request-map uri="updateProductionRunRoutingTask">
         <security https="true" auth="true"/>
-        <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="editProductionRunRoutingTask"/>
+        <event type="simple" path="component://manufacturing/minilang/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="editProductionRunRoutingTask"/>
         <response name="success" type="view" value="ProductionRunTasks"/>
     </request-map>
     <request-map uri="deleteProductionRunRoutingTask">

Modified: ofbiz/trunk/applications/marketing/minilang/sfa/account/AccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/sfa/account/AccountServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/minilang/sfa/account/AccountServices.xml (original)
+++ ofbiz/trunk/applications/marketing/minilang/sfa/account/AccountServices.xml Fri Jun 10 14:04:30 2016
@@ -21,7 +21,7 @@
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createAccount"  short-description="create Account Group">
         <set field="parameters.roleTypeId" value="ACCOUNT"/>
-        <call-simple-method method-name="createPartyGroupRoleAndContactMechs" xml-resource="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"/>
+        <call-simple-method method-name="createPartyGroupRoleAndContactMechs" xml-resource="component://party/minilang/party/PartySimpleMethods.xml"/>
         <field-to-result field="partyId"/>
         <set field="ensurePartyRoleCtx.partyId" from-field="userLogin.partyId"/>
         <set field="ensurePartyRoleCtx.roleTypeId" value="OWNER"/>

Modified: ofbiz/trunk/applications/marketing/minilang/sfa/contact/ContactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/sfa/contact/ContactServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/minilang/sfa/contact/ContactServices.xml (original)
+++ ofbiz/trunk/applications/marketing/minilang/sfa/contact/ContactServices.xml Fri Jun 10 14:04:30 2016
@@ -23,10 +23,10 @@
     <simple-method short-description="Create Contact" method-name="createContact">
         <set field="parameters.roleTypeId" value="CONTACT"/>
         <if-compare field="parameters.quickAdd" operator="not-equals" value="Y">
-            <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"/>
+            <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="component://party/minilang/party/PartySimpleMethods.xml"/>
         <else>
             <call-map-processor processor-name="person" in-map-name="parameters" out-map-name="personCtx"
-                xml-resource="component://party/script/org/ofbiz/party/party/PartyMapProcs.xml"/>
+                xml-resource="component://party/minilang/party/PartyMapProcs.xml"/>
             <call-service service-name="createPerson" in-map-name="personCtx">
                 <result-to-field result-name="partyId" field="partyId"/>
                 <result-to-result result-name="partyId" service-result-name="partyId"/>

Modified: ofbiz/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml Fri Jun 10 14:04:30 2016
@@ -53,7 +53,7 @@
             </condition>
             <then>
                 <set field="parameters.roleTypeId" value="LEAD"/>
-                <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"/>
+                <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="component://party/minilang/party/PartySimpleMethods.xml"/>
                 <check-errors/>
                 
                 <set field="leadContactPartyId" from-field="partyId"/>
@@ -77,7 +77,7 @@
             <set field="parameters.roleTypeId" value="ACCOUNT_LEAD"/>
             <if-empty field="leadContactPartyId">
                 <!-- In case we have any contact mech data then associate with party group  -->
-                <call-simple-method method-name="createPartyGroupRoleAndContactMechs" xml-resource="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"/>
+                <call-simple-method method-name="createPartyGroupRoleAndContactMechs" xml-resource="component://party/minilang/party/PartySimpleMethods.xml"/>
                 <set field="partyGroupPartyId" from-field="partyId"/>
                 <clear-field field="partyId"/>
         
@@ -87,7 +87,7 @@
 
                 <else>
                     <call-map-processor processor-name="partyGroup" in-map-name="parameters" out-map-name="partyGroupCtx"
-                        xml-resource="component://party/script/org/ofbiz/party/party/PartyMapProcs.xml"/>
+                        xml-resource="component://party/minilang/party/PartyMapProcs.xml"/>
                     <call-service service-name="createPartyGroup" in-map-name="partyGroupCtx">
                         <result-to-field result-name="partyId" field="partyGroupPartyId"/>
                     </call-service>

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Fri Jun 10 14:04:30 2016
@@ -72,7 +72,7 @@ under the License.
         <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="unsubscribeContactListParty" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListParty" auth="false">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListParty" auth="false">
         <description>Unsubscribe an input email for a ContactList with _NA_ party using the system userLogin.
             The intent is for anonymous unsubscribe to email lists.  Also validates email format.</description>
         <attribute name="contactListId" type="String" mode="IN" optional="false"/>
@@ -81,7 +81,7 @@ under the License.
         <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="unsubscribeContactListPartyContachMech" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListPartyContachMech" auth="false">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListPartyContachMech" auth="false">
         <description>Find email by contactMechId then call unsubscribeContactListParty service.</description>
         <attribute name="contactListId" type="String" mode="IN" optional="false"/>
         <attribute name="preferredContactMechId" type="String" mode="IN" optional="false"/>
@@ -91,7 +91,7 @@ under the License.
 
     <!-- MarketingCampaignRole Services -->
     <service name="createMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="createMarketingCampaignRole" auth="true">
+            location="component://marketing/minilang/marketing/campaign/CampaignServices.xml" invoke="createMarketingCampaignRole" auth="true">
         <description>Add Role to Campaign</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -103,7 +103,7 @@ under the License.
 
     <!-- ContactList Services -->
     <service name="createContactList" default-entity-name="ContactList" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="createContactList" auth="true">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="createContactList" auth="true">
         <description>Create a ContactList record</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -122,7 +122,7 @@ under the License.
 
     <!-- ContactListParty Services -->
     <service name="createContactListParty" default-entity-name="ContactListParty" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="createContactListParty" auth="true">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="createContactListParty" auth="true">
         <description>Add Party to ContactList</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -131,7 +131,7 @@ under the License.
         <override name="statusId" optional="false"/>
     </service>
     <service name="updateContactListParty" default-entity-name="ContactListParty" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updateContactListParty" auth="true">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateContactListParty" auth="true">
         <description>Update Party to ContactList Join</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>        
@@ -142,7 +142,7 @@ under the License.
         <override name="fromDate" optional="true"/>
     </service>
     <service name="updateContactListPartyNoUserLogin" default-entity-name="ContactListParty" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updateContactListPartyNoUserLogin" auth="false">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateContactListPartyNoUserLogin" auth="false">
         <description>Update Party to ContactList Join</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -156,7 +156,7 @@ under the License.
         <override name="fromDate" optional="true"/>
     </service>
     <service name="updatePartyEmailContactListParty" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updatePartyEmailContactListParty" auth="true">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updatePartyEmailContactListParty" auth="true">
         <description>Update ContactList Party Contact Mech</description>
         <attribute name="contactMechId" type="String" mode="IN" optional="false"/>
         <attribute name="oldContactMechId" type="String" mode="IN" optional="false"/>
@@ -166,7 +166,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="createContactListPartyStatus" default-entity-name="ContactListPartyStatus" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="createContactListPartyStatus" auth="true">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="createContactListPartyStatus" auth="true">
         <description>Create ContactListParty Status</description>
         <auto-attributes include="pk" mode="IN" optional="false">
             <exclude field-name="statusDate"/>
@@ -180,19 +180,19 @@ under the License.
         <override name="fromDate" optional="true"/>
     </service>
     <service name="sendContactListPartyVerifyEmail" engine="simple" max-retry="3"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyVerifyEmail" auth="true">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyVerifyEmail" auth="true">
         <description>Send ContactListParty Verify Email</description>
         <auto-attributes entity-name="ContactListParty" include="pk" mode="IN" optional="false"/>
         <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="optOutOfListFromCommEvent" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="optOutOfListFromCommEvent" auth="false">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="optOutOfListFromCommEvent" auth="false">
         <description>Uses the communication event information to locate the contact list party information and removes the contact from the list</description>
         <attribute name="communicationEventId" type="String" mode="IN" optional="false"/>
         <attribute name="contactListId" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="sendContactListPartySubscribeEmail" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartySubscribeEmail" auth="false">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="sendContactListPartySubscribeEmail" auth="false">
         <attribute name="productStoreId" mode="IN" type="String" optional="true"/>
         <attribute name="partyId" mode="IN" type="String" optional="true"/>
         <attribute name="contactListId" mode="IN" type="String" optional="true"/>
@@ -202,7 +202,7 @@ under the License.
         <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="sendContactListPartyUnSubscribeVerifyEmail" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeVerifyEmail" auth="false">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeVerifyEmail" auth="false">
         <attribute name="productStoreId" mode="IN" type="String" optional="true"/>
         <attribute name="partyId" mode="IN" type="String" optional="true"/>
         <attribute name="contactListId" mode="IN" type="String" optional="true"/>
@@ -212,7 +212,7 @@ under the License.
         <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="sendContactListPartyUnSubscribeEmail" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeEmail" auth="false">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeEmail" auth="false">
         <attribute name="productStoreId" mode="IN" type="String" optional="true"/>
         <attribute name="partyId" mode="IN" type="String" optional="true"/>
         <attribute name="contactListId" mode="IN" type="String" optional="true"/>
@@ -223,30 +223,30 @@ under the License.
 
     <!--  ContactList Comm Status Services -->
     <service name="updateContactListCommStatus" engine="simple" default-entity-name="ContactListCommStatus"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updateContactListCommStatus">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateContactListCommStatus">
         <auto-attributes include="all" mode="IN" optional="false"/>
         <override name="partyId" optional="true"/>
         <override name="messageId" allow-html="any" optional="true"/>
     </service>
     <service name="updateCommStatusFromCommEvent" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updateCommStatusFromCommEvent">
+            location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateCommStatusFromCommEvent">
         <attribute name="communicationEventId" type="String" mode="IN"/>
         <attribute name="statusId" type="String" mode="IN"/>        
     </service>
     
     <!-- WebSiteContactList services -->
     <service name="createWebSiteContactList" engine="simple" default-entity-name="WebSiteContactList"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="createWebSiteContactList">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="createWebSiteContactList">
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="updateWebSiteContactList" engine="simple" default-entity-name="WebSiteContactList"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updateWebSiteContactList">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateWebSiteContactList">
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="deleteWebSiteContactList" engine="simple" default-entity-name="WebSiteContactList"
-        location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="deleteWebSiteContactList">
+        location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="deleteWebSiteContactList">
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
     
@@ -269,19 +269,19 @@ under the License.
 
     <!-- TrackingCodeType Services -->
     <service name="createTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeType" auth="true">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeType" auth="true">
         <description>Create a TrackingCodeType record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeType" auth="true">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeType" auth="true">
         <description>Update a TrackingCodeType record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="deleteTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="deleteTrackingCodeType" auth="true">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="deleteTrackingCodeType" auth="true">
         <description>Update a TrackingCodeType record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
@@ -364,7 +364,7 @@ under the License.
 
     <!-- SegmentGroup Related Find Service -->
     <service name="arePartiesRelatedThroughSegmentGroup" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml" invoke="arePartiesRelatedThroughSegmentGroup">
+        location="component://marketing/minilang/marketing/segment/SegmentServices.xml" invoke="arePartiesRelatedThroughSegmentGroup">
         <description>Determine: are Parties Related Through SegmentGroup?</description>
         <permission-service service-name="marketingPermissionService" main-action="VIEW"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -376,14 +376,14 @@ under the License.
 
     <!-- Tracking Code Order return  -->
     <service name="createTrackingCodeOrder" default-entity-name="TrackingCodeOrder" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeOrder">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeOrder">
         <description>Create a TrackingCodeOrder record</description>
         <permission-service service-name="marketingPermissionService" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateTrackingCodeOrder" default-entity-name="TrackingCodeOrder" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeOrder">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeOrder">
         <description>Update a TrackingCode record</description>
         <permission-service service-name="marketingPermissionService" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -392,28 +392,28 @@ under the License.
 
     <!-- Tracking Code Order return  -->
     <service name="createTrackingCodeOrderReturn" default-entity-name="TrackingCodeOrderReturn" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeOrderReturn">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeOrderReturn">
         <description>Create a TrackingCodeOrderReturn  record</description>
         <permission-service service-name="marketingPermissionService" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateTrackingCodeOrderReturn" default-entity-name="TrackingCodeOrderReturn" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeOrderReturn">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeOrderReturn">
         <description>Update a TrackingCode record</description>
         <permission-service service-name="marketingPermissionService" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="deleteTrackingCodeOrderReturn" default-entity-name="TrackingCodeOrderReturn" engine="simple"
-            location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="deleteTrackingCodeOrderReturn">
+            location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="deleteTrackingCodeOrderReturn">
         <description>Update a TrackingCode record</description>
         <permission-service service-name="marketingPermissionService" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createTrackingCodeOrderReturns"  engine="simple"
-                location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeOrderReturns">
+                location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeOrderReturns">
         <description>Create TrackingCodeOrderReturn for all the Return Items with Orders that have trackingCodeOrder entry</description>
         <permission-service service-name="marketingPermissionService" main-action="CREATE"/>
         <attribute type="String" mode="IN" name="returnId" optional="false"/>
@@ -421,14 +421,14 @@ under the License.
 
     <!-- marketing permission service -->
     <service name="marketingPermissionService" engine="simple"
-             location="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="genericBasePermissionCheck">
+             location="component://common/minilang/permission/CommonPermissionServices.xml" invoke="genericBasePermissionCheck">
         <implements service="permissionInterface"/>
         <attribute name="primaryPermission" type="String" mode="IN" optional="true" default-value="MARKETING"/>
         <attribute name="altPermission" type="String" mode="IN" optional="true"/>
     </service>
 
     <!-- lead services -->
-    <service name="createLead" engine="simple" location="component://marketing/script/org/ofbiz/sfa/lead/LeadServices.xml" invoke="createLead">
+    <service name="createLead" engine="simple" location="component://marketing/minilang/sfa/lead/LeadServices.xml" invoke="createLead">
         <description>
             Sales Lead can be just a person or a person representing a company or a company (party group).
             createLead works 1) If person information is passed. 2) If company (party group) information is passed. 3) If Person and company (party group) information is passed.
@@ -458,7 +458,7 @@ under the License.
         <attribute name="contactMechId" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="createContact" engine="simple"
-        location="component://marketing/script/org/ofbiz/sfa/contact/ContactServices.xml" invoke="createContact">
+        location="component://marketing/minilang/sfa/contact/ContactServices.xml" invoke="createContact">
         <description>Create a Contact Person</description>
         <auto-attributes entity-name="Person" mode="IN" optional="true">
             <exclude field-name="partyId"/>
@@ -478,7 +478,7 @@ under the License.
         <attribute name="contactListId" type="String" mode="IN" optional="true"/>
     </service>
     <service name="mergeContacts" engine="simple"
-        location="component://marketing/script/org/ofbiz/sfa/contact/ContactServices.xml" invoke="mergeContacts">
+        location="component://marketing/minilang/sfa/contact/ContactServices.xml" invoke="mergeContacts">
         <description>This service merges the contact details of two parties, partyId merges into partyIdTo</description>
         <attribute name="addrContactMechIdTo" type="String" mode="IN" optional="true"/>
         <attribute name="phoneContactMechIdTo" type="String" mode="IN" optional="true"/>
@@ -494,7 +494,7 @@ under the License.
     </service>
     <!-- Account services  -->
     <service name="createAccount" engine="simple"
-        location="component://marketing/script/org/ofbiz/sfa/account/AccountServices.xml" invoke="createAccount">
+        location="component://marketing/minilang/sfa/account/AccountServices.xml" invoke="createAccount">
         <description>Create an Account Group</description>
         <auto-attributes entity-name="PartyGroup" mode="IN" optional="true">
             <exclude field-name="partyId"/>
@@ -509,7 +509,7 @@ under the License.
         <attribute name="extension" type="String" mode="IN" optional="true"/>
         <attribute name="partyId" type="String" mode="OUT" optional="false"/>
     </service>
-    <service name="convertLeadToContact" engine="simple" location="component://marketing/script/org/ofbiz/sfa/lead/LeadServices.xml" invoke="convertLeadToContact">
+    <service name="convertLeadToContact" engine="simple" location="component://marketing/minilang/sfa/lead/LeadServices.xml" invoke="convertLeadToContact">
         <attribute name="partyId" type="String" mode="INOUT" optional="false"/>
         <attribute name="partyGroupId" type="String" mode="INOUT" optional="false"/>
     </service>

Modified: ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml Fri Jun 10 14:04:30 2016
@@ -24,7 +24,7 @@ under the License.
     <vendor>OFBiz</vendor>
 
     <service name="createSalesForecast" engine="simple" auth="true" default-entity-name="SalesForecast"
-            location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="createSalesForecast">
+            location="component://order/minilang/opportunity/OpportunityServices.xml" invoke="createSalesForecast">
        <description>Creates a Sales Forecast for the userLogin. Requires ORDERMGR_4C_CREATE permission.
             This will save the forecast into the history as well. Note that this service does not compute
             the forecast. That must be done in a higher level service.</description>
@@ -36,7 +36,7 @@ under the License.
     </service>
 
     <service name="updateSalesForecast" engine="simple" auth="true" default-entity-name="SalesForecast"
-            location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="updateSalesForecast">
+            location="component://order/minilang/opportunity/OpportunityServices.xml" invoke="updateSalesForecast">
        <description>Updates a Sales Forecast and marks it as modified by the userLogin. Requires ORDERMGR_4C_UPDATE
             permission. This will save the current forecast into the history before overwritting it.
             Note that this service does not compute the forecast. That must be done in a higher level service.</description>
@@ -91,19 +91,19 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="true"/>
     </service>
     <service name="createSalesOpportunityAccountRole" engine="simple" default-entity-name="SalesOpportunityRole"
-        location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="createSalesOpportunityAccountRole">
+        location="component://order/minilang/opportunity/OpportunityServices.xml" invoke="createSalesOpportunityAccountRole">
         <description>Create sales opportunity account role</description>
         <attribute name="accountPartyId" mode="IN" type="String"/>
         <attribute name="salesOpportunityId" mode="IN" type="String"/>
     </service>
     <service name="createSalesOpportunityLeadRole" engine="simple" default-entity-name="SalesOpportunityRole"
-        location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="createSalesOpportunityLeadRole">
+        location="component://order/minilang/opportunity/OpportunityServices.xml" invoke="createSalesOpportunityLeadRole">
         <description>Create sales opportunity lead role</description>
         <attribute name="leadPartyId" mode="IN" type="String"/>
         <attribute name="salesOpportunityId" mode="IN" type="String"/>
     </service>
     <service name="findPartyInSalesOpportunityRole" engine="simple" default-entity-name="SalesOpportunityRole"
-        location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="findPartyInSalesOpportunityRole">
+        location="component://order/minilang/opportunity/OpportunityServices.xml" invoke="findPartyInSalesOpportunityRole">
         <description>find sales opportunity role party</description>
         <attribute name="roleTypeId" mode="IN" type="String"/>
         <attribute name="salesOpportunityId" mode="IN" type="String" optional="true"/>

Modified: ofbiz/trunk/applications/marketing/testdef/MarketingTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/testdef/MarketingTests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/testdef/MarketingTests.xml (original)
+++ ofbiz/trunk/applications/marketing/testdef/MarketingTests.xml Fri Jun 10 14:04:30 2016
@@ -22,6 +22,6 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="marketing-tests">
-        <simple-method-test location="component://marketing/script/org/ofbiz/marketing/test/MarketingTests.xml"/>
+        <simple-method-test location="component://marketing/minilang/marketing/test/MarketingTests.xml"/>
     </test-case>
 </test-suite>

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

Modified: ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml Fri Jun 10 14:04:30 2016
@@ -22,9 +22,9 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
 
     <simple-method method-name="createUpdateCustomerAndShippingAddress" short-description="Create/Update Customer, Shipping Address and other contact details." login-required="false">
-        <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml"
+        <call-map-processor xml-resource="component://order/minilang/customer/CheckoutMapProcs.xml"
                 processor-name="shipToPhone" in-map-name="parameters" out-map-name="shipToPhoneCtx"/>
-        <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/PartyContactMechMapProcs.xml"
+        <call-map-processor xml-resource="component://party/minilang/contact/PartyContactMechMapProcs.xml"
                 processor-name="emailAddress" in-map-name="parameters" out-map-name="emailAddressCtx"/>
         <check-errors/>
         <set field="shoppingCart" from-field="parameters.shoppingCart"/>
@@ -114,7 +114,7 @@ under the License.
     </simple-method>
 
     <simple-method method-name="createUpdateBillingAddressAndPaymentMethod" short-description="Create/update billing address and payment information" login-required="false">
-        <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml"
+        <call-map-processor xml-resource="component://order/minilang/customer/CheckoutMapProcs.xml"
                 processor-name="billToPhone" in-map-name="parameters" out-map-name="billToPhoneContext"/>
         <check-errors/>
         <set field="shoppingCart" from-field="parameters.shoppingCart"/>

Modified: ofbiz/trunk/applications/order/minilang/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderServices.xml Fri Jun 10 14:04:30 2016
@@ -860,7 +860,7 @@ under the License.
 
     <simple-method method-name="createUpdateShippingAddress" short-description="create and update Shipping address" login-required="false">
         <set field="keepAddressBook" from-field="parameters.keepAddressBook" default-value="Y"/>
-        <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml"
+        <call-map-processor xml-resource="component://order/minilang/customer/CheckoutMapProcs.xml"
             processor-name="shipToAddress" in-map-name="parameters" out-map-name="shipToAddressCtx"/>
         <check-errors/>
         <set field="shipToAddressCtx.partyId" from-field="parameters.partyId"/>
@@ -960,7 +960,7 @@ under the License.
 
         <set field="keepAddressBook" from-field="parameters.keepAddressBook" default-value="Y"/>
         <if-compare field="parameters.useShippingAddressForBilling" operator="not-equals" value="Y">
-            <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml"
+            <call-map-processor xml-resource="component://order/minilang/customer/CheckoutMapProcs.xml"
                 processor-name="billToAddress" in-map-name="parameters" out-map-name="billToAddressCtx"/>
         </if-compare>
         <check-errors/>

Modified: ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml Fri Jun 10 14:04:30 2016
@@ -25,7 +25,7 @@ under the License.
         <set field="primaryPermission" value="ORDERMGR"/>
         <set field="altPermission" value="ORDERMGR_ROLE"/>
         <set field="mainAction" from-field="parameters.mainAction"/>
-        <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"/>
         <if-compare field="hasPermission" operator="not-equals" value="true">
             <set field="resourceDescription" from-field="parameters.resourceDescription"/>
             <if-empty field="resourceDescription">

Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1747712&r1=1747586&r2=1747712&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Fri Jun 10 14:04:30 2016
@@ -30,7 +30,7 @@ under the License.
             </condition>
             <then>
                 <set field="primaryPermission" value="ORDERMGR_CRQ"/>
-                <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"/>
                 <if-compare field="hasPermission" operator="not-equals" value="true">
                     <set field="resourceDescription" from-field="parameters.resourceDescription"/>
                     <if-empty field="resourceDescription">
@@ -138,7 +138,7 @@ under the License.
                             <entity-one entity-name="WorkEffort" value-field="lowInfo">
                                 <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/>
                             </entity-one>
-                            <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="actualHours" from-field="highInfo.actualHours"/>
                             <!-- no hours recorded yet so custrequest can be cancelled -->
                             <if-empty field="actualHours">