svn commit: r1747774 - in /ofbiz/trunk: applications/product/groovyScr
Locked
svn commit: r1747774 - in /ofbiz/trunk: applications/product/groovyScr
 
|
Author: deepak
Date: Fri Jun 10 18:46:51 2016 New Revision: 1747774 URL: http://svn.apache.org/viewvc?rev=1747774&view=rev Log: (OFBIZ-7229) Relocate .groovy files in the product component Added: ofbiz/trunk/applications/product/groovyScripts/ ofbiz/trunk/applications/product/groovyScripts/catalog/ - copied from r1747740, ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/ ofbiz/trunk/applications/product/groovyScripts/facility/ - copied from r1747740, ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/ Removed: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/ Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml Fri Jun 10 18:46:51 2016 @@ -46,7 +46,7 @@ under the License. </entity-and> <if-not-empty field="productContentAndInfos"> <first-from-list entry="productContentAndInfo" list="productContentAndInfos"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy"/> + <script location="component://product/groovyScripts/catalog/imagemanagement/SetDefaultImage.groovy"/> <entity-one value-field="product" entity-name="Product"> <field-map field-name="productId" from-field="parameters.productId"/> Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml Fri Jun 10 18:46:51 2016 @@ -224,7 +224,7 @@ under the License. <set field="productContent.sequenceNum" from-field="parameters.sequenceNum" type="Long"/> <store-value value-field="productContent"/> <if-not-empty field="parameters.sequenceNum"> - <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/sortSequenceNum.groovy"/> + <script location="component://product/groovyScripts/catalog/imagemanagement/sortSequenceNum.groovy"/> <set field="productContent.sequenceNum" from-field="parameters.sequenceNum" type="Long"/> <store-value value-field="productContent"/> </if-not-empty> Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Jun 10 18:46:51 2016 @@ -2103,7 +2103,7 @@ under the License. </request-map> <request-map uri="prepareCreateShipMeth"> <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/prepareCreateShipMeth.groovy"/> + <event type="groovy" path="component://product/groovyScripts/catalog/prepareCreateShipMeth.groovy"/> <response name="success" type="view" value="EditProductStoreShipSetup"/> <response name="error" type="view" value="EditProductStoreShipSetup"/> </request-map> @@ -2871,7 +2871,7 @@ under the License. </request-map> <request-map uri="checkAction"> <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/checkAction.groovy"/> + <event type="groovy" path="component://product/groovyScripts/catalog/imagemanagement/checkAction.groovy"/> <response name="frame" type="request" value="ImageFrames"/> <response name="watermark" type="request" value="ImageWatermarking"/> <response name="crop" type="request" value="ImageCropping"/> @@ -2880,7 +2880,7 @@ under the License. </request-map> <request-map uri="checkRejected"> <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/checkRejected.groovy"/> + <event type="groovy" path="component://product/groovyScripts/catalog/imagemanagement/checkRejected.groovy"/> <response name="approved" type="view" value="ImageApprove"/> <response name="rejected" type="view" value="ListPeopleRejected"/> </request-map> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Fri Jun 10 18:46:51 2016 @@ -118,7 +118,7 @@ under the License. <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy"/> + <script location="component://product/groovyScripts/catalog/category/EditCategory.groovy"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> @@ -143,7 +143,7 @@ under the License. <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy"/> + <script location="component://product/groovyScripts/catalog/category/EditCategory.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -251,8 +251,8 @@ under the License. <set field="textDataMap.textDataResourceId" from-field="content.dataResourceId"/> <set field="contentId" from-field="content.contentId"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy"/> + <script location="component://product/groovyScripts/catalog/category/EditCategoryContentContent.groovy"/> + <script location="component://product/groovyScripts/catalog/category/EditCategorySEO.groovy"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> @@ -317,7 +317,7 @@ under the License. <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.groovy"/> + <script location="component://product/groovyScripts/catalog/category/EditCategoryProducts.groovy"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> @@ -491,7 +491,7 @@ under the License. <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy"/> + <script location="component://product/groovyScripts/catalog/category/CreateProductInCategoryCheckExisting.groovy"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Fri Jun 10 18:46:51 2016 @@ -255,7 +255,7 @@ under the License. <screen name="keywordsearchbox"> <section> <actions> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.groovy"/> + <script location="component://product/groovyScripts/catalog/find/keywordsearchbox.groovy"/> </actions> <widgets> <screenlet id="ProductKeywordsPanel" title="${uiLabelMap.ProductSearchProducts}" collapsible="true"> @@ -267,7 +267,7 @@ under the License. <screen name="sidecatalogs"> <section> <actions> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.groovy"/> + <script location="component://product/groovyScripts/catalog/find/sidecatalogs.groovy"/> </actions> <widgets> <screenlet id="ProductBrowseCatalogsPanel" title="${uiLabelMap.ProductBrowseCatalogs}" collapsible="true"> @@ -279,7 +279,7 @@ under the License. <screen name="sidedeepcategory"> <section> <actions> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy"/> + <script location="component://product/groovyScripts/catalog/find/sidedeepcategory.groovy"/> </actions> <widgets> <screenlet id="ProductBrowseCategoriesPanel" title="${uiLabelMap.ProductBrowseCategories}" collapsible="true"> @@ -291,7 +291,7 @@ under the License. <screen name="miniproductlist"> <section> <actions> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy"/> + <script location="component://product/groovyScripts/catalog/find/miniproductlist.groovy"/> </actions> <widgets> <screenlet id="ProductCategoryProductsPanel" title="${uiLabelMap.ProductCategoryProducts}" collapsible="true"> @@ -306,7 +306,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleChooseTopCategory"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.groovy"/> + <script location="component://product/groovyScripts/catalog/ChooseTopCategory.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -329,7 +329,7 @@ under the License. <section> <actions> <set field="titleProperty" value="ProductFastLoadCatalogIntoCache"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/FastLoadCache.groovy"/> + <script location="component://product/groovyScripts/catalog/FastLoadCache.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -347,7 +347,7 @@ under the License. <screen name="categorytree"> <section> <actions> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy"/> + <script location="component://product/groovyScripts/catalog/category/CategoryTree.groovy"/> </actions> <widgets> <screenlet id="ProductBrowseCategoriesPanel" title="${uiLabelMap.ProductBrowseCatalogeAndCategories}" collapsible="true"> @@ -436,7 +436,7 @@ under the License. <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy"/> + <script location="component://product/groovyScripts/catalog/find/miniproductlist.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://product/template/find/MiniProductList.ftl"/></html></platform-specific> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Fri Jun 10 18:46:51 2016 @@ -218,7 +218,7 @@ under the License. <set field="configItemId" from-field="parameters.configItemId"/> <entity-one entity-name="ProductConfigItem" value-field="configItem" auto-field-map="true"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy"/> + <script location="component://product/groovyScripts/catalog/config/EditProductConfigItemContent.groovy"/> </actions> <widgets> <decorator-screen name="CommonConfigDecorator"> @@ -244,7 +244,7 @@ under the License. <set field="fromDate" from-field="requetParameters.fromDate" type="Timestamp"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy"/> + <script location="component://product/groovyScripts/catalog/config/EditProductConfigItemContentContent.groovy"/> </actions> <widgets> <decorator-screen name="CommonConfigDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Jun 10 18:46:51 2016 @@ -218,7 +218,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX_1" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE_1" type="Integer" default-value="10"/> - <!--script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategories.groovy"/--> + <!--script location="component://product/groovyScripts/catalog/feature/EditFeatureCategories.groovy"/--> </actions> <widgets> <decorator-screen name="CommonFeatureDecorator"> @@ -255,7 +255,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.groovy"/> + <script location="component://product/groovyScripts/catalog/feature/EditFeatureCategoryFeatures.groovy"/> </actions> <widgets> <decorator-screen name="CommonFeatureDecorator"> @@ -275,7 +275,7 @@ <set field="headerItem" value="featurecats"/> <set field="tabButtonItem" value="FeatureGroup"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditFeatureGroups.groovy"/> + <script location="component://product/groovyScripts/catalog/feature/EditFeatureGroups.groovy"/> </actions> <widgets> <decorator-screen name="CommonFeatureDecorator"> @@ -336,7 +336,7 @@ <set field="featureNum" from-field="parameters.featureNum" type="Integer"/> <set field="productFeatureCategoryId" from-field="parameters.productFeatureCategoryId"/> <set field="tabButtonItem" value="FeatureCategory"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/feature/QuickAddProductFeatures.groovy"/> + <script location="component://product/groovyScripts/catalog/feature/QuickAddProductFeatures.groovy"/> </actions> <widgets> <decorator-screen name="CommonFeatureDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Fri Jun 10 18:46:51 2016 @@ -58,7 +58,7 @@ under the License. <entity-condition entity-name="ProdCatalog" list="prodCatalogs"> <order-by field-name="catalogName"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/> + <script location="component://product/groovyScripts/catalog/find/advancedsearchoptions.groovy"/> </actions> <widgets> <decorator-screen name="CommonFindDecorator"> @@ -75,7 +75,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleSearchResults"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/> + <script location="component://product/groovyScripts/catalog/find/keywordsearch.groovy"/> </actions> <widgets> <decorator-screen name="CommonFindDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Fri Jun 10 18:46:51 2016 @@ -386,7 +386,7 @@ under the License. <form name="ImageFrames" type="single" title="" target="uploadFrame" header-row-style="header-row" default-table-style="basic-table" target-window="_self"> <actions> - <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageFrame.groovy"/> + <script location="component://product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy"/> <entity-one entity-name="ContentDataResourceView" value-field="contentDataResource"> <field-map field-name="contentId" from-field="parameters.contentId"/> <field-map field-name="drDataResourceId" from-field="parameters.dataResourceId"/> Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml Fri Jun 10 18:46:51 2016 @@ -97,8 +97,8 @@ under the License. </entity-and>--> <!--<entity-one value-field="product" entity-name="Product"/>--> - <!--<script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/seoLocales.groovy"/>--> - <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy"/> + <!--<script location="component://product/groovyScripts/catalog/imagemanagement/seoLocales.groovy"/>--> + <script location="component://product/groovyScripts/catalog/imagemanagement/ImageGallery.groovy"/> </actions> <widgets> <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> @@ -156,7 +156,7 @@ under the License. <set field="userTabButtonImage" value="ImageUpload"/> <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy"/> + <script location="component://product/groovyScripts/catalog/imagemanagement/ImageUpload.groovy"/> </actions> <widgets> <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> @@ -791,7 +791,7 @@ under the License. <section> <actions> <set field="userTabButtonImage" value="ImageRecentlyApproved"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageRecentlyApproved.groovy"/> + <script location="component://product/groovyScripts/catalog/imagemanagement/ImageRecentlyApproved.groovy"/> </actions> <widgets> <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Fri Jun 10 18:46:51 2016 @@ -82,7 +82,7 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/lookup/LookupVariantProduct.groovy"/> + <script location="component://product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml Fri Jun 10 18:46:51 2016 @@ -75,7 +75,7 @@ under the License. <set field="titleProperty" value="PageTitleEditProductPriceRules"/> <set field="headerItem" value="pricerules"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules_old.groovy"/> + <script location="component://product/groovyScripts/catalog/price/EditProductPriceRules_old.groovy"/> </actions> <widgets> <decorator-screen name="CommonPriceDecorator"> @@ -94,7 +94,7 @@ under the License. <set field="titleProperty" value="PageTitleEditProductPriceRules"/> <set field="headerItem" value="pricerules"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy"/> + <script location="component://product/groovyScripts/catalog/price/EditProductPriceRules.groovy"/> </actions> <widgets> <decorator-screen name="CommonPriceDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Jun 10 18:46:51 2016 @@ -514,7 +514,7 @@ under the License. <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy"/> + <script location="component://product/groovyScripts/catalog/product/QuickAddVariants.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -536,7 +536,7 @@ under the License. <set field="tabButtonItem" value="EditProductQuickAdmin"/> <set field="labelTitleProperty" value="ProductQuickAdmin"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductQuickAdmin.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -666,7 +666,7 @@ under the License. <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductInventoryItems.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -811,7 +811,7 @@ under the License. <set field="labelTitleProperty" value="ProductFeatures"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductFeatures.groovy"/> <entity-and entity-name="ProductFeatureIactn" list="featureInteractions"> <field-map field-name="productId" from-field="parameters.productId"/> </entity-and> @@ -894,7 +894,7 @@ under the License. <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductContent.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -933,8 +933,8 @@ under the License. <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="ProductContent" value-field="productContent"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductContentContent.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductSEO.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -986,7 +986,7 @@ under the License. <set field="titleProperty" value="PageTitleEditProductAssociations"/> <set field="tabButtonItem" value="EditProductAssoc"/> <set field="labelTitleProperty" value="ProductAssociations"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy"/> + <script location="component://product/groovyScripts/catalog/product/EditProductAssoc.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1026,8 +1026,8 @@ under the License. <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.groovy"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy"/> + <script location="component://product/groovyScripts/catalog/product/ApplyFeaturesFromCategory.groovy"/> + <script location="component://product/groovyScripts/catalog/product/ApplyFeaturesFromGroup.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1255,7 +1255,7 @@ under the License. <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="filterDate" type="Timestamp" from-field="nowTimestamp"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy"/> + <script location="component://product/groovyScripts/catalog/product/BestProducts.groovy"/> </actions> <widgets> <screenlet title="${uiLabelMap.ProductBestSellingProductsOf} ${now}"> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Fri Jun 10 18:46:51 2016 @@ -298,7 +298,7 @@ under the License. <set field="tabButtonItem" value="FindProductPromoCode"/> <set field="labelTitleProperty" value="ProductPromotionCode"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.groovy"/> + <script location="component://product/groovyScripts/catalog/promo/EditProductPromoCode.groovy"/> </actions> <widgets> <decorator-screen name="CommonPromoDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Fri Jun 10 18:46:51 2016 @@ -330,7 +330,7 @@ under the License. <set field="paymentServiceTypeEnumId" from-field="parameters.paymentServiceTypeEnumId"/> <entity-one entity-name="ProductStorePaymentSetting" value-field="productStorePaymentSetting" auto-field-map="true"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy"/> + <script location="component://product/groovyScripts/catalog/store/EditProductStorePaySetup.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> @@ -394,7 +394,7 @@ under the License. <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.groovy"/> + <script location="component://product/groovyScripts/catalog/store/EditProductStoreSurveys.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml Fri Jun 10 18:46:51 2016 @@ -52,7 +52,7 @@ under the License. <set field="tabButtonItem" value="EditKeywordThesaurus"/> <set field="headerItem" value="thesaurus"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.groovy"/> + <script location="component://product/groovyScripts/catalog/thesaurus/EditKeywordThesaurus.groovy"/> </actions> <widgets> <decorator-screen name="CommonThesaurusDecorator"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Fri Jun 10 18:46:51 2016 @@ -445,7 +445,7 @@ under the License. odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="${facilityInventoryByProductScreen}" override-list-size="${overrideListSize}"> <row-actions> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ComputeProductSellThroughData.groovy"/> + <script location="component://product/groovyScripts/facility/facility/ComputeProductSellThroughData.groovy"/> </row-actions> <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext"> <hyperlink target="EditFacilityInventoryItems" description="${productId}"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Jun 10 18:46:51 2016 @@ -26,7 +26,7 @@ under the License. <actions> <set field="titleProperty" value="ProductFindFacilities"/> <set field="headerItem" value="facility"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy"/> + <script location="component://product/groovyScripts/facility/facility/FindFacility.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -41,7 +41,7 @@ under the License. <if-compare field="showScreen" value="one" operator="equals"/> </condition> <actions> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy"/> + <script location="component://product/groovyScripts/facility/facility/EditFacility.groovy"/> </actions> <widgets> <section> @@ -153,7 +153,7 @@ under the License. <set field="titleProperty" value="ProductNewFacility"/> <set field="headerItem" value="facility"/> <set field="tabButtonItem" value="EditFacility"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy"/> + <script location="component://product/groovyScripts/facility/facility/EditFacility.groovy"/> </actions> <widgets> <section> @@ -249,7 +249,7 @@ under the License. <set field="tabButtonItem" value="FindFacilityTransfers"/> <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy"/> + <script location="component://product/groovyScripts/facility/facility/FindFacilityTransfers.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -300,7 +300,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="FindFacilityLocation"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy"/> + <script location="component://product/groovyScripts/facility/facility/FindFacilityLocation.groovy"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleFindFacilityLocation}"/> @@ -323,7 +323,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="FindFacilityLocation"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy"/> + <script location="component://product/groovyScripts/facility/facility/EditFacilityLocation.groovy"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleNewFacilityLocation}"/> @@ -400,7 +400,7 @@ under the License. <entity-one entity-name="Facility" value-field="facility"/> <entity-condition entity-name="InventoryItemLabelType" list="labelTypes"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy"/> + <script location="component://product/groovyScripts/facility/facility/FindInventoryItemsByLabels.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -446,7 +446,7 @@ under the License. <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> <set field="statusId" from-field="parameters.statusId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy"/> + <script location="component://product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/> @@ -496,7 +496,7 @@ under the License. <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy"/> + <script location="component://product/groovyScripts/facility/facility/CountFacilityInventoryByProduct.groovy"/> </actions> <widgets> <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> @@ -540,7 +540,7 @@ under the License. <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy"/> + <script location="component://product/groovyScripts/facility/facility/CountFacilityInventoryByProduct.groovy"/> </actions> <widgets> <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> @@ -628,7 +628,7 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/InventoryItemTotals.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -651,7 +651,7 @@ under the License. <set field="tabButtonItem2" value="InventoryItemGrandTotalsTab"/> <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/InventoryItemTotals.groovy"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleInventoryItemGrandTotals}"/> </actions> @@ -680,7 +680,7 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/InventoryItemTotals.groovy"/> </actions> <widgets> <container> @@ -705,7 +705,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -789,7 +789,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="ViewContactMechs"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy"/> + <script location="component://product/groovyScripts/facility/facility/ViewContactMechs.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> @@ -839,7 +839,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="ViewContactMechs"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditContactMech.groovy"/> + <script location="component://product/groovyScripts/facility/facility/EditContactMech.groovy"/> <set field="dependentForm" value="editcontactmechform"/> <set field="paramKey" value="countryGeoId"/> @@ -959,7 +959,7 @@ under the License. <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> </condition> <actions> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/PhysicalInventoryVariance.groovy"/> </actions> <widgets> <screenlet id="physical-inventory-variances" title="${uiLabelMap.ProductPhysicalInventoryVariances}" initially-collapsed="true"> @@ -1044,7 +1044,7 @@ under the License. <set field="titleProperty" value="PageTitleFindFacilityPhysicalInventory"/> <set field="headerItem" value="facility"/> <set field="tabButtonItem" value="PhysicalInventory"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/FindFacilityPhysicalInventory.groovy"/> </actions> <widgets> @@ -1066,7 +1066,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="FindFacilityTransfers"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/TransferInventoryItem.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> @@ -1122,7 +1122,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="ReceiveInventory"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/ReceiveInventory.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> @@ -1147,7 +1147,7 @@ under the License. <set field="headerItem" value="facility"/> <set field="tabButtonItem" value="ReceiveReturn"/> - <script location="component://product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy"/> + <script location="component://product/groovyScripts/facility/returns/ReceiveReturn.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -1229,7 +1229,7 @@ under the License. <not><if-empty field="pickMoveInfoList"/></not> </condition> <actions> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/PrintPickSheets.groovy"/> </actions> <widgets> <section> @@ -1260,7 +1260,7 @@ under the License. <screen name="ReviewOrdersNotPickedOrPacked"> <section> <actions> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/ReviewOrdersNotPickedOrPacked.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -1502,7 +1502,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleFacilityLocationGeoLocation"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy"/> + <script location="component://product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Fri Jun 10 18:46:51 2016 @@ -110,9 +110,9 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="InventoryItem"/> <set field="searchFields" value="[inventoryItemId]"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/GetSupplierInventories.groovy"/> + <script location="component://product/groovyScripts/catalog/GetSupplierInventories.groovy"/> <set field="andCondition" value="${context.andCondition}"/> - <script location="component://product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy"/> + <script location="component://product/groovyScripts/facility/inventory/LookupInventoryItems.groovy"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Fri Jun 10 18:46:51 2016 @@ -45,7 +45,7 @@ under the License. <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy"/> + <script location="component://product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> </actions> <widgets> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Fri Jun 10 18:46:51 2016 @@ -25,7 +25,7 @@ under the License. <actions> <set field="titleProperty" value="ProductFindShipment"/> <set field="headerItem" value="shipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/FindShipment.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -52,7 +52,7 @@ under the License. <actions> <set field="titleProperty" value="ProductFindShipment"/> <set field="headerItem" value="shipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/FindShipment.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -154,10 +154,10 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="ViewShipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/ViewShipment.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentItems.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentPackages.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentRouteSegments.groovy"/> </actions> <widgets> <section> @@ -209,7 +209,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="EditShipment"/> <set field="shipmentTypeId" from-field="parameters.shipmentTypeId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipment.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -227,7 +227,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="EditShipmentItems"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentItems.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -247,7 +247,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="EditShipmentPlan"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentPlan.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -292,7 +292,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="EditShipmentPackages"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentPackages.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -312,7 +312,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="EditShipmentRouteSegments"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentRouteSegments.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -332,7 +332,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="AddItemsFromOrder"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/AddItemsFromOrder.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -367,10 +367,10 @@ under the License. <actions> <set field="titleProperty" value="ProductQuickShipOrder"/> <set field="headerItem" value="shipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/QuickShipOrder.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentItems.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentPackages.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/EditShipmentRouteSegments.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -390,7 +390,7 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="ProductVerifyPick"/> <set field="headerItem" value="shipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/VerifyPick.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -409,7 +409,7 @@ under the License. <actions> <set field="titleProperty" value="ProductPackOrder"/> <set field="headerItem" value="shipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/PackOrder.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -428,7 +428,7 @@ under the License. <actions> <set field="titleProperty" value="ProductWeighPackageOnly"/> <set field="headerItem" value="shipment"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/WeightPackage.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -451,8 +451,8 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="shipmentId" from-field="parameters.shipmentId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/ViewShipment.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/PackingSlip.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> @@ -513,8 +513,8 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="shipmentId" from-field="parameters.shipmentId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/ViewShipment.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/ShipmentManifest.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> @@ -558,7 +558,7 @@ under the License. <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="ProductReceiveInventoryAgainstPO"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> @@ -580,7 +580,7 @@ under the License. <set field="titleProperty" value="ProductAddItemsFromInventory"/> <set field="headerItem" value="shipment"/> <set field="tabButtonItem" value="AddItemsFromInventory"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy"/> + <script location="component://product/groovyScripts/facility/shipment/AddItemsFromInventory.groovy"/> </actions> <widgets> <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Fri Jun 10 18:46:51 2016 @@ -43,7 +43,7 @@ <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy"/> + <script location="component://product/groovyScripts/facility/facility/CountFacilityInventoryByProduct.groovy"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml Fri Jun 10 18:46:51 2016 @@ -45,7 +45,7 @@ under the License. <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy"/> + <script location="component://product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> </actions> <widgets> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Fri Jun 10 18:46:51 2016 @@ -30,7 +30,7 @@ under the License. <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/> + <script location="component://product/groovyScripts/catalog/find/advancedsearchoptions.groovy"/> <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/EbayAdvancedSearch.groovy"/> </actions> <widgets> @@ -50,7 +50,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleSearchResults"/> <set field="headerItem" value="export"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/> + <script location="component://product/groovyScripts/catalog/find/keywordsearch.groovy"/> </actions> <widgets> <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Fri Jun 10 18:46:51 2016 @@ -207,7 +207,7 @@ under the License. <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/> + <script location="component://product/groovyScripts/catalog/find/advancedsearchoptions.groovy"/> <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/EbayAdvancedSearch.groovy"/> </actions> <widgets> @@ -229,7 +229,7 @@ under the License. <set field="tabButtonItem" value="exportProductListing"/> <set field="toEbayStore" default-value="Y"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/> + <script location="component://product/groovyScripts/catalog/find/keywordsearch.groovy"/> </actions> <widgets> <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=1747774&r1=1747773&r2=1747774&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Fri Jun 10 18:46:51 2016 @@ -29,7 +29,7 @@ under the License. <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/> + <script location="component://product/groovyScripts/catalog/find/advancedsearchoptions.groovy"/> <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy"/> </actions> <widgets> @@ -49,7 +49,7 @@ under the License. <actions> <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleSearchResults"/> - <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/> + <script location="component://product/groovyScripts/catalog/find/keywordsearch.groovy"/> <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy"/> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |