svn commit: r1747712 [4/16] - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1747712 [4/16] - in /ofbiz/trunk: applications/accounting/minila
 
|
Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services.xml Fri Jun 10 14:04:30 2016 @@ -33,7 +33,7 @@ <!-- Content services? --> <service name="getPublicForumMessage" engine="simple" default-entity-name="Content" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getPublicForumMessage"> + location="component://content/minilang/content/ContentServices.xml" invoke="getPublicForumMessage"> <description>Get Content and resource information</description> <permission-service service-name="genericContentPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -41,7 +41,7 @@ </service> <service name="getSubContentWithPermCheck" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getSubContentWithPermCheck"> + location="component://content/minilang/content/ContentServices.xml" invoke="getSubContentWithPermCheck"> <description>Get Content and resource information</description> <permission-service service-name="genericContentPermission" main-action="VIEW"/> <attribute mode="IN" name="contentId" optional="false" type="String"/> @@ -55,7 +55,7 @@ </service> <service name="getSubSubContentWithPermCheck" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getSubSubContentWithPermCheck"> + location="component://content/minilang/content/ContentServices.xml" invoke="getSubSubContentWithPermCheck"> <description>Get Content associated with Content</description> <implements service="getSubContentWithPermCheck"/> <attribute mode="IN" name="subContentAssocTypeId" optional="true" type="String"/> @@ -64,7 +64,7 @@ </service> <service name="getContentAndDataResource" engine="simple" default-entity-name="Content" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getContentAndDataResource"> + location="component://content/minilang/content/ContentServices.xml" invoke="getContentAndDataResource"> <description>Get Content and resource information</description> <permission-service service-name="genericContentPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -72,7 +72,7 @@ </service> <service name="getDataResource" engine="simple" default-entity-name="DataResource" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getDataResource"> + location="component://content/minilang/content/ContentServices.xml" invoke="getDataResource"> <description>Get Content and resource information</description> <permission-service service-name="genericContentPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -81,21 +81,21 @@ <!-- DataCategory services --> <service name="createDataCategory" engine="simple" default-entity-name="DataCategory" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataCategory"> + location="component://content/minilang/data/DataServices.xml" invoke="createDataCategory"> <description>Create a DataCategory</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateDataCategory" engine="simple" default-entity-name="DataCategory" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateDataCategory"> + location="component://content/minilang/data/DataServices.xml" invoke="updateDataCategory"> <description>Update a DataCategory</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeDataCategory" engine="simple" default-entity-name="DataCategory" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataCategory"> + location="component://content/minilang/data/DataServices.xml" invoke="removeDataCategory"> <description>Remove DataCategory</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -122,35 +122,35 @@ <!-- DataResourceRole services --> <service name="createDataResourceRole" engine="simple" default-entity-name="DataResourceRole" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceRole"> + location="component://content/minilang/data/DataServices.xml" invoke="createDataResourceRole"> <description>Create a DataResourceRole</description> <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateDataResourceRole" engine="simple" default-entity-name="DataResourceRole" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateDataResourceRole"> + location="component://content/minilang/data/DataServices.xml" invoke="updateDataResourceRole"> <description>Update a DataResourceRole</description> <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeDataResourceRole" engine="simple" default-entity-name="DataResourceRole" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceRole"> + location="component://content/minilang/data/DataServices.xml" invoke="removeDataResourceRole"> <description>Remove DataResourceRole</description> <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- Generic Content Services --> - <service name="createEmailContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createEmailContent"> + <service name="createEmailContent" engine="simple" location="component://content/minilang/content/ContentServices.xml" invoke="createEmailContent"> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="subject" type="String" mode="IN" optional="false"/> <attribute name="plainBody" type="String" mode="IN" optional="false"/> <attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/> <override name="contentId" mode="INOUT"/> </service> - <service name="updateEmailContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateEmailContent"> + <service name="updateEmailContent" engine="simple" location="component://content/minilang/content/ContentServices.xml" invoke="updateEmailContent"> <attribute name="subjectDataResourceId" type="String" mode="IN" optional="true"/> <attribute name="subject" type="String" mode="IN" optional="true"/> <attribute name="plainBodyDataResourceId" type="String" mode="IN" optional="true"/> @@ -159,29 +159,29 @@ <attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/> </service> - <service name="createDownloadContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createDownloadContent"> + <service name="createDownloadContent" engine="simple" location="component://content/minilang/content/ContentServices.xml" invoke="createDownloadContent"> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="file" type="String" mode="IN" optional="false"/> <override name="contentId" mode="INOUT"/> </service> - <service name="updateDownloadContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateDownloadContent"> + <service name="updateDownloadContent" engine="simple" location="component://content/minilang/content/ContentServices.xml" invoke="updateDownloadContent"> <attribute name="fileDataResourceId" type="String" mode="IN" optional="true"/> <attribute name="file" type="String" mode="IN" optional="true"/> </service> - <service name="createSimpleTextContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createSimpleTextContent"> + <service name="createSimpleTextContent" engine="simple" location="component://content/minilang/content/ContentServices.xml" invoke="createSimpleTextContent"> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="text" type="String" mode="IN" optional="false" allow-html="any"/> <override name="contentId" mode="INOUT"/> </service> - <service name="updateSimpleTextContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateSimpleTextContent"> + <service name="updateSimpleTextContent" engine="simple" location="component://content/minilang/content/ContentServices.xml" invoke="updateSimpleTextContent"> <attribute name="textDataResourceId" type="String" mode="IN" optional="true"/> <attribute name="text" type="String" mode="IN" optional="true" allow-html="any"/> </service> <!-- Util --> <service name="findAssocContent" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="findAssocContent" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="findAssocContent" auth="true"> <attribute name="contentId" type="String" mode="IN" optional="false"/> <attribute name="mapKeys" type="List" mode="IN" optional="false"/> <attribute name="contentAssocs" type="List" mode="OUT" optional="true"/> @@ -191,7 +191,7 @@ <!-- simply use createContent and the accoc will be created too" --> <!--service name="createContentAndAssoc" default-entity-name="Content" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAndAssoc" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="createContentAndAssoc" auth="true"> <description>Create a Content with a ContentAssoc</description> <auto-attributes entity-name="Content" include="all" mode="IN" optional="true"> <exclude field-name="contentId"/> @@ -367,7 +367,7 @@ <service name="persistCompDocContent" engine="simple" transaction-timeout="7200" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" invoke="persistCompDocContent" auth="true"> + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="persistCompDocContent" auth="true"> <description>Persist a CompDoc DataResource and data</description> <implements service="persistDataResourceAndData"/> <attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/> @@ -376,7 +376,7 @@ <service name="persistCompDocPdf2Survey" engine="simple" transaction-timeout="7200" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" invoke="persistCompDocPdf2Survey" auth="true"> + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="persistCompDocPdf2Survey" auth="true"> <description>Upload/save PDF, create Survey, populate Content</description> <implements service="persistCompDocContent"/> <attribute name="pdfName" type="String" mode="IN" optional="true"/> @@ -421,7 +421,7 @@ </service> <service name="createArticleContent" engine="simple" transaction-timeout="300" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createArticleContent"> + location="component://content/minilang/content/ContentServices.xml" invoke="createArticleContent"> <description>Creates content records for a blog entry</description> <implements service="createContentFromUploadedFile" optional="true"/> <implements service="createTextContent" optional="true"/> @@ -470,7 +470,7 @@ </service> <service name="createTopic" auth="true" engine="simple" invoke="createTopic" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" > + location="component://content/minilang/content/ContentServices.xml" > <description>Create a TOPIC type Content </description> <attribute mode="IN" name="newTopicId" optional="false" type="String"/> <attribute mode="IN" name="newTopicDescription" optional="true" type="String"/> @@ -684,7 +684,7 @@ <!-- ================ CompDoc Requests ================= --> <service name="persistContentRevisionAndItem" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="persistContentRevisionAndItem" auth="true"> <description>Update a ContentRevision and ContentRevisionItem</description> <auto-attributes entity-name="ContentRevision" include="all" mode="IN" optional="true"> @@ -697,7 +697,7 @@ </service> <service name="prepForApproval" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="prepForApproval" auth="true"> <description>Set ContentApprovals for approval process</description> <attribute name="rootContentId" type="String" mode="IN" optional="false"/> @@ -705,7 +705,7 @@ </service> <service name="getFinalApprovalStatus" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="getFinalApprovalStatus" auth="true"> <description>Set ContentApprovals for approval process</description> <attribute name="contentId" type="String" mode="IN" optional="false"/> @@ -715,7 +715,7 @@ </service> <service name="getApprovalsWithPermissions" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="getApprovalsWithPermissions" auth="true" > <description>Get a list of ContentApprovals and permission indicators</description> <attribute name="rootContentId" type="String" mode="IN" optional="false"/> @@ -726,7 +726,7 @@ </service> <service name="hasApprovalPermission" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="hasApprovalPermission" auth="true"> <description>Determine permission status for record</description> <attribute name="contentApprovalId" type="String" mode="IN" optional="false"/> @@ -735,7 +735,7 @@ </service> <service name="genCompDocInstance" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="genCompDocInstance" auth="true"> <description>Generate parallel CompDoc Instance tree</description> <attribute name="contentName" type="String" mode="IN" optional="true"/> @@ -746,7 +746,7 @@ </service> <service name="persistCompDoc" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="persistCompDoc" auth="true"> <description>Create a CompDoc Template entity and associated ContentRevision/Item entities</description> <implements service="persistContentAndAssoc"/> @@ -755,7 +755,7 @@ </service> <service name="cloneTemplateContentApprovals" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="cloneTemplateContentApprovals" auth="true"> <description>Bump the previous ContentApproval approvals up to current CDT</description> <attribute name="contentRevisionSeqId" type="String" mode="IN" optional="false"/> @@ -763,7 +763,7 @@ </service> <service name="cloneInstanceContentApprovals" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="cloneInstanceContentApprovals" auth="true"> <description>Bump the previous ContentApproval approvals up to current CDI</description> <attribute name="contentRevisionSeqId" type="String" mode="IN" optional="true"/> @@ -771,7 +771,7 @@ </service> <service name="checkForWaitingApprovals" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="checkForWaitingApprovals" auth="true"> <description>Check to see if there are any ContentApproval records awaiting this user's action</description> <attribute name="thisUserLogin" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> @@ -779,7 +779,7 @@ </service> <service name="getMostRecentRevision" engine="simple" - location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" + location="component://content/minilang/compdoc/CompDocServices.xml" invoke="getMostRecentRevision" auth="true"> <description>Look for most recent revision for contentId</description> <attribute name="contentId" type="String" mode="IN" optional="false"/> @@ -854,7 +854,7 @@ <!-- blog services --> <service name="createBlogEntry" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="createBlogEntry"> + location="component://content/minilang/blog/BlogServices.xml" invoke="createBlogEntry"> <description>Creates content records for a blog entry</description> <implements service="uploadFileInterface" optional="true"/> <attribute name="blogContentId" type="String" mode="INOUT" optional="false"/> @@ -867,7 +867,7 @@ <attribute name="summaryData" type="String" mode="IN" optional="true" allow-html="any"/> </service> <service name="updateBlogEntry" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="updateBlogEntry"> + location="component://content/minilang/blog/BlogServices.xml" invoke="updateBlogEntry"> <description>Updates content records for a blog entry</description> <implements service="uploadFileInterface" optional="true"/> <attribute name="blogContentId" type="String" mode="INOUT" optional="false"/> @@ -880,7 +880,7 @@ <attribute name="summaryData" type="String" mode="IN" optional="true" allow-html="any"/> </service> <service name="getBlogEntry" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="getBlogEntry"> + location="component://content/minilang/blog/BlogServices.xml" invoke="getBlogEntry"> <description>Retrieves content records for a blog entry</description> <attribute name="blogContentId" type="String" mode="INOUT" optional="false"/> <attribute name="contentId" type="String" mode="INOUT" optional="true"/><!-- also used for new entries, will return with no error with empty contentId --> @@ -894,7 +894,7 @@ <attribute name="articleContentId" type="String" mode="OUT" optional="true"/> <attribute name="summaryContentId" type="String" mode="OUT" optional="true"/> </service> - <service name="getOwnedOrPublishedBlogEntries" engine="simple" location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="getOwnedOrPublishedBlogEntries" + <service name="getOwnedOrPublishedBlogEntries" engine="simple" location="component://content/minilang/blog/BlogServices.xml" invoke="getOwnedOrPublishedBlogEntries" auth="true" transaction-timeout="7200"> <attribute type="String" mode="IN" name="contentId" optional="false"/> <attribute mode="IN" name="userLogin" optional="false" type="org.ofbiz.entity.GenericValue"/> @@ -911,7 +911,7 @@ <!-- eca helper services --> <service name="checkContentAssocIds" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="checkContentAssocIds"> + location="component://content/minilang/content/ContentServices.xml" invoke="checkContentAssocIds"> <description>Fixes the ContentAssoc IDs based on passed parameters</description> <attribute name="contentIdFrom" type="String" mode="INOUT" optional="true"/> <attribute name="contentIdTo" type="String" mode="INOUT" optional="true"/> @@ -920,15 +920,15 @@ <!-- content permission services --> <service name="contentManagerRolePermission" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/permission/ContentPermissionServices.xml" invoke="contentManagerRolePermission"> + location="component://content/minilang/permission/ContentPermissionServices.xml" invoke="contentManagerRolePermission"> <implements service="permissionInterface"/> </service> <service name="contentManagerPermission" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/permission/ContentPermissionServices.xml" invoke="contentManagerPermission"> + location="component://content/minilang/permission/ContentPermissionServices.xml" invoke="contentManagerPermission"> <implements service="permissionInterface"/> </service> <service name="genericContentPermission" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/permission/ContentPermissionServices.xml" invoke="genericContentPermission"> + location="component://content/minilang/permission/ContentPermissionServices.xml" invoke="genericContentPermission"> <description>Generic Content Permission Service; Takes mainAction to determine the mode.</description> <implements service="permissionInterface"/> <attribute name="ownerContentId" type="String" mode="IN" optional="true"/> @@ -940,14 +940,14 @@ <attribute name="contentOperationId" type="String" mode="IN" optional="true"/> </service> <service name="genericDataResourcePermission" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml" invoke="genericDataResourcePermission"> + location="component://content/minilang/permission/DataResourcePermissionServices.xml" invoke="genericDataResourcePermission"> <description>Generic DataResource Permission Service; Takes mainAction to determine the mode.</description> <implements service="permissionInterface"/> <attribute name="dataResourceId" type="String" mode="IN" optional="true"/> </service> <service name="createContentAlternativeUrl" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAlternativeUrl" auth="true" transaction-timeout="7200"> + location="component://content/minilang/content/ContentServices.xml" invoke="createContentAlternativeUrl" auth="true" transaction-timeout="7200"> <description>Create Content Alternative URL</description> <attribute name="contentId" mode="IN" type="String" optional="true"></attribute> <attribute name="contentCreated" mode="OUT" type="String" optional="true"></attribute> Modified: ofbiz/trunk/applications/content/servicedef/services_commevent.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_commevent.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_commevent.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_commevent.xml Fri Jun 10 14:04:30 2016 @@ -36,7 +36,7 @@ under the License. The fromData should be defaulted if not passed in. --> <service name="createCommContentDataResource" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createCommContentDataResource" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="createCommContentDataResource" auth="true"> <description>Create CommunicationEvent and Content</description> <implements service="persistContentAndAssoc"/> <attribute name="communicationEventId" type="String" mode="IN" optional="false"/> @@ -44,7 +44,7 @@ under the License. </service> <service name="updateCommContentDataResource" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateCommContentDataResource" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="updateCommContentDataResource" auth="true"> <description>Update CommunicationEvent and Content</description> <implements service="persistContentAndAssoc"/> <attribute name="communicationEventId" type="String" mode="IN" optional="false"/> @@ -52,7 +52,7 @@ under the License. </service> <service name="createCommEventContentAssoc" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createCommEventContentAssoc" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="createCommEventContentAssoc" auth="true"> <description>Create CommEventContentAssoc</description> <attribute name="communicationEventId" type="String" mode="IN" optional="false"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> @@ -62,7 +62,7 @@ under the License. </service> <service name="updateCommEventContentAssoc" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateCommEventContentAssoc" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="updateCommEventContentAssoc" auth="true"> <description>Update CommEventContentAssoc</description> <attribute name="communicationEventId" type="String" mode="IN" optional="false"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> @@ -72,7 +72,7 @@ under the License. </service> <service name="removeCommEventContentAssoc" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeCommEventContentAssoc" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="removeCommEventContentAssoc" auth="true"> <description>Remove CommEventContentAssoc</description> <attribute name="communicationEventId" type="String" mode="IN" optional="false"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/content/servicedef/services_content.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_content.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_content.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_content.xml Fri Jun 10 14:04:30 2016 @@ -24,7 +24,7 @@ <!-- create content services --> <service name="createContent" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContent"> + location="component://content/minilang/content/ContentServices.xml" invoke="createContent"> <description>Create a Content</description> <permission-service service-name="genericContentPermission" main-action="CREATE"/> <auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/> @@ -53,7 +53,7 @@ </service> <service name="createTextAndUploadedContent" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createTextAndUploadedContent"> + location="component://content/minilang/content/ContentServices.xml" invoke="createTextAndUploadedContent"> <description>Creates text content and optional uploaded sub-content</description> <implements service="createTextContent"/> <implements service="uploadFileInterface" optional="true"/> @@ -70,7 +70,7 @@ </service> <service name="createContentFromDataResource" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentFromDataResource"> + location="component://content/minilang/content/ContentServices.xml" invoke="createContentFromDataResource"> <description>Creates content record from data resource and allows all content fields to be set</description> <!-- uses createContent internally; additonal permission(s) not necessary --> <implements service="createContent" optional="true"/> @@ -80,7 +80,7 @@ </service> <service name="attachUploadToDataResource" engine="simple" transaction-timeout="300" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="attachUploadToDataResource"> + location="component://content/minilang/data/DataServices.xml" invoke="attachUploadToDataResource"> <description>Accepts uploaded content and attaches to an existing data resource</description> <!-- uses createContent internally; additonal permission(s) not necessary --> <implements service="uploadFileInterface"/> @@ -111,7 +111,7 @@ </service> <service name="copyContentAndElectronicTextandAssoc" default-entity-name="Content" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="copyContentAndElectronicTextandAssoc" auth="true" > + location="component://content/minilang/content/ContentServices.xml" invoke="copyContentAndElectronicTextandAssoc" auth="true" > <description>Copy a Content, e;ectronic text and assocs</description> <!-- uses createContent internally; additonal permission(s) not necessary --> <auto-attributes include="pk" mode="INOUT" optional="false"/> @@ -119,7 +119,7 @@ <!-- update content services --> <service name="updateContent" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContent"> + location="component://content/minilang/content/ContentServices.xml" invoke="updateContent"> <description>Update a Content</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <implements service="updateContentAssoc" optional="true"/> @@ -146,7 +146,7 @@ </service> <service name="removeContent" default-entity-name="Content" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContent" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="removeContent" auth="true"> <description>Remove Content</description> <permission-service service-name="genericContentPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -157,7 +157,7 @@ </service> <service name="removeContentAndRelated" default-entity-name="Content" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAndRelated" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="removeContentAndRelated" auth="true"> <description>Remove Content</description> <permission-service service-name="genericContentPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -237,7 +237,7 @@ </service> <service name="assocContent" engine="simple" default-entity-name="ContentAssoc" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="assocContent"> + location="component://content/minilang/content/ContentServices.xml" invoke="assocContent"> <description>Check for permission to perform operation on Content</description> <attribute mode="IN" name="targetOperationList" optional="true" type="List"/> <attribute mode="IN" name="contentPurposeList" optional="true" type="List"/> @@ -253,7 +253,7 @@ </service> <service name="createContentAssoc" default-entity-name="ContentAssoc" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAssoc"> + location="component://content/minilang/content/ContentServices.xml" invoke="createContentAssoc"> <description>Create a ContentAssoc</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <auto-attributes include="all" mode="IN" optional="true"/> @@ -271,7 +271,7 @@ <!-- end of deprecated fields --> </service> <service name="updateContentAssoc" default-entity-name="ContentAssoc" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentAssoc"> + location="component://content/minilang/content/ContentServices.xml" invoke="updateContentAssoc"> <description>Update a ContentAssoc</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -294,7 +294,7 @@ <!-- content status services --> <service name="setContentStatus" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="setContentStatus"> + location="component://content/minilang/content/ContentServices.xml" invoke="setContentStatus"> <description>Set the Content Status</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> @@ -317,7 +317,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deactivateAllContentRoles" engine="simple" default-entity-name="ContentRole" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deactivateAllContentRoles"> + location="component://content/minilang/content/ContentServices.xml" invoke="deactivateAllContentRoles"> <description>Deactivate all ContentRoles</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <attribute mode="IN" name="contentId" optional="false" type="String"/> @@ -332,7 +332,7 @@ <!-- Alternative URLs services --> <service name="createMissingContentAltUrls" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createMissingContentAltUrls" auth="true" use-transaction="false"> + location="component://content/minilang/content/ContentServices.xml" invoke="createMissingContentAltUrls" auth="true" use-transaction="false"> <description>Create missing Content Alternative URLs</description> <attribute name="prodCatalogId" mode="IN" type="String" optional="true"/> <attribute name="webSiteId" mode="IN" type="String" optional="true"/> @@ -392,13 +392,13 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeContentPurpose" engine="entity-auto" default-entity-name="ContentPurpose" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="delete"> + location="component://content/minilang/content/ContentServices.xml" invoke="delete"> <description>Remove ContentPurpose</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="updateSingleContentPurpose" engine="simple" default-entity-name="ContentPurpose" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateSingleContentPurpose"> + location="component://content/minilang/content/ContentServices.xml" invoke="updateSingleContentPurpose"> <description>Removes content purposes and creates a new one</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> @@ -457,25 +457,25 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteContentKeyword" engine="entity-auto" default-entity-name="ContentKeyword" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="delete" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="delete" auth="true"> <description>Delete a ContentKeyword</description> <permission-service service-name="genericContentPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="deleteContentKeywords" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deleteContentKeywords" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="deleteContentKeywords" auth="true"> <description>Delete all the keywords of a content</description> <permission-service service-name="genericContentPermission" main-action="DELETE"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> </service> <service name="indexContentKeywords" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="indexContentKeywords" auth="false"> + location="component://content/minilang/content/ContentServices.xml" invoke="indexContentKeywords" auth="false"> <description>Index the Keywords for a Content</description> <attribute name="contentId" type="String" mode="IN" optional="false"/> <attribute name="contentInstance" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> </service> <service name="forceIndexContentKeywords" engine="simple" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="forceIndexContentKeywords" auth="true"> + location="component://content/minilang/content/ContentServices.xml" invoke="forceIndexContentKeywords" auth="true"> <description>Induce all the keywords of a content, ignoring the flag in the Content.</description> <permission-service service-name="genericContentPermission" main-action="CREATE"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml Fri Jun 10 14:04:30 2016 @@ -114,21 +114,21 @@ under the License. <!-- CharacterSet services --> <service name="createCharacterSet" engine="simple" default-entity-name="CharacterSet" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createCharacterSet"> + location="component://content/minilang/data/DataServices.xml" invoke="createCharacterSet"> <description>Create a CharacterSet</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateCharacterSet" engine="simple" default-entity-name="CharacterSet" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateCharacterSet"> + location="component://content/minilang/data/DataServices.xml" invoke="updateCharacterSet"> <description>Update a CharacterSet</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeCharacterSet" engine="simple" default-entity-name="CharacterSet" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeCharacterSet"> + location="component://content/minilang/data/DataServices.xml" invoke="removeCharacterSet"> <description>Remove CharacterSet</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -136,21 +136,21 @@ under the License. <!-- DataResourceType services --> <service name="createDataResourceType" engine="simple" default-entity-name="DataResourceType" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceType"> + location="component://content/minilang/data/DataServices.xml" invoke="createDataResourceType"> <description>Create a DataResourceType</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateDataResourceType" engine="simple" default-entity-name="DataResourceType" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateDataResourceType"> + location="component://content/minilang/data/DataServices.xml" invoke="updateDataResourceType"> <description>Update a DataResourceType</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeDataResourceType" engine="simple" default-entity-name="DataResourceType" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceType"> + location="component://content/minilang/data/DataServices.xml" invoke="removeDataResourceType"> <description>Remove DataResourceType</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -158,21 +158,21 @@ under the License. <!--DataResourceTypeAttr services.--> <service name="createDataResourceTypeAttr" engine="simple" default-entity-name="DataResourceTypeAttr" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceTypeAttr"> + location="component://content/minilang/data/DataServices.xml" invoke="createDataResourceTypeAttr"> <description>Create a DataResourceTypeAttr</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateDataResourceTypeAttr" engine="simple" default-entity-name="DataResourceTypeAttr" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateDataResourceTypeAttr"> + location="component://content/minilang/data/DataServices.xml" invoke="updateDataResourceTypeAttr"> <description>Update a DataResourceTypeAttr</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeDataResourceTypeAttr" engine="simple" default-entity-name="DataResourceTypeAttr" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceTypeAttr"> + location="component://content/minilang/data/DataServices.xml" invoke="removeDataResourceTypeAttr"> <description>Remove DataResourceTypeAttr</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -180,21 +180,21 @@ under the License. <!-- FileExtension services --> <service name="createFileExtension" engine="simple" default-entity-name="FileExtension" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createFileExtension"> + location="component://content/minilang/data/DataServices.xml" invoke="createFileExtension"> <description>Create a FileExtension</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateFileExtension" engine="simple" default-entity-name="FileExtension" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateFileExtension"> + location="component://content/minilang/data/DataServices.xml" invoke="updateFileExtension"> <description>Update a FileExtension</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeFileExtension" engine="simple" default-entity-name="FileExtension" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeFileExtension"> + location="component://content/minilang/data/DataServices.xml" invoke="removeFileExtension"> <description>Remove FileExtension</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -202,21 +202,21 @@ under the License. <!-- MetaDataPredicate services --> <service name="createMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createMetaDataPredicate"> + location="component://content/minilang/data/DataServices.xml" invoke="createMetaDataPredicate"> <description>Create a MetaDataPredicate</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateMetaDataPredicate"> + location="component://content/minilang/data/DataServices.xml" invoke="updateMetaDataPredicate"> <description>Update a MetaDataPredicate</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeMetaDataPredicate"> + location="component://content/minilang/data/DataServices.xml" invoke="removeMetaDataPredicate"> <description>Remove MetaDataPredicate</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -224,38 +224,38 @@ under the License. <!-- MimeType services --> <service name="createMimeType" engine="simple" default-entity-name="MimeType" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createMimeType"> + location="component://content/minilang/data/DataServices.xml" invoke="createMimeType"> <description>Create a MimeType</description> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateMimeType" engine="simple" default-entity-name="MimeType" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateMimeType"> + location="component://content/minilang/data/DataServices.xml" invoke="updateMimeType"> <description>Update a MimeType</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeMimeType" engine="simple" default-entity-name="MimeType" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeMimeType"> + location="component://content/minilang/data/DataServices.xml" invoke="removeMimeType"> <description>Remove MimeType</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- MimeTypeHtmlTemplate services --> <service name="createMimeTypeHtmlTemplate" engine="simple" default-entity-name="MimeTypeHtmlTemplate" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createMimeTypeHtmlTemplate"> + location="component://content/minilang/data/DataServices.xml" invoke="createMimeTypeHtmlTemplate"> <description>Create a MimeTypeHtmlTemplate</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateMimeTypeHtmlTemplate" engine="simple" default-entity-name="MimeTypeHtmlTemplate" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateMimeTypeHtmlTemplate"> + location="component://content/minilang/data/DataServices.xml" invoke="updateMimeTypeHtmlTemplate"> <description>Update a MimeTypeHtmlTemplate</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeMimeTypeHtmlTemplate" engine="simple" default-entity-name="MimeTypeHtmlTemplate" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeMimeTypeHtmlTemplate"> + location="component://content/minilang/data/DataServices.xml" invoke="removeMimeTypeHtmlTemplate"> <description>Remove MimeTypeHtmlTemplate</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_data.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_data.xml Fri Jun 10 14:04:30 2016 @@ -24,7 +24,7 @@ <!-- DataResource services --> <service name="createDataResource" default-entity-name="DataResource" engine="simple" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResource" auth="true"> + location="component://content/minilang/data/DataServices.xml" invoke="createDataResource" auth="true"> <description>Create a DataResource</description> <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -41,7 +41,7 @@ <override name="dataResourceName" allow-html="any"/> </service> <service name="createDataResourceAndAssocToContent" default-entity-name="DataResource" engine="simple" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceAndAssocToContent" auth="true"> + location="component://content/minilang/data/DataServices.xml" invoke="createDataResourceAndAssocToContent" auth="true"> <description>Create a DataResource and link this data to the content present</description> <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/> <implements service="createDataResource" optional="true"/> @@ -101,7 +101,7 @@ <!-- ElectronicText services --> <service name="createElectronicText" default-entity-name="ElectronicText" engine="simple" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createElectronicText" auth="true"> + location="component://content/minilang/data/DataServices.xml" invoke="createElectronicText" auth="true"> <description>Create a ElectronicText</description> <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/> <implements service="createDataResource"/> @@ -111,7 +111,7 @@ <override name="textData" allow-html="any"/> </service> <service name="updateElectronicText" default-entity-name="ElectronicText" engine="simple" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateElectronicText" auth="true"> + location="component://content/minilang/data/DataServices.xml" invoke="updateElectronicText" auth="true"> <description>Update a ElectronicText</description> <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="INOUT" optional="false"/> @@ -120,13 +120,13 @@ <override name="textData" allow-html="any"/> </service> <service name="removeElectronicText" default-entity-name="ElectronicText" engine="simple" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeElectronicText" auth="true"> + location="component://content/minilang/data/DataServices.xml" invoke="removeElectronicText" auth="true"> <description>Remove ElectronicText</description> <permission-service service-name="genericDataResourcePermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="getElectronicText" engine="simple" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="getElectronicText" default-entity-name="ElectronicText" auth="false" > + location="component://content/minilang/data/DataServices.xml" invoke="getElectronicText" default-entity-name="ElectronicText" auth="false" > <description>Get a ElectronicText: Can pass either content value object or contentId</description> <attribute mode="IN" name="contentId" optional="true" type="String"/> <attribute mode="IN" name="content" optional="true" type="org.ofbiz.entity.GenericValue"/> Modified: ofbiz/trunk/applications/content/servicedef/services_survey.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_survey.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_survey.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_survey.xml Fri Jun 10 14:04:30 2016 @@ -44,7 +44,7 @@ under the License. <!-- TODO <service name="cloneSurvey" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="cloneSurvey"> + location="component://content/minilang/survey/SurveyServices.xml" invoke="cloneSurvey"> <description>Clone a Survey; NOTE: not yet implemented</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <attribute name="surveyId" type="String" mode="IN"/> @@ -134,7 +134,7 @@ under the License. <!-- SurveyQuestion Services --> <service name="createSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestion"> + location="component://content/minilang/survey/SurveyServices.xml" invoke="createSurveyQuestion"> <description>Create a SurveyQuestion</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> @@ -142,7 +142,7 @@ under the License. <attribute name="surveyId" type="String" mode="IN" optional="true"/> </service> <service name="updateSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestion"> + location="component://content/minilang/survey/SurveyServices.xml" invoke="updateSurveyQuestion"> <description>Update a SurveyQuestion</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -253,7 +253,7 @@ under the License. <!-- Survey Response Service --> <service name="createSurveyResponse" engine="simple" auth="false" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyResponse"> + location="component://content/minilang/survey/SurveyServices.xml" invoke="createSurveyResponse"> <description>Create a Survey Response w/ Response Answers</description> <auto-attributes mode="IN" entity-name="SurveyResponse" include="nonpk" optional="true"/> <attribute name="answers" type="Map" mode="IN" optional="false" string-map-prefix="answers_"/> Modified: ofbiz/trunk/applications/content/servicedef/services_website.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_website.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_website.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_website.xml Fri Jun 10 14:04:30 2016 @@ -95,7 +95,7 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="getWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml" invoke="getWebSitePathAlias"> + location="component://content/minilang/website/WebSiteServices.xml" invoke="getWebSitePathAlias"> <description>Get a WebSite Path Alias</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes mode="OUT" include="nonpk" optional="false"/> @@ -134,14 +134,14 @@ <!-- auto-create website content records --> <service name="autoCreateWebSiteContent" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml" invoke="quickCreateWebSiteContent"> + location="component://content/minilang/website/WebSiteServices.xml" invoke="quickCreateWebSiteContent"> <description>Auto Create Content Publish Points</description> <attribute name="webSiteId" type="String" mode="IN" optional="false"/> <attribute name="webSiteContentTypeId" type="List" mode="IN" optional="false"/> </service> <service name="generateMissingSeoUrlForWebsite" engine="simple" auth="true" - location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml" invoke="generateMissingSeoUrlForWebsite" transaction-timeout="36000000"> + location="component://content/minilang/website/WebSiteServices.xml" invoke="generateMissingSeoUrlForWebsite" transaction-timeout="36000000"> <description>Generate Missing Seo URL's for Website</description> <attribute name="webSiteId" type="String" mode="IN" optional="false"/> <attribute name="prodCatalogId" type="String" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Fri Jun 10 14:04:30 2016 @@ -265,12 +265,12 @@ public class ContentServicesComplex { contentAssocDataResourceView = delegator.makeValue(viewName); contentAssocDataResourceView.setAllFields(content, true, null, null); } - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceView, new LinkedList<Object>(), locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceView, new LinkedList<Object>(), locale); String dataResourceId = content.getString("dataResourceId"); if (UtilValidate.isNotEmpty(dataResourceId)) dataResource = content.getRelatedOne("DataResource", true); if (dataResource != null) { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceView, new LinkedList<Object>(), locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceView, new LinkedList<Object>(), locale); } contentAssocDataResourceList.add(contentAssocDataResourceView); } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Fri Jun 10 14:04:30 2016 @@ -1253,7 +1253,7 @@ public class ContentWorker implements or contentAssoc = delegator.makeValue("ContentAssoc"); try { // TODO: locale needs to be gotten correctly - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", content, contentAssoc, new LinkedList<Object>(), Locale.getDefault()); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocIn", content, contentAssoc, new LinkedList<Object>(), Locale.getDefault()); context.put("contentAssocTypeId", contentAssoc.get("contentAssocTypeId")); context.put("contentAssocPredicateId", contentAssoc.get("contentAssocPredicateId")); context.put("mapKey", contentAssoc.get("mapKey")); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Fri Jun 10 14:04:30 2016 @@ -474,16 +474,16 @@ public class UploadContentAndImage { List<Object> errorMessages = new LinkedList<Object>(); Locale loc = Locale.getDefault(); try { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentIn", ftlContext2, ftlContext3, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentOut", ftlContext3, ftlContext, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentIn", ftlContext2, ftlContext3, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentOut", ftlContext3, ftlContext, errorMessages, loc); ftlContext3 = new HashMap<String, Object>(); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceIn", ftlContext2, ftlContext3, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", ftlContext3, ftlContext, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceIn", ftlContext2, ftlContext3, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceOut", ftlContext3, ftlContext, errorMessages, loc); ftlContext3 = new HashMap<String, Object>(); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", ftlContext2, ftlContext3, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", ftlContext3, ftlContext, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocIn", ftlContext2, ftlContext3, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocOut", ftlContext3, ftlContext, errorMessages, loc); } catch (MiniLangException e) { throw new GenericServiceException(e.getMessage()); } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Fri Jun 10 14:04:30 2016 @@ -93,9 +93,9 @@ public class LayoutEvents { context.put("locale", locale); try { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentIn", formInput, context, errorMessages, locale); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceIn", formInput, context, errorMessages, locale); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", formInput, context, errorMessages, locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentIn", formInput, context, errorMessages, locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceIn", formInput, context, errorMessages, locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocIn", formInput, context, errorMessages, locale); } catch (MiniLangException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; @@ -400,7 +400,7 @@ public class LayoutEvents { locale = Locale.getDefault(); } try { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", view, serviceIn, errorMessages, locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocIn", view, serviceIn, errorMessages, locale); } catch (IllegalArgumentException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; @@ -461,9 +461,9 @@ public class LayoutEvents { String rootDir = request.getSession().getServletContext().getRealPath("/"); context.put("rootDir", rootDir); try { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentIn", paramMap, context, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceIn", paramMap, context, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", paramMap, context, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentIn", paramMap, context, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceIn", paramMap, context, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocIn", paramMap, context, errorMessages, loc); } catch (MiniLangException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; @@ -534,9 +534,9 @@ public class LayoutEvents { String rootDir = request.getSession().getServletContext().getRealPath("/"); context.put("rootDir", rootDir); try { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentIn", paramMap, context, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceIn", paramMap, context, errorMessages, loc); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", paramMap, context, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentIn", paramMap, context, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceIn", paramMap, context, errorMessages, loc); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocIn", paramMap, context, errorMessages, loc); } catch (MiniLangException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy Fri Jun 10 14:04:30 2016 @@ -39,10 +39,10 @@ if (contentAssocPK.isPrimaryKey()) { } if (contentAssoc) { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceViewFrom, new ArrayList(), Locale.getDefault()); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceViewFrom, new ArrayList(), Locale.getDefault()); } else { contentAssocPK.setAllFields(context, false, "ca", null); //set all field, pk and non - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssocPK, contentAssocDataResourceViewFrom, new ArrayList(), Locale.getDefault()); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssocPK, contentAssocDataResourceViewFrom, new ArrayList(), Locale.getDefault()); } Debug.logInfo("in cmseditaddprep, contentAssocDataResourceViewFrom:" + contentAssocDataResourceViewFrom,""); @@ -69,7 +69,7 @@ if (!dataResourceId) { } if (dataResourceId) { dataResource = from("DataResource").where("dataResourceId", dataResourceId).cache(true).queryOne(); - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceViewFrom, new ArrayList(), Locale.getDefault()); + SimpleMapProcessor.runSimpleMapProcessor("component://content/minilang/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceViewFrom, new ArrayList(), Locale.getDefault()); templateRoot = [:]; FreeMarkerViewHandler.prepOfbizRoot(templateRoot, request, response); txt = DataResourceWorker.getDataResourceText(dataResource, "text/html", Locale.getDefault(), templateRoot, delegator, true); Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=1747712&r1=1747711&r2=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri Jun 10 14:04:30 2016 @@ -1575,13 +1575,13 @@ under the License. <request-map uri="AddLayout"><security auth="true" https="true"/><response name="success" type="view" value="AddLayout"/></request-map> <request-map uri="createLayout"> <security auth="true" https="true"/> - <event invoke="createLayout" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="createLayout" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayout"/> <response name="error" type="view" value="AddLayout"/> </request-map> <request-map uri="updateLayout"> <security auth="true" https="true"/> - <event invoke="updateLayout" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="updateLayout" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayout"/> <response name="error" type="view" value="EditLayout"/> </request-map> @@ -1605,7 +1605,7 @@ under the License. </request-map> <request-map uri="pasteSubContent"> <security auth="true" https="true"/> - <event invoke="pasteSubContent" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="pasteSubContent" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayout"/> <response name="error" type="view" value="EditLayout"/> </request-map> @@ -1621,38 +1621,38 @@ under the License. <request-map uri="EditLayoutUrl"><security auth="true" https="true"/><response name="success" type="view" value="EditLayoutUrl"/></request-map> <request-map uri="createLayoutText"> <security auth="true" https="true"/> - <event invoke="createLayoutText" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="createLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayoutText"/> <response name="error" type="view" value="EditLayoutText"/> </request-map> <request-map uri="EditLayoutSubContent"><security auth="true" https="true"/><response name="success" type="view" value="EditLayoutSubContent"/></request-map> <request-map uri="updateLayoutText"> <security auth="true" https="true"/> - <event invoke="updateLayoutText" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="updateLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayoutText"/> <response name="error" type="view" value="EditLayoutText"/> </request-map> <request-map uri="createLayoutHtml"> <security auth="true" https="true"/> - <event invoke="createLayoutText" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="createLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayoutHtml"/> <response name="error" type="view" value="EditLayoutHtml"/> </request-map> <request-map uri="updateLayoutHtml"> <security auth="true" https="true"/> - <event invoke="updateLayoutText" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="updateLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayoutHtml"/> <response name="error" type="view" value="EditLayoutHtml"/> </request-map> <request-map uri="createLayoutUrl"> <security auth="true" https="true"/> - <event invoke="createLayoutUrl" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="createLayoutUrl" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayoutUrl"/> <response name="error" type="view" value="EditLayoutUrl"/> </request-map> <request-map uri="updateLayoutUrl"> <security auth="true" https="true"/> - <event invoke="updateLayoutUrl" path="component://content/script/org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/> + <event invoke="updateLayoutUrl" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/> <response name="success" type="view" value="EditLayoutUrl"/> <response name="error" type="view" value="EditLayoutUrl"/> </request-map> @@ -1821,7 +1821,7 @@ under the License. </request-map> <request-map uri="addDocumentToTree"> <security auth="true" https="true"/> - <event invoke="createDocument" path="component://content/script/org/ofbiz/content/content/ContentEvents.xml" type="simple"/> + <event invoke="createDocument" path="component://content/minilang/content/ContentEvents.xml" type="simple"/> <response name="success" type="request-redirect" value="navigateContent"/> <response name="error" type="request" value="navigateContent"/> </request-map> Copied: ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml (from r1747586, ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml?p2=ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml&p1=ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml&r1=1747586&r2=1747712&rev=1747712&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml Fri Jun 10 14:04:30 2016 @@ -94,7 +94,7 @@ <simple-method method-name="createEmployee" short-description="Create New Employee"> <set field="parameters.roleTypeId" value="EMPLOYEE"/> - <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"/> <if-not-empty field="parameters.partyIdFrom"> <set field="partyRelationshipCtx.partyId" from-field="partyId"/> <set field="partyRelationshipCtx.partyIdFrom" from-field="parameters.partyIdFrom"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |