Modified: ofbiz/branches/release16.11/applications/commonext/minilang/setup/SetupEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/commonext/minilang/setup/SetupEvents.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/commonext/minilang/setup/SetupEvents.xml (original) +++ ofbiz/branches/release16.11/applications/commonext/minilang/setup/SetupEvents.xml Tue Dec 6 12:45:34 2016 @@ -257,12 +257,12 @@ <!-- Create partyId for UserLogin --> <session-to-field field="userLoginCtx" session-name="userLogin"/> <if-empty field="userLoginCtx.partyId"> - <make-value entity-name="Party" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Party"/> <set field="newEntity.partyId" from-field="userLoginCtx.userLoginId"/> <set field="newEntity.partyTypeId" value="PERSON"/> <create-value value-field="newEntity"/> <clear-field field="newEntity"/> - <make-value entity-name="Person" value-field="newPerson"/> + <make-value value-field="newPerson" entity-name="Person"/> <set field="newPerson.partyId" from-field="userLoginCtx.userLoginId"/> <create-value value-field="newPerson"/> <clear-field field="newPerson"/> @@ -345,7 +345,7 @@ </if-empty> <check-errors/> - <make-value entity-name="Facility" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Facility"/> <set field="defaultDaysToShip" from-field="parameters.defaultDaysToShip" type="Long"/> <clear-field field="parameters.defaultDaysToShip"/> @@ -426,7 +426,7 @@ <!-- create the ProductStoreFacility record --> <now-timestamp field="nowTimestamp"/> <if-not-empty field="newEntity.inventoryFacilityId"> - <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/> + <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> <set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/> <set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/> <set from-field="nowTimestamp" field="storeFacility.fromDate"/> @@ -505,7 +505,7 @@ <result-to-request result-name="productCategoryId" request-name="productCategoryId"/> </call-service> - <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> <set field="newEntity.parentProductCategoryId" from-field="parameters.primaryParentCategoryId"/> <set field="newEntity.productCategoryId" from-field="productCategoryId"/> <set field="newEntity.sequenceNum" value="1" type="Long"/>
Modified: ofbiz/branches/release16.11/applications/commonext/widget/ofbizsetup/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original) +++ ofbiz/branches/release16.11/applications/commonext/widget/ofbizsetup/CommonScreens.xml Tue Dec 6 12:45:34 2016 @@ -77,7 +77,7 @@ </and> </condition> <widgets> - <include-menu name="SetupSubTabBar" location="component://commonext/widget/ofbizsetup/Menus.xml"/> + <include-menu location="component://commonext/widget/ofbizsetup/Menus.xml" name="SetupSubTabBar"/> </widgets> </section> <section> Modified: ofbiz/branches/release16.11/applications/content/minilang/compdoc/CompDocServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/compdoc/CompDocServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/content/minilang/compdoc/CompDocServices.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/compdoc/CompDocServices.xml Tue Dec 6 12:45:34 2016 @@ -25,7 +25,7 @@ under the License. <entity-one entity-name="Content" value-field="rootTemplateContent"> <field-map field-name="contentId" from-field="parameters.instanceOfContentId"/> </entity-one> - <log level="info" message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}"/> + <log message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}" level="info"/> <!-- if not passed in, get latest template contentRevisionSeqId from db --> <if-empty field="parameters.contentRevisionSeqId"> @@ -45,7 +45,7 @@ under the License. <set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId"/> </else> </if-empty> - <log level="info" message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}"/> + <log message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}" level="info"/> <make-value entity-name="Content" value-field="rootInstanceContent"/> <if-empty field="parameters.rootInstanceContentId"> @@ -107,8 +107,8 @@ under the License. <simple-method method-name="genInstanceChildCompDocs" short-description="Create CompDoc"> <set from-field="parentTemplateContentId" field="thisTemplateContentId"/> <set from-field="parentInstanceContentId" field="thisInstanceContentId"/> - <log level="info" message="genInstanceChildCompDocs 0> thisTemplateContentId: ${thisTemplateContentId}"/> - <log level="info" message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}"/> + <log message="genInstanceChildCompDocs 0> thisTemplateContentId: ${thisTemplateContentId}" level="info"/> + <log message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}" level="info"/> <entity-condition entity-name="ContentAssoc" list="contentAssocList"> <condition-list combine="and"> <condition-expr field-name="contentIdTo" operator="equals" from-field="thisTemplateContentId"/> @@ -119,7 +119,7 @@ under the License. </condition-list> </condition-list> </entity-condition> - <log level="info" message="genInstanceChildCompDocs 1> contentAssocList: ${contentAssocList}"/> + <log message="genInstanceChildCompDocs 1> contentAssocList: ${contentAssocList}" level="info"/> <iterate list="contentAssocList" entry="templateContentAssoc"> <clone-value value-field="templateContent" new-value-field="instanceContent"/> Modified: ofbiz/branches/release16.11/applications/content/minilang/content/ContentEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/content/ContentEvents.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/content/minilang/content/ContentEvents.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/content/ContentEvents.xml Tue Dec 6 12:45:34 2016 @@ -131,7 +131,7 @@ under the License. <set field="context3.contentPurposeList" from-field="contentPurposeList"/> <string-to-list list="targetOperationList" string="ASSOC_CONTENT"/> <set field="context3.targetOperationList" from-field="targetOperationList"/> - <call-service service-name="assocContent" in-map-name="context3"></call-service> + <call-service in-map-name="context3" service-name="assocContent"></call-service> </simple-method> <simple-method method-name="createDocument" short-description="Create Document Tree"> Modified: ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml Tue Dec 6 12:45:34 2016 @@ -414,7 +414,7 @@ </if-not-empty> </simple-method> <simple-method method-name="createTopic" short-description="Create TOPIC type Content"> - <make-value entity-name="Content" value-field="content"/> + <make-value value-field="content" entity-name="Content"/> <set from-field="parameters.newTopicId" field="content.contentId"/> <set from-field="parameters.newTopicId" field="content.contentName"/> <set from-field="parameters.newTopicDescription" field="content.description"/> Modified: ofbiz/branches/release16.11/applications/content/minilang/layout/LayoutEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/layout/LayoutEvents.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/content/minilang/layout/LayoutEvents.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/layout/LayoutEvents.xml Tue Dec 6 12:45:34 2016 @@ -165,7 +165,7 @@ under the License. <set field="context.textData" from-field="parameters.textData"/> <session-to-field field="context.userLogin" session-name="userLogin"/> - <call-service service-name="persistContentAndAssoc" in-map-name="context"> + <call-service in-map-name="context" service-name="persistContentAndAssoc"> <result-to-field result-name="contentId" field="contentId"/> <result-to-field result-name="dataResourceId" field="dataResourceId"/> </call-service> @@ -318,7 +318,7 @@ under the License. <set field="context.contentIdTo" from-field="parameters.contentIdTo"/> <session-to-field field="context.userLogin" session-name="userLogin"/> - <call-service service-name="persistContentAndAssoc" in-map-name="context"> + <call-service in-map-name="context" service-name="persistContentAndAssoc"> <result-to-field result-name="contentId" field="contentId"/> <result-to-field result-name="dataResourceId" field="dataResourceId"/> </call-service> Modified: ofbiz/branches/release16.11/applications/content/minilang/survey/SurveyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/survey/SurveyServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/content/minilang/survey/SurveyServices.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/survey/SurveyServices.xml Tue Dec 6 12:45:34 2016 @@ -191,7 +191,7 @@ </if-compare> <if-empty field="surveyResponse"> - <make-value entity-name="SurveyResponse" value-field="surveyResponse"/> + <make-value value-field="surveyResponse" entity-name="SurveyResponse"/> <sequenced-id sequence-name="SurveyResponse" field="surveyResponse.surveyResponseId"/> <set-nonpk-fields map="parameters" value-field="surveyResponse"/> <create-value value-field="surveyResponse"/> Modified: ofbiz/branches/release16.11/applications/content/minilang/website/WebSiteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/website/WebSiteServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/content/minilang/website/WebSiteServices.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/website/WebSiteServices.xml Tue Dec 6 12:45:34 2016 @@ -24,7 +24,7 @@ under the License. <!-- WebSite Path Alias --> <simple-method method-name="getWebSitePathAlias" short-description="Returns a WebSite Path Alias"> - <make-value entity-name="WebSitePathAlias" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="alias" use-cache="true"/> <field-to-result field="alias.pathTo" result-name="pathTo"/>
