svn commit: r1747712 [13/16] - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1747712 [13/16] - in /ofbiz/trunk: applications/accounting/minila
 
|
Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -26,12 +26,12 @@ under the License. <!-- Common Permission Service --> <service name="commonGenericPermission" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="commonGenericPermission"> + location="component://common/minilang/CommonServices.xml" invoke="commonGenericPermission"> <implements service="permissionInterface"/> </service> <service name="commonGetAllCrudPermissions" engine="simple" - location="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="getAllCrudPermissions" auth="false"> + location="component://common/minilang/permission/CommonPermissionServices.xml" invoke="getAllCrudPermissions" auth="false"> <description>Returns all CRUD and View Permissions</description> <attribute name="primaryPermission" type="String" mode="IN" optional="false"/> <attribute name="altPermission" type="String" mode="IN" optional="true"/> @@ -161,7 +161,7 @@ under the License. <!-- CustomTimePeriod Services --> <service name="createCustomTimePeriod" default-entity-name="CustomTimePeriod" engine="simple" - location="component://common/script/org/ofbiz/common/period/PeriodServices.xml" invoke="createCustomTimePeriod" auth="true"> + location="component://common/minilang/period/PeriodServices.xml" invoke="createCustomTimePeriod" auth="true"> <description>Create a CustomTimePeriod record</description> <auto-attributes mode="OUT" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> @@ -171,13 +171,13 @@ under the License. <override name="periodTypeId" optional="false"/> </service> <service name="updateCustomTimePeriod" default-entity-name="CustomTimePeriod" engine="simple" - location="component://common/script/org/ofbiz/common/period/PeriodServices.xml" invoke="updateCustomTimePeriod" auth="true"> + location="component://common/minilang/period/PeriodServices.xml" invoke="updateCustomTimePeriod" auth="true"> <description>Update a CustomTimePeriod record</description> <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> <service name="deleteCustomTimePeriod" default-entity-name="CustomTimePeriod" engine="simple" - location="component://common/script/org/ofbiz/common/period/PeriodServices.xml" invoke="deleteCustomTimePeriod" auth="true"> + location="component://common/minilang/period/PeriodServices.xml" invoke="deleteCustomTimePeriod" auth="true"> <description>Delete a CustomTimePeriod record</description> <auto-attributes mode="IN" include="pk" optional="false"/> </service> @@ -281,19 +281,19 @@ under the License. <!-- Keyword Thesaurus services --> <service name="createKeywordThesaurus" default-entity-name="KeywordThesaurus" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="createKeywordThesaurus" auth="true"> + location="component://common/minilang/CommonServices.xml" invoke="createKeywordThesaurus" auth="true"> <description>Create a Keyword Thesaurus</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateKeywordThesaurus" default-entity-name="KeywordThesaurus" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="updateKeywordThesaurus" auth="true"> + location="component://common/minilang/CommonServices.xml" invoke="updateKeywordThesaurus" auth="true"> <description>Update a Keyword Thesaurus</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteKeywordThesaurus" default-entity-name="KeywordThesaurus" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="deleteKeywordThesaurus" auth="true"> + location="component://common/minilang/CommonServices.xml" invoke="deleteKeywordThesaurus" auth="true"> <description>Delete a Keyword Thesaurus</description> <auto-attributes include="pk" mode="IN" optional="false"/> <override name="alternateKeyword" optional="true"/> @@ -301,13 +301,13 @@ under the License. <!-- Uom conversion service --> <service name="createUomConversionDated" default-entity-name="UomConversionDated" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="createUomConversionDated" auth="true"> + location="component://common/minilang/CommonServices.xml" invoke="createUomConversionDated" auth="true"> <description>Create a new dated UOM converesion entity</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="convertUom" default-entity-name="UomConversion" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="convertUom" auth="false"> + location="component://common/minilang/CommonServices.xml" invoke="convertUom" auth="false"> <description>Make a unit of measure conversion, first using UomConversion, then with UomConversionDated</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="asOfDate" mode="IN" type="Timestamp" optional="true"/> @@ -319,7 +319,7 @@ under the License. <attribute name="defaultRoundingMode" mode="IN" type="String" optional="true"/> </service> <service name="convertUomCustom" default-entity-name="UomConversion" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="convertUomCustom" auth="false"> + location="component://common/minilang/CommonServices.xml" invoke="convertUomCustom" auth="false"> <description>Make a unit of measure conversion, using CustomMethod entity</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="originalValue" mode="IN" type="BigDecimal" optional="false"/> @@ -329,7 +329,7 @@ under the License. </service> <service name="checkUomConversion" engine="simple" default-entity-name="UomConversion" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="checkUomConversion"> + location="component://common/minilang/CommonServices.xml" invoke="checkUomConversion"> <description>Returns true if an UomConversion record exists</description> <permission-service service-name="commonGenericPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN"/> @@ -337,7 +337,7 @@ under the License. </service> <service name="checkUomConversionDated" engine="simple" default-entity-name="UomConversionDated" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="checkUomConversionDated"> + location="component://common/minilang/CommonServices.xml" invoke="checkUomConversionDated"> <description>Returns true if an UomConversionDated record exists</description> <permission-service service-name="commonGenericPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN"/> @@ -345,7 +345,7 @@ under the License. </service> - <service name="getFileUploadProgressStatus" engine="simple" location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getFileUploadProgressStatus" auth="false"> + <service name="getFileUploadProgressStatus" engine="simple" location="component://common/minilang/CommonServices.xml" invoke="getFileUploadProgressStatus" auth="false"> <description>Look up progress made in File Upload process</description> <attribute name="uploadProgressListener" mode="IN" type="org.ofbiz.webapp.event.FileUploadProgressListener" optional="true"/> <attribute name="contentLength" mode="OUT" type="Long" optional="true"/> @@ -424,7 +424,7 @@ under the License. <!-- common permission services --> <service name="genericBasePermissionCheck" 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="false"/> <attribute name="altPermission" type="String" mode="IN" optional="true"/> @@ -513,7 +513,7 @@ under the License. <!-- Visual theme services --> <service name="getVisualThemeResources" engine="simple" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getVisualThemeResources"> + location="component://common/minilang/CommonServices.xml" invoke="getVisualThemeResources"> <description>Get a visual theme resources Map. Call with visualThemeId String, and optional themeResources Map. Returns themeResources Map - a Map of Lists, where the resourceTypeEnumId is the key and the value @@ -569,7 +569,7 @@ under the License. <!-- ==============Permission Checking Service============= --> <service name="visualThemePermissionCheck" engine="simple" - location="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="visualThemePermissionCheck"> + location="component://common/minilang/permission/CommonPermissionServices.xml" invoke="visualThemePermissionCheck"> <description>Visual Theme Permission Checking Logic</description> <implements service="permissionInterface"/> </service> @@ -577,7 +577,7 @@ under the License. <!-- Temporal expression services --> <service name="tempExprPermissionCheck" 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="false" default-value="TEMPEXPR"/> <attribute name="altPermission" type="String" mode="IN" optional="true"/> @@ -609,7 +609,7 @@ under the License. <!-- Portal Page Portlet services --> <service name="createPortalPagePortlet" default-entity-name="PortalPagePortlet" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="createPortalPagePortlet"> + location="component://common/minilang/PortalPageServices.xml" invoke="createPortalPagePortlet"> <description>Add a registered PortalPortlet to a PortalPage</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -621,13 +621,13 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deletePortalPagePortlet" default-entity-name="PortalPagePortlet" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="deletePortalPagePortlet"> + location="component://common/minilang/PortalPageServices.xml" invoke="deletePortalPagePortlet"> <description>Delete a PortalPortlet from a PortalPage</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="movePortletToPortalPage" default-entity-name="PortalPagePortlet" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="movePortletToPortalPage"> + location="component://common/minilang/PortalPageServices.xml" invoke="movePortletToPortalPage"> <description>Move a PortalPortlet from the actual portalPage to a different one</description> <attribute name="portalPageId" type="String" mode="IN" optional="false"/> <attribute name="portalPortletId" type="String" mode="IN" optional="false"/> @@ -637,7 +637,7 @@ under the License. <!-- Portal Page services --> <service name="createPortalPage" default-entity-name="PortalPage" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="createPortalPage"> + location="component://common/minilang/PortalPageServices.xml" invoke="createPortalPage"> <description>Create a new Portal Page</description> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -648,13 +648,13 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deletePortalPage" default-entity-name="PortalPage" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="deletePortalPage"> + location="component://common/minilang/PortalPageServices.xml" invoke="deletePortalPage"> <description>Delete a Portal Page, related colums and used portlets</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updatePortalPageSeq" engine="simple" default-entity-name="PortalPage" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="updatePortalPageSeq"> + location="component://common/minilang/PortalPageServices.xml" invoke="updatePortalPageSeq"> <auto-attributes mode="IN" include="pk"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="mode" type="String" mode="IN"/><!-- possible values: TOP, BOTTOM, UP, DOWN --> @@ -662,7 +662,7 @@ under the License. <!-- PortalPageColumn services --> <service name="addPortalPageColumn" default-entity-name="PortalPageColumn" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="addPortalPageColumn"> + location="component://common/minilang/PortalPageServices.xml" invoke="addPortalPageColumn"> <description>Add a new Column to a PortalPage</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -674,14 +674,14 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deletePortalPageColumn" default-entity-name="PortalPageColumn" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="deletePortalPageColumn"> + location="component://common/minilang/PortalPageServices.xml" invoke="deletePortalPageColumn"> <description>Delete a Column from a PortalPage</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- update Sequence No for Drag and Drop --> <service name="updatePortletSeqDragDrop" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="updatePortletSeqDragDrop"> + location="component://common/minilang/PortalPageServices.xml" invoke="updatePortletSeqDragDrop"> <attribute name="o_portalPageId" mode="IN" type="String" ></attribute> <attribute name="o_portalPortletId" mode="IN" type="String"></attribute> <attribute name="o_portletSeqId" mode="IN" type="String"></attribute> @@ -701,7 +701,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="getPortletAttributes" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/PortalPageServices.xml" invoke="getPortletAttributes"> + location="component://common/minilang/PortalPageServices.xml" invoke="getPortletAttributes"> <description>Get all attributes of a Portlet</description> <attribute name="portalPageId" type="String" mode="IN" optional="true"/> <attribute name="ownerUserLoginId" type="String" mode="IN" optional="true"/> @@ -736,7 +736,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="linkGeos" engine="simple" auth="true" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="linkGeos"> + location="component://common/minilang/CommonServices.xml" invoke="linkGeos"> <description>Link Geos to another Geo</description> <permission-service service-name="commonGenericPermission" main-action="CREATE"/> <attribute name="geoIds" type="List" mode="IN" optional="true"/> @@ -744,18 +744,18 @@ under the License. <attribute name="geoAssocTypeId" type="String" mode="IN"/> </service> <service name="getRelatedGeos" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getRelatedGeos"> + location="component://common/minilang/CommonServices.xml" invoke="getRelatedGeos"> <attribute name="geoId" mode="IN" type="String"/> <attribute name="geoAssocTypeId" mode="IN" type="String"/> <attribute name="geoList" mode="OUT" type="java.util.List"/> </service> <service name="getCountryList" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getCountryList"> + location="component://common/minilang/CommonServices.xml" invoke="getCountryList"> <description>Get a list of country and associated states from Geo</description> <attribute name="countryList" mode="OUT" type="java.util.List"/> </service> <service name="getAssociatedStateList" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getAssociatedStateList"> + location="component://common/minilang/CommonServices.xml" invoke="getAssociatedStateList"> <attribute name="countryGeoId" mode="IN" type="String" optional="false"/> <attribute name="listOrderBy" mode="IN" type="String" optional="true"/> <attribute name="stateList" mode="OUT" type="java.util.List"/> @@ -787,17 +787,17 @@ under the License. </service> <service name="getServerTimestamp" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimestamp"> + location="component://common/minilang/CommonServices.xml" invoke="getServerTimestamp"> <attribute name="serverTimestamp" mode="OUT" type="TimeStamp"/> </service> <service name="getServerTimeZone" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimeZone"> + location="component://common/minilang/CommonServices.xml" invoke="getServerTimeZone"> <attribute name="serverTimeZone" mode="OUT" type="String"/> </service> <service name="getServerTimestampAsLong" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimestampAsLong"> + location="component://common/minilang/CommonServices.xml" invoke="getServerTimestampAsLong"> <attribute name="serverTimestamp" mode="OUT" type="Long"/> </service> Modified: ofbiz/trunk/framework/common/servicedef/services_cdyne.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_cdyne.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services_cdyne.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services_cdyne.xml Fri Jun 10 14:04:30 2016 @@ -25,7 +25,7 @@ under the License. <version>1.0</version> <service name="cdynePostalAddressFillInCounty" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CdyneServices.xml" invoke="cdynePostalAddressFillInCounty"> + location="component://common/minilang/CdyneServices.xml" invoke="cdynePostalAddressFillInCounty"> <description>Use the CdyneReturnCityState service to fill in the County on a PostalAddress. Can be called as with a SECA rule.</description> <attribute name="contactMechId" type="String" mode="IN" optional="false"/> </service> Modified: ofbiz/trunk/framework/common/servicedef/services_email.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_email.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services_email.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services_email.xml Fri Jun 10 14:04:30 2016 @@ -127,7 +127,7 @@ under the License. <implements service="sendMailFromScreenInterface"/> </service> <service name="sendMailFromTemplateSetting" engine="simple" - location="component://common/script/org/ofbiz/common/email/EmailServices.xml" invoke="sendMailFromTemplateSetting"> + location="component://common/minilang/email/EmailServices.xml" invoke="sendMailFromTemplateSetting"> <description>Send Email From Email Template Setting Service</description> <implements service="sendMailInterface"/> <attribute name="emailTemplateSettingId" type="String" mode="IN" optional="false"/> Modified: ofbiz/trunk/framework/common/servicedef/services_security.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_security.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services_security.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services_security.xml Fri Jun 10 14:04:30 2016 @@ -119,7 +119,7 @@ under the License. <!-- permission check --> <service name="securityPermissionCheck" 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="SECURITY"/> </service> Modified: ofbiz/trunk/framework/common/servicedef/services_test.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_test.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services_test.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services_test.xml Fri Jun 10 14:04:30 2016 @@ -153,50 +153,50 @@ under the License. <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testBsh" engine="bsh" location="component://common/script/org/ofbiz/common/BshServiceTest.bsh" invoke=""> + <service name="testBsh" engine="bsh" location="component://common/minilang/BshServiceTest.bsh" invoke=""> <description>Test BeanShell Script Service</description> <attribute name="message" type="String" mode="IN" optional="true" /> <attribute name="result" type="String" mode="OUT" /> </service> - <service name="testGroovy" engine="groovy" location="component://common/script/org/ofbiz/common/GroovyServiceTest.groovy" invoke=""> + <service name="testGroovy" engine="groovy" location="component://common/minilang/GroovyServiceTest.groovy" invoke=""> <description>Test Groovy Script Service</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testGroovyMethod" engine="groovy" location="component://common/script/org/ofbiz/common/GroovyServiceTest.groovy" invoke="testMethod"> + <service name="testGroovyMethod" engine="groovy" location="component://common/minilang/GroovyServiceTest.groovy" invoke="testMethod"> <description>Test Groovy Script Service Method Invocation</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testScriptEngineBsh" engine="script" location="component://common/script/org/ofbiz/common/BshServiceTest.bsh" invoke=""> + <service name="testScriptEngineBsh" engine="script" location="component://common/minilang/BshServiceTest.bsh" invoke=""> <description>Test BeanShell Script Service</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testScriptEngineGroovy" engine="script" location="component://common/script/org/ofbiz/common/GroovyServiceTest.groovy" invoke=""> + <service name="testScriptEngineGroovy" engine="script" location="component://common/minilang/GroovyServiceTest.groovy" invoke=""> <description>Test Script Engine With Groovy Script</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testScriptEngineGroovyMethod" engine="script" location="component://common/script/org/ofbiz/common/GroovyServiceTest.groovy" invoke="testMethod"> + <service name="testScriptEngineGroovyMethod" engine="script" location="component://common/minilang/GroovyServiceTest.groovy" invoke="testMethod"> <description>Test Script Engine With Groovy Script Method Invocation</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testScriptEngineJavaScript" engine="script" location="component://common/script/org/ofbiz/common/JavaScriptTest.js" invoke=""> + <service name="testScriptEngineJavaScript" engine="script" location="component://common/minilang/JavaScriptTest.js" invoke=""> <description>Test Script Engine With JavaScript</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="exampleId" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> </service> - <service name="testScriptEngineJavaScriptFunction" engine="script" location="component://common/script/org/ofbiz/common/JavaScriptTest.js" invoke="testFunction"> + <service name="testScriptEngineJavaScriptFunction" engine="script" location="component://common/minilang/JavaScriptTest.js" invoke="testFunction"> <description>Test Script Engine With JavaScript Function Invocation</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT"/> @@ -230,7 +230,7 @@ under the License. </service> <service name="testJavaScript" engine="javascript" auth="false" - location="component://common/script/org/ofbiz/common/JavaScriptTest.js" invoke=""> + location="component://common/minilang/JavaScriptTest.js" invoke=""> <description>Test JavaScript Service</description> <attribute name="message" type="String" mode="IN" optional="true"/> <attribute name="result" type="String" mode="OUT" optional="true"/> Modified: ofbiz/trunk/framework/common/testdef/UserLoginTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/testdef/UserLoginTests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/testdef/UserLoginTests.xml (original) +++ ofbiz/trunk/framework/common/testdef/UserLoginTests.xml Fri Jun 10 14:04:30 2016 @@ -23,7 +23,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"> <test-case case-name="userlogin-tests"> - <simple-method-test location="component://common/script/org/ofbiz/common/test/UserLoginTests.xml"/> + <simple-method-test location="component://common/minilang/test/UserLoginTests.xml"/> </test-case> </test-suite> \ No newline at end of file Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Fri Jun 10 14:04:30 2016 @@ -45,7 +45,7 @@ under the License. </request-map> <request-map uri="setPortalPortletAttributes"> <security https="true" auth="true"/> - <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> + <event type="simple" invoke="setPortalPortletAttributes" path="component://common/minilang/PortalPageMethods.xml"/> <response name="success" type="view-last" value="main"/> <response name="error" type="request" value="main"/> </request-map> @@ -57,7 +57,7 @@ under the License. <!-- Portal page update requests --> <request-map uri="ManagePortalPages"> <security https="true" auth="true"/> - <event type="simple" invoke="copyIfRequiredSystemPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> + <event type="simple" invoke="copyIfRequiredSystemPage" path="component://common/minilang/PortalPageMethods.xml"/> <response name="success" type="view" value="ManagePortalPages"/> </request-map> <request-map uri="NewPortalPage"> Modified: ofbiz/trunk/framework/documents/UnitTest.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/documents/UnitTest.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/documents/UnitTest.xml (original) +++ ofbiz/trunk/framework/documents/UnitTest.xml Fri Jun 10 14:04:30 2016 @@ -103,7 +103,7 @@ Specific simple method's location and name which will be tested in a location and a name attribute respectively like this: <programlisting> <test-case case-name="auto-accounting-transaction-tests-PoReceipt"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml" name="testAcctgTransOnPoReceipts"/> + <simple-method-test location="component://accounting/minilang/test/AutoAcctgTransTests.xml" name="testAcctgTransOnPoReceipts"/> </test-case> </programlisting> </para> Modified: ofbiz/trunk/framework/entity/testdef/entitytests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/testdef/entitytests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/testdef/entitytests.xml (original) +++ ofbiz/trunk/framework/entity/testdef/entitytests.xml Fri Jun 10 14:04:30 2016 @@ -25,6 +25,6 @@ under the License. <test-case case-name="entity-crypto-tests"><junit-test-suite class-name="org.ofbiz.entity.test.EntityCryptoTestSuite"/></test-case> <test-case case-name="entity-query-tests"><junit-test-suite class-name="org.ofbiz.entity.test.EntityQueryTestSuite"/></test-case> <test-case case-name="entity-util-properties-tests"> - <simple-method-test location="component://entity/script/org/ofbiz/entity/test/EntityUtilPropertiesTests.xml"/> + <simple-method-test location="component://entity/minilang/EntityUtilPropertiesTests.xml"/> </test-case> </test-suite> Modified: ofbiz/trunk/framework/entityext/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/servicedef/services.xml (original) +++ ofbiz/trunk/framework/entityext/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -168,55 +168,55 @@ under the License. <!-- EntitySync Services --> <service name="createEntitySync" default-entity-name="EntitySync" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="createEntitySync" auth="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="createEntitySync" auth="true"> <description>Create EntitySync</description> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateEntitySync" default-entity-name="EntitySync" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="updateEntitySync" auth="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="updateEntitySync" auth="true"> <description>Update EntitySync</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="createEntitySyncInclude" default-entity-name="EntitySyncInclude" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="createEntitySyncInclude" auth="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="createEntitySyncInclude" auth="true"> <description>Create EntitySyncInclude</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="applEnumId" optional="false"/> </service> <service name="updateEntitySyncInclude" default-entity-name="EntitySyncInclude" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="updateEntitySyncInclude" auth="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="updateEntitySyncInclude" auth="true"> <description>Update EntitySyncInclude</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteEntitySyncInclude" default-entity-name="EntitySyncInclude" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="deleteEntitySyncInclude" auth="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="deleteEntitySyncInclude" auth="true"> <description>Delete EntitySyncInclude</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="updateEntitySyncRunning" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="updateEntitySync" auth="true" require-new-transaction="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="updateEntitySync" auth="true" require-new-transaction="true"> <description>Update EntitySync while Running</description> <implements service="updateEntitySync"/> </service> <service name="createEntitySyncHistory" default-entity-name="EntitySyncHistory" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="createEntitySyncHistory" auth="true" require-new-transaction="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="createEntitySyncHistory" auth="true" require-new-transaction="true"> <description>Create EntitySyncHistory</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="startDate" mode="OUT"/> </service> <service name="updateEntitySyncHistory" default-entity-name="EntitySyncHistory" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="updateEntitySyncHistory" auth="true" require-new-transaction="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="updateEntitySyncHistory" auth="true" require-new-transaction="true"> <description>Update EntitySyncHistory</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteEntitySyncHistory" default-entity-name="EntitySyncHistory" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="deleteEntitySyncHistory" auth="true" require-new-transaction="true"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="deleteEntitySyncHistory" auth="true" require-new-transaction="true"> <description>Delete EntitySyncHistory</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -230,7 +230,7 @@ under the License. <description>Clean EntitySyncRemove Info - Generally should be run asynchronously after each sync run, or periodically run on a schedule</description> </service> <service name="resetEntitySyncStatusToNotStarted" engine="simple" - location="component://entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml" invoke="resetEntitySyncStatusToNotStarted" auth="true" transaction-timeout="600"> + location="component://entityext/minilang/EntitySyncServices.xml" invoke="resetEntitySyncStatusToNotStarted" auth="true" transaction-timeout="600"> <description>Generally run manually to reset the status of an EntitySync when it has "crashed". Update a EntitySync, set the Status to ESR_NOT_STARTED, but ONLY if running (ie in ESR_RUNNING)</description> <attribute name="entitySyncId" type="String" mode="IN" optional="false"/> </service> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java Fri Jun 10 14:04:30 2016 @@ -2846,6 +2846,7 @@ public final class MacroFormRenderer imp Iterator<Map.Entry<String, Object>> iter = paramMap.entrySet().iterator(); while (iter.hasNext()) { Map.Entry<String, Object> entry = iter.next(); + if (entry.getKey().contains("externalLoginKey")) continue; sb.append(entry.getKey()).append("=").append(entry.getValue()); if (iter.hasNext()) { sb.append("&"); Copied: ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml (from r1747658, ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml?p2=ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml&p1=ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml&r1=1747658&r2=1747712&rev=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml Fri Jun 10 14:04:30 2016 @@ -64,7 +64,7 @@ <!-- ==============Permission Checking Service============= --> <simple-method method-name="assetMaintPermissionCheck" short-description="Asset Maintenance permission logic"> <set field="primaryPermission" value="ASSETMAINT"/> - <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> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -30,13 +30,13 @@ under the License. </service> <service name="assetMaintPermissionCheck" engine="simple" - location="component://assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml" invoke="assetMaintPermissionCheck"> + location="component://assetmaint/minilang/FixedAssetMaintServices.xml" invoke="assetMaintPermissionCheck"> <description>Asset Maintentance Permission Checking Logic</description> <implements service="permissionInterface"/> </service> <service name="createFixedAssetMaintUpdateWorkEffort" engine="simple" default-entity-name="FixedAssetMaint" - location="component://assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml" invoke="createFixedAssetMaintUpdateWorkEffort"> + location="component://assetmaint/minilang/FixedAssetMaintServices.xml" invoke="createFixedAssetMaintUpdateWorkEffort"> <description>Create FixedAssetMaint and Update Schedule information in WorkEffort</description> <auto-attributes include="all" mode="IN" optional="true"/> <auto-attributes include="all" mode="IN" entity-name="WorkEffort" optional="true"/> @@ -44,7 +44,7 @@ under the License. <override name="maintHistSeqId" mode="OUT" optional="false"/> </service> <service name="updateFixedAssetMaintAndWorkEffort" engine="simple" default-entity-name="FixedAssetMaint" - location="component://assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml" invoke="updateFixedAssetMaintAndWorkEffort"> + location="component://assetmaint/minilang/FixedAssetMaintServices.xml" invoke="updateFixedAssetMaintAndWorkEffort"> <description>Update FixedAssetMaint and Schedule information in WorkEffort</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -52,7 +52,7 @@ under the License. </service> <service name="createWorkEffortAndAssocWithParent" engine="simple" default-entity-name="WorkEffort" - location="component://assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintServices.xml" invoke="createWorkEffortAndAssocWithParent"> + location="component://assetmaint/minilang/FixedAssetMaintServices.xml" invoke="createWorkEffortAndAssocWithParent"> <description>Create WorkEffort and Associate it with Parent (identified by workEffortFromId)</description> <implements service="createWorkEffortAndAssoc"/> </service> Modified: ofbiz/trunk/specialpurpose/assetmaint/testdef/assetmainttests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/testdef/assetmainttests.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/testdef/assetmainttests.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/testdef/assetmainttests.xml Fri Jun 10 14:04:30 2016 @@ -23,7 +23,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"> <test-case case-name="assetmaint-tests"> - <simple-method-test location="component://assetmaint/script/org/ofbiz/assetmaint/test/FixedAssetMaintTests.xml"/> + <simple-method-test location="component://assetmaint/minilang/test/FixedAssetMaintTests.xml"/> </test-case> </test-suite> Modified: ofbiz/trunk/specialpurpose/bi/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/bi/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -36,7 +36,7 @@ under the License. <attribute name="dimensionId" type="String" mode="OUT" optional="true"/> </service> <service name="quickInitDataWarehouse" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="quickInitDataWarehouse"> + location="component://bi/minilang/DimensionServices.xml" invoke="quickInitDataWarehouse"> <description>Quickly initialize the dimensions (Currency, Date, Product) and facts (SalesInvoiceItem): useful to quickly initialize the datawarehouse.</description> <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> <attribute name="thruDate" type="Timestamp" mode="IN" optional="false"/> @@ -50,43 +50,43 @@ under the License. <attribute name="thruDate" type="Timestamp" mode="IN" optional="false"/> </service> <service name="loadCurrencyDimension" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="loadCurrencyDimension"> + location="component://bi/minilang/DimensionServices.xml" invoke="loadCurrencyDimension"> <description>Loads data in the CurrencyDimension entity (olap entity) using the update strategy of 'type 1': overwrite the values of the attributes</description> </service> <!-- Product Dimension --> <service name="prepareProductDimensionData" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="prepareProductDimensionData"> + location="component://bi/minilang/DimensionServices.xml" invoke="prepareProductDimensionData"> <description>Pulls information from the Product* entities (oltp entities) and prepares data for the ProductDimension entity (olap entity)</description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="productDimension" type="GenericEntity" mode="OUT" optional="false"/> </service> <service name="loadProductInProductDimension" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="loadProductInProductDimension"> + location="component://bi/minilang/DimensionServices.xml" invoke="loadProductInProductDimension"> <description>Pulls information from the Product* entities and stores them in the ProductDimension entity (olap entity)</description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="updateMode" type="String" mode="IN" optional="false"/> <!-- TYPE1, TYPE2, TYPE3 --> </service> <service name="loadType1ProductInProductDimension" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="loadProductInProductDimension"> + location="component://bi/minilang/DimensionServices.xml" invoke="loadProductInProductDimension"> <description>Same as loadProductInProductDimension; the update strategy is 'type 1': overwrite the values of the attributes</description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="updateMode" type="String" mode="IN" optional="true" default-value="TYPE1"/> </service> <service name="loadType2ProductInProductDimension" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="loadProductInProductDimension"> + location="component://bi/minilang/DimensionServices.xml" invoke="loadProductInProductDimension"> <description>Same as loadProductInProductDimension; the update strategy is 'type 2': add a dimension row</description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="updateMode" type="String" mode="IN" optional="true" default-value="TYPE2"/> </service> <service name="loadAllProductsInProductDimension" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/DimensionServices.xml" invoke="loadAllProductsInProductDimension"> + location="component://bi/minilang/DimensionServices.xml" invoke="loadAllProductsInProductDimension"> <description>Calls the loadProductInProductDimension service for all the products.</description> <attribute name="updateMode" type="String" mode="IN" optional="true" default-value="TYPE1"/> </service> <!-- Accounting Facts --> <service name="loadSalesInvoiceItemFact" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="loadSalesInvoiceItemFact"> + location="component://bi/minilang/FactServices.xml" invoke="loadSalesInvoiceItemFact"> <description> Pulls information from the Invoice* entities and stores them in the SalesInvoiceItem entity (olap entity). One of invoiceId/invoiceItemSeqId or invoice/invoiceItem must be passed or an error is returned. @@ -97,14 +97,14 @@ under the License. <attribute name="invoiceItem" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> </service> <service name="loadSalesInvoiceFact" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="loadSalesInvoiceFact"> + location="component://bi/minilang/FactServices.xml" invoke="loadSalesInvoiceFact"> <description>Calls the loadSalesInvoiceItemFact service for all the invoice items.</description> <attribute name="invoiceId" type="String" mode="IN" optional="false"/> </service> <!-- Order Facts --> <service name="loadSalesOrderItemFact" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="loadSalesOrderItemFact"> + location="component://bi/minilang/FactServices.xml" invoke="loadSalesOrderItemFact"> <description> Pulls information from the OrderItem* entities and stores them in the SalesOrderItem entity (olap entity). One of orderId/orderItemSeqId or order/orderItem must be passed or an error is returned. @@ -116,22 +116,22 @@ under the License. <attribute name="orderAdjustment " type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> </service> <service name="loadSalesOrderFact" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="loadSalesOrderFact"> + location="component://bi/minilang/FactServices.xml" invoke="loadSalesOrderFact"> <description>Calls the loadSalesOrderItemFact service for all the order items.</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> </service> <service name="loadSalesOrderDataDaily" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="loadSalesOrderDataDaily" transaction-timeout="10000000"> + location="component://bi/minilang/FactServices.xml" invoke="loadSalesOrderDataDaily" transaction-timeout="10000000"> <description>Load Sales Order Data Daily.</description> </service> <service name="importSalesOrderData" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="importSalesOrderData" transaction-timeout="10000000"> + location="component://bi/minilang/FactServices.xml" invoke="importSalesOrderData" transaction-timeout="10000000"> <description>Import Sales Order Data.</description> <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> <attribute name="thruDate" type="Timestamp" mode="IN" optional="false"/> </service> <service name="convertUomCurrency" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="convertUomCurrency"> + location="component://bi/minilang/FactServices.xml" invoke="convertUomCurrency"> <description>Import Sales Order Data.</description> <attribute name="uomId" type="String" mode="IN"/> <attribute name="uomIdTo" type="String" mode="IN"/> @@ -141,7 +141,7 @@ under the License. <!-- Inventory Facts --> <service name="loadInventoryFact" auth="true" engine="simple" - location="component://bi/script/org/ofbiz/bi/FactServices.xml" invoke="loadInventoryFact"> + location="component://bi/minilang/FactServices.xml" invoke="loadInventoryFact"> <attribute name="inventoryItemId" type="String" mode="IN" optional="true"/> </service> Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign Fri Jun 10 14:04:30 2016 @@ -550,7 +550,7 @@ try methodContext.putEnv("productStoreId", productStoreId); methodContext.putEnv("DateMonth", DateMonth); methodContext.putEnv("DateYear", DateYear); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/NetBeforeOverheadEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/NetBeforeOverheadEvent.xml", "getOrder", methodContext); starschemas = methodContext.getEnv("starschemas"); } catch (e) @@ -1172,7 +1172,7 @@ try methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); methodContext.putEnv("productStoreId", productStoreId); methodContext.putEnv("DateDay", DateDay); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/NetBeforeOverheadDateEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/NetBeforeOverheadDateEvent.xml", "getOrder", methodContext); Date_starschemas = methodContext.getEnv("Date_starschemas"); } catch (e) @@ -1566,7 +1566,7 @@ try methodContext.putEnv("productStoreId", productStoreId); methodContext.putEnv("DateMonth", DateMonth); methodContext.putEnv("DateYear", DateYear); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml", "getOrder", methodContext); starschemas = methodContext.getEnv("starschemas"); } catch (e) Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign Fri Jun 10 14:04:30 2016 @@ -245,7 +245,7 @@ try methodContext.putEnv("productStoreId", productStoreId); methodContext.putEnv("Week", Week); methodContext.putEnv("Year", Year); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/ProductDemandReportEvent.xml", "getOrder", methodContext); starschemas = methodContext.getEnv("starschemas"); } catch (e) Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign Fri Jun 10 14:04:30 2016 @@ -464,7 +464,7 @@ try methodContext.putEnv("thruWeek", thruWeek); methodContext.putEnv("thruMonth", thruMonth); methodContext.putEnv("thisYear", thisYear); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/SalesReportEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/SalesReportEvent.xml", "getOrder", methodContext); starschemas = methodContext.getEnv("starschemas"); } catch (e) Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign Fri Jun 10 14:04:30 2016 @@ -422,7 +422,7 @@ try methodContext.putEnv("thruWeek", thruWeek); methodContext.putEnv("thruMonth", thruMonth); methodContext.putEnv("thisYear", thisYear); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/SalesReportEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/SalesReportEvent.xml", "getOrder", methodContext); starschemas = methodContext.getEnv("starschemas"); } catch (e) Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign Fri Jun 10 14:04:30 2016 @@ -436,7 +436,7 @@ try methodContext.putEnv("thruWeek", thruWeek); methodContext.putEnv("thruMonth", thruMonth); methodContext.putEnv("thisYear", thisYear); - SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/SalesReportEvent.xml", "getOrder", methodContext); + SimpleMethod.runSimpleMethod("component://order/minilang/reports/SalesReportEvent.xml", "getOrder", methodContext); starschemas = methodContext.getEnv("starschemas"); } catch (e) Modified: ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -25,7 +25,7 @@ under the License. <version>1.0</version> <service name="createEbayAccount" engine="simple" - location="component://ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml" invoke="createEbayAccount" auth="true"> + location="component://ebaystore/minilang/EbayServices.xml" invoke="createEbayAccount" auth="true"> <attribute name="salutation" mode="IN" type="String" optional="true"/> <attribute name="firstName" mode="IN" type="String" optional="false"/> <attribute name="middleName" mode="IN" type="String" optional="true"/> @@ -175,7 +175,7 @@ under the License. </service> <!-- ebay inventory --> <service name="reserveEbayProductInventory" engine="simple" - location="component://ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml" invoke="reserveEbayProductInventory"> + location="component://ebaystore/minilang/EbayServices.xml" invoke="reserveEbayProductInventory"> <description>Reserve Inventory in a Product Store</description> <attribute name="productStoreId" type="String" mode="IN" optional="false"></attribute> <attribute name="productId" type="String" mode="IN" optional="false"></attribute> @@ -184,7 +184,7 @@ under the License. <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"></attribute> </service> <service name="reserveEbayProductInventoryByStoreFacility" engine="simple" - location="component://product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml" invoke="reserveProductInventory" auth="true"> + location="component://product/minilang/product/inventory/InventoryReserveServices.xml" invoke="reserveProductInventory" auth="true"> <description>Reserve product for ebay Inventory and make reserve for a Product By Facility If requireInventory is Y the quantity not reserved is returned, if N then a negative availableToPromise will be used to track quantity ordered beyond what is in stock. @@ -230,7 +230,7 @@ under the License. <attribute name="facilityId" type="String" mode="IN" optional="false"></attribute> </service> <service name="updateEbayProductQtyReserved" default-entity-name="EbayProductStoreInventory" engine="simple" - location="component://ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml" invoke="updateEbayProductQtyReserved" auth="true"> + location="component://ebaystore/minilang/EbayServices.xml" invoke="updateEbayProductQtyReserved" auth="true"> <description>Update/cancel an Product quantity that reserved from inventory</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"></attribute> Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016 @@ -164,7 +164,7 @@ </request-map> <request-map uri="autoSendFeedbackReminder"> <security auth="true" https="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="autoSendFeedbackReminder"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="autoSendFeedbackReminder"/> <response name="success" type="view" value="AutomationPreferences"/> <response name="error" type="view" value="AutomationPreferences"/> </request-map> @@ -174,49 +174,49 @@ </request-map> <request-map uri="createEmailTemplate"> <security https="true" auth="true"/> - <event type="simple" invoke="createEmailTemplate" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml"/> + <event type="simple" invoke="createEmailTemplate" path="component://ebaystore/minilang/EbayStoreEvents.xml"/> <response name="success" type="view" value="AutomationPreferences"/> <response name="error" type="view" value="editEmailTemplate"/> </request-map> <request-map uri="updateEmailTemplate"> <security https="true" auth="true"/> - <event type="simple" invoke="updateEmailTemplate" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml"/> + <event type="simple" invoke="updateEmailTemplate" path="component://ebaystore/minilang/EbayStoreEvents.xml"/> <response name="success" type="view" value="AutomationPreferences"/> <response name="error" type="view" value="editEmailTemplate"/> </request-map> <request-map uri="updateEmailTemplate"> <security https="true" auth="true"/> - <event type="simple" invoke="updateEmailTemplate" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml"/> + <event type="simple" invoke="updateEmailTemplate" path="component://ebaystore/minilang/EbayStoreEvents.xml"/> <response name="success" type="view" value="AutomationPreferences"/> <response name="error" type="view" value="editEmailTemplate"/> </request-map> <request-map uri="autoSendPaymentReceivedEmail"> <security auth="true" https="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="autoSendPaymentReceivedEmail"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="autoSendPaymentReceivedEmail"/> <response name="success" type="view" value="AutomationPreferences"/> <response name="error" type="view" value="AutomationPreferences"/> </request-map> <request-map uri="settingCombineOrders"> <security https="true" auth="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="settingCombineOrders"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="settingCombineOrders"/> <response name="success" type="request-redirect" value="automationPreferences"/> <response name="error" type="view" value="AutomationPreferences"/> </request-map> <request-map uri="settingWinningBuyerNotification"> <security https="true" auth="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="settingWinningBuyerNotification"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="settingWinningBuyerNotification"/> <response name="success" type="request-redirect" value="automationPreferences"/> <response name="error" type="view" value="AutomationPreferences"/> </request-map> <request-map uri="settingSendItemDispatchedNotification"> <security https="true" auth="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="settingSendItemDispatchedNotification"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="settingSendItemDispatchedNotification"/> <response name="success" type="request-redirect" value="automationPreferences"/> <response name="error" type="view" value="AutomationPreferences"/> </request-map> <request-map uri="runBlockItemOutOfStock"> <security https="true" auth="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="settingAutoBlockItemOutOfStock"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="settingAutoBlockItemOutOfStock"/> <response name="success" type="request-redirect" value="automationPreferences"/> <response name="error" type="view" value="AutomationPreferences"/> </request-map> @@ -377,7 +377,7 @@ </request-map> <request-map uri="doAction"> <security auth="true" https="true"/> - <event type="simple" path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml" invoke="checkEbayAction"/> + <event type="simple" path="component://ebaystore/minilang/EbayStoreEvents.xml" invoke="checkEbayAction"/> <response name="makeSecondChanceOffer" type="request" value="makeSecondChanceOffer"/> <response name="openUnpaid" type="request" value="openUnpaid"/> </request-map> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml?rev=1747712&r1=1747658&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml Fri Jun 10 14:04:30 2016 @@ -908,7 +908,7 @@ under the License. </if-compare> </if-empty> <if-empty field="userLogin"> - <call-map-processor xml-resource="component://securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml" + <call-map-processor xml-resource="component://securityext/minilang/login/LoginMapProcs.xml" processor-name="userLogin" in-map-name="parameters" out-map-name="userLoginMap"/> <if-not-empty field="userLoginMap.userLoginId"> <entity-one entity-name="UserLogin" value-field="existingUserLogin"> @@ -959,7 +959,7 @@ under the License. </or> </condition> <then> - <call-map-processor xml-resource="component://securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml" + <call-map-processor xml-resource="component://securityext/minilang/login/LoginMapProcs.xml" processor-name="updatePassword" in-map-name="parameters" out-map-name="passwordMap"/> <check-errors/> <set-service-fields service-name="updatePassword" map="passwordMap" to-map="passwordCtx"/> @@ -1111,13 +1111,13 @@ under the License. <simple-method method-name="createCustomerProfile" short-description="create a customer profile" login-required="false"> <!-- Process all map --> - <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="person" in-map-name="parameters" out-map-name="personCtx"/> - <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"/> - <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"/> - <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="shipToTelecomNumberCtx"/> <check-errors/> @@ -1171,7 +1171,7 @@ under the License. <!-- Create billing address --> <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"/> <set field="billToAddressCtx.partyId" from-field="parameters.partyId"/> <set field="billToAddressCtx.userLogin" from-field="parameters.userLogin"/> @@ -1186,7 +1186,7 @@ under the License. </else> </if-compare> <!-- create billing telecom number --> - <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="billToTelecomNumberCtx"/> <set field="billToTelecomNumberCtx.partyId" from-field="parameters.partyId"/> <set field="billToTelecomNumberCtx.userLogin" from-field="parameters.userLogin"/> @@ -1230,7 +1230,7 @@ under the License. <call-simple-method method-name="createUpdateUserLogin"/> - <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="emailAddressContext"/> <check-errors/> <set-service-fields service-name="createUpdatePartyEmailAddress" map="emailAddressContext" to-map="createUpdatePartyEmailCtx"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml?rev=1747712&r1=1747658&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml Fri Jun 10 14:04:30 2016 @@ -23,9 +23,9 @@ under the License. <simple-method method-name="createAffiliate" short-description="Create Affiliate" login-required="false"> <!-- Create the UserLogin Record --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilParty" in-map-name="parameters" out-map-name="ul_context"/> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilUser" in-map-name="parameters" out-map-name="ul_context"/> <check-errors/> <call-service service-name="createUserLogin" in-map-name="ul_context"/> @@ -37,21 +37,21 @@ under the License. <set-current-user-login value-field="newUserLogin"/> <!-- Create the Party/PartyGroup --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilParty" in-map-name="parameters" out-map-name="pg_context"/> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilGroup" in-map-name="parameters" out-map-name="pg_context"/> <check-errors/> <call-service service-name="createPartyGroup" in-map-name="pg_context"/> <!-- Create the Contact Person --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilContact" in-map-name="parameters" out-map-name="ct_context"/> <check-errors/> <call-service service-name="createPerson" in-map-name="ct_context"/> <!-- Create the Postal Address --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilPostal" in-map-name="parameters" out-map-name="pa_context"/> <check-errors/> <call-service service-name="createPostalAddress" in-map-name="pa_context"> @@ -59,13 +59,13 @@ under the License. </call-service> <!-- Create the Postal Address Purpose --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilPostalPurpose" in-map-name="parameters" out-map-name="pr_context"/> <check-errors/> <call-service service-name="createPartyContactMechPurpose" in-map-name="pr_context"/> <!-- Create the Phone ContactMech --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilPhone" in-map-name="parameters" out-map-name="ph_context"/> <check-errors/> <call-service service-name="createTelecomNumber" in-map-name="ph_context"> @@ -73,13 +73,13 @@ under the License. </call-service> <!-- Create the Phone ContactMech Purpose --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilPhonePurpose" in-map-name="parameters" out-map-name="phr_context"/> <check-errors/> <call-service service-name="createPartyContactMechPurpose" in-map-name="phr_context"/> <!-- Create the Fax ContactMech --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilFax" in-map-name="parameters" out-map-name="fax_context"/> <check-errors/> @@ -90,7 +90,7 @@ under the License. </if-not-empty> <!-- Create the Fax ContactMech Purpose --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilFaxPurpose" in-map-name="parameters" out-map-name="faxp_context"/> <check-errors/> <if-not-empty field="faxp_context.contactNumber"> @@ -98,7 +98,7 @@ under the License. </if-not-empty> <!-- Create the Email ContactMech --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilEmail" in-map-name="parameters" out-map-name="em_context"/> <check-errors/> <call-service service-name="createEmailAddress" in-map-name="em_context"> @@ -106,21 +106,21 @@ under the License. </call-service> <!-- Create the Email ContactMech Purpose --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilPhonePurpose" in-map-name="parameters" out-map-name="emp_context"/> <check-errors/> <call-service service-name="createPartyContactMechPurpose" in-map-name="emp_context"/> <!-- Create the URL ContactMech --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilURL" in-map-name="parameters" out-map-name="url_context"/> <check-errors/> <call-service service-name="createContactMech" in-map-name="url_context"/> <!-- Create the Affiliate Record --> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffilParty" in-map-name="parameters" out-map-name="af_context"/> - <call-map-processor xml-resource="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" + <call-map-processor xml-resource="component://ecommerce/minilang/misc/AffiliateMapProcs.xml" processor-name="newAffil" in-map-name="parameters" out-map-name="af_context"/> <check-errors/> <call-service service-name="createAffiliate" in-map-name="af_context"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |