This is an automated email from the ASF dual-hosted git repository.
deepak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 020d76e68 Updated applications refactored groovy location for plugins
components (OFBIZ-12813)
020d76e68 is described below
commit 020d76e684fa12dfeab8906a39cc9beedae7bf82
Author: Deepak Dixit <deepak.di...@hotwax.co>
AuthorDate: Fri Jul 28 12:33:38 2023 +0530
Updated applications refactored groovy location for plugins components
(OFBIZ-12813)
---
assetmaint/widget/FacilityScreens.xml | 2 +-
...EntriesSearchResultsInvoiceAndPayment.rptdesign | 2 +-
.../accounting/reports/BalanceSheet.rptdesign | 2 +-
.../accounting/reports/IncomeStatement.rptdesign | 2 +-
.../reports/InvoiceAcctgTransEntry.rptdesign | 2 +-
.../accounting/reports/TrialBalance.rptdesign | 2 +-
birt/widget/facility/FacilityScreens.xml | 2 +-
ebay/widget/EbayScreens.xml | 4 +--
ebaystore/widget/EbaySellingManagerScreens.xml | 2 +-
ebaystore/widget/EbayStoreScreens.xml | 4 +--
ecommerce/widget/CartScreens.xml | 2 +-
ecommerce/widget/CatalogScreens.xml | 38 +++++++++++-----------
ecommerce/widget/CommonScreens.xml | 6 ++--
ecommerce/widget/OrderScreens.xml | 24 +++++++-------
lucene/widget/LuceneScreens.xml | 6 ++--
myportal/widget/CommonScreens.xml | 4 +--
projectmgr/widget/ProjectScreens.xml | 10 +++---
projectmgr/widget/ResourceScreens.xml | 4 +--
projectmgr/widget/SurveyScreens.xml | 2 +-
scrum/widget/ResourceScreens.xml | 2 +-
webpos/widget/CatalogScreens.xml | 2 +-
21 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/assetmaint/widget/FacilityScreens.xml
b/assetmaint/widget/FacilityScreens.xml
index 7f7844b51..47082eaa2 100644
--- a/assetmaint/widget/FacilityScreens.xml
+++ b/assetmaint/widget/FacilityScreens.xml
@@ -43,7 +43,7 @@
<set field="internalName"
from-field="parameters.internalName"/>
<set field="productId" from-field="parameters.productId"/>
- <script
location="component://product/groovyScripts/facility/facility/CountFacilityInventoryByProduct.groovy"/>
+ <script
location="component://product/src/main/groovy/org/apache/ofbiz/product/facility/facility/CountFacilityInventoryByProduct.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.mainDecoratorLocation}">
diff --git
a/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
b/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
index fbd489ba5..07efac796 100644
---
a/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
+++
b/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
@@ -838,7 +838,7 @@ context.put("locale", reportContext.getLocale());
context.put("parameters", parameters);
context.put("delegator", delegator);
context.put("dispatcher", dispatcher);
-GroovyUtil.runScriptAtLocation("component://order/groovyScripts/order/CompanyHeader.groovy",
context);
+GroovyUtil.runScriptAtLocation("component://order/src/main/groovy/org/apache/ofbiz/order/order/CompanyHeader.groovy",
context);
var postalAddress = context.get("postalAddress");
var country = postalAddress.getRelatedOne("CountryGeo", false);
var phone = context.get("phone");
diff --git a/birt/webapp/accounting/reports/BalanceSheet.rptdesign
b/birt/webapp/accounting/reports/BalanceSheet.rptdesign
index fc2350888..d61324cdf 100644
--- a/birt/webapp/accounting/reports/BalanceSheet.rptdesign
+++ b/birt/webapp/accounting/reports/BalanceSheet.rptdesign
@@ -84,7 +84,7 @@ context.put("delegator", delegator);
context.put("dispatcher", dispatcher);
context.put("userLogin", userLogin);
context.put("locale", params["locale"].value);
-GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/reports/BalanceSheet.groovy",
null, context);
+GroovyUtil.runScriptAtLocation("component://accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/BalanceSheet.groovy",
null, context);
// prepare data source lists
assetAccountBalanceList = context.get("assetAccountBalanceList");
diff --git a/birt/webapp/accounting/reports/IncomeStatement.rptdesign
b/birt/webapp/accounting/reports/IncomeStatement.rptdesign
index 4c0f93935..586b5c4ba 100644
--- a/birt/webapp/accounting/reports/IncomeStatement.rptdesign
+++ b/birt/webapp/accounting/reports/IncomeStatement.rptdesign
@@ -77,7 +77,7 @@ context.put("glFiscalTypeId", glFiscalTypeId);
context.put("delegator", delegator);
context.put("dispatcher", dispatcher);
context.put("userLogin", userLogin);
-GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/reports/IncomeStatement.groovy",
null, context);
+GroovyUtil.runScriptAtLocation("component://accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/IncomeStatement.groovy",
null, context);
// prepare data source lists
revenueAccountBalanceList = context.get("revenueAccountBalanceList");
diff --git a/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
b/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
index 7c60836aa..f85e0c8eb 100644
--- a/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
+++ b/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
@@ -59,7 +59,7 @@ companyLogoCtx.put("nowTimestamp",
UtilDateTime.nowTimestamp());
companyLogoCtx.put("locale", reportContext.getLocale());
companyLogoCtx.put("parameters", parameters);
companyLogoCtx.put("delegator", delegator);
-GroovyUtil.runScriptAtLocation("component://order/groovyScripts/order/CompanyHeader.groovy",
companyLogoCtx);
+GroovyUtil.runScriptAtLocation("component://order/src/main/groovy/org/apache/ofbiz/order/order/CompanyHeader.groovy",
companyLogoCtx);
logoImageUrl = companyLogoCtx.get("logoImageUrl");
if (!logoImageUrl) {
logoImageUrl =
FileUtil.getFile("component://common-theme/webapp/images/ofbiz_logo.png").getPath();
diff --git a/birt/webapp/accounting/reports/TrialBalance.rptdesign
b/birt/webapp/accounting/reports/TrialBalance.rptdesign
index 0ee66552f..3d5330233 100644
--- a/birt/webapp/accounting/reports/TrialBalance.rptdesign
+++ b/birt/webapp/accounting/reports/TrialBalance.rptdesign
@@ -66,7 +66,7 @@ context.put("parties", parties);
context.put("delegator", delegator);
context.put("dispatcher", dispatcher);
context.put("userLogin", userLogin);
-GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/reports/TrialBalance.groovy",
null, context);
+GroovyUtil.runScriptAtLocation("component://accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/TrialBalance.groovy",
null, context);
partyNameList = context.partyNameList;
// get grand totoal posted
diff --git a/birt/widget/facility/FacilityScreens.xml
b/birt/widget/facility/FacilityScreens.xml
index 5ef1968c5..7a0091215 100644
--- a/birt/widget/facility/FacilityScreens.xml
+++ b/birt/widget/facility/FacilityScreens.xml
@@ -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/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy"/>
+ <script
location="component://product/src/main/groovy/org/apache/ofbiz/product/facility/facility/ViewFacilityInventoryByProduct.groovy"/>
<entity-one entity-name="Facility" value-field="facility"
use-cache="true"/>
</actions>
<widgets>
diff --git a/ebay/widget/EbayScreens.xml b/ebay/widget/EbayScreens.xml
index 7d15e1fe3..2346635d9 100644
--- a/ebay/widget/EbayScreens.xml
+++ b/ebay/widget/EbayScreens.xml
@@ -31,7 +31,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/groovyScripts/catalog/find/AdvancedSearchOptions.groovy"/>
+ <script
location="component://product/src/main/groovy/org/apache/ofbiz/product/catalog/find/AdvancedSearchOptions.groovy"/>
<script
location="component://ebay/groovyScripts/EbayAdvancedSearch.groovy"/>
</actions>
<widgets>
@@ -52,7 +52,7 @@ under the License.
<set field="titleProperty" value="PageTitleSearchResults"/>
<set field="helpAnchor"
value="_search_products_in_category_screen"/>
<set field="headerItem" value="export"/>
- <script
location="component://product/groovyScripts/catalog/find/KeywordSearch.groovy"/>
+ <script
location="component://product/src/main/groovy/org/apache/ofbiz/product/catalog/find/KeywordSearch.groovy"/>
</actions>
<widgets>
<decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/ebaystore/widget/EbaySellingManagerScreens.xml
b/ebaystore/widget/EbaySellingManagerScreens.xml
index 402bbeda6..2a9c186d2 100644
--- a/ebaystore/widget/EbaySellingManagerScreens.xml
+++ b/ebaystore/widget/EbaySellingManagerScreens.xml
@@ -541,7 +541,7 @@
<actions>
<set field="headerItem" value="ebayStore"/>
<set field="sellingManagerItem" value="ordersImported"/>
- <script
location="component://order/groovyScripts/order/FindOrders.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/order/FindOrders.groovy"/>
<set field="orderList" from-field="orderList" type="List"/>
<set field="productStoreId"
from-field="parameters.productStoreId"/>
</actions>
diff --git a/ebaystore/widget/EbayStoreScreens.xml
b/ebaystore/widget/EbayStoreScreens.xml
index 21860ca12..cd3c37888 100644
--- a/ebaystore/widget/EbayStoreScreens.xml
+++ b/ebaystore/widget/EbayStoreScreens.xml
@@ -211,7 +211,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/groovyScripts/catalog/find/AdvancedSearchOptions.groovy"/>
+ <script
location="component://product/src/main/groovy/org/apache/ofbiz/product/catalog/find/AdvancedSearchOptions.groovy"/>
<script
location="component://ebay/groovyScripts/EbayAdvancedSearch.groovy"/>
</actions>
<widgets>
@@ -233,7 +233,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/groovyScripts/catalog/find/KeywordSearch.groovy"/>
+ <script
location="component://product/src/main/groovy/org/apache/ofbiz/product/catalog/find/KeywordSearch.groovy"/>
</actions>
<widgets>
<decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/ecommerce/widget/CartScreens.xml b/ecommerce/widget/CartScreens.xml
index 090c229f1..a52d50265 100644
--- a/ecommerce/widget/CartScreens.xml
+++ b/ecommerce/widget/CartScreens.xml
@@ -117,7 +117,7 @@ under the License.
<set field="MainColumnStyle" value="center"/>
<set field="productsummaryScreen"
value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
<set field="titleProperty"
value="PageTitleShowPromotionDetails"/>
- <script
location="component://order/groovyScripts/entry/cart/ShowPromotionDetails.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/cart/ShowPromotionDetails.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/ecommerce/widget/CatalogScreens.xml
b/ecommerce/widget/CatalogScreens.xml
index 72befeb18..291009e79 100644
--- a/ecommerce/widget/CatalogScreens.xml
+++ b/ecommerce/widget/CatalogScreens.xml
@@ -37,7 +37,7 @@ under the License.
<screen name="keywordsearchbox">
<section>
<actions>
- <script
location="component://order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/KeywordSearchOptions.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template
location="component://ecommerce/template/catalog/KeywordSearchBox.ftl"/></html></platform-specific>
@@ -57,7 +57,7 @@ under the License.
<section>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
- <script
location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/SideDeepCategory.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template
location="component://ecommerce/template/catalog/SideDeepCategory.ftl"/></html></platform-specific>
@@ -89,7 +89,7 @@ under the License.
<section>
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
- <script
location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/SideDeepCategory.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template
location="component://ecommerce/template/catalog/MiniLastViewedCategories.ftl"/></html></platform-specific>
@@ -140,7 +140,7 @@ under the License.
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
- <script
location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true"
location="component://ecommerce/template/catalog/ProductSummary.ftl"/></html></platform-specific>
@@ -152,7 +152,7 @@ under the License.
<section>
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
- <script
location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/SideDeepCategory.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template
location="component://order/template/entry/catalog/BreadCrumbs.ftl"/></html></platform-specific>
@@ -169,7 +169,7 @@ under the License.
<set field="MainColumnStyle" value="center"/>
<set field="titleProperty" value="PageTitleCategoryPage"/>
- <script
location="component://order/groovyScripts/entry/catalog/Category.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/Category.groovy"/>
<!-- Open this commented section for the demo of Layered
Navigation, navigate through Gizmo and Widgets categories to see it in action.
<script
location="component://ecommerce/groovyScripts/catalog/LayeredNavigation.groovy"/>
<set field="detailScreen" value="LayeredCategoryDetail"/>
@@ -217,7 +217,7 @@ under the License.
<set field="productsummaryScreen"
value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
<set field="productCategoryLinkScreen"
value="component://ecommerce/widget/CatalogScreens.xml#ProductCategoryLink"/>
- <script
location="component://order/groovyScripts/entry/catalog/CategoryDetail.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/CategoryDetail.groovy"/>
<entity-and entity-name="ProductCategoryLink"
list="productCategoryLinks" use-cache="true" filter-by-date="true">
<field-map field-name="productCategoryId"
from-field="productCategoryId"/>
@@ -262,7 +262,7 @@ under the License.
<set field="titleProperty" value="PageTitleProductPage"/>
<set field="layoutSettings.javaScripts[]"
value="/ecommerce/images/productAdditionalView.js" global="true"/>
<set field="configproductdetailScreen"
value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/>
- <script
location="component://order/groovyScripts/entry/catalog/Product.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/Product.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -295,7 +295,7 @@ under the License.
<actions>
<set field="productsummaryScreen"
value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
- <script
location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy"/>
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
@@ -307,7 +307,7 @@ under the License.
<screen name="inlineProductDetail">
<section>
<actions>
- <script
location="component://order/groovyScripts/entry/catalog/InlineProductDetail.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/InlineProductDetail.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template
location="component://order/template/entry/catalog/InlineProductDetail.ftl"/></html></platform-specific>
@@ -320,8 +320,8 @@ under the License.
<actions>
<set field="productsummaryScreen"
value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
<set field="inlineProductDetailScreen"
value="component://ecommerce/widget/CatalogScreens.xml#inlineProductDetail"/>
- <script
location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/>
- <script
location="component://order/groovyScripts/entry/catalog/PrepareConfigForm.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/PrepareConfigForm.groovy"/>
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
@@ -406,7 +406,7 @@ under the License.
<set field="quickaddsummaryScreen"
value="component://ecommerce/widget/CatalogScreens.xml#quickaddsummary"/>
<set field="titleProperty" value="PageTitleQuickAdd"/>
- <script
location="component://order/groovyScripts/entry/catalog/QuickAdd.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/QuickAdd.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -427,7 +427,7 @@ under the License.
<screen name="quickaddsummary">
<section>
<actions>
- <script
location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template
location="component://ecommerce/template/order/QuickAddSummary.ftl"/></html></platform-specific>
@@ -444,7 +444,7 @@ under the License.
<set field="titleProperty" value="PageTitleSearchResults"/>
<set field="parameters.VIEW_SIZE"
from-field="parameters.VIEW_SIZE" default-value="10"/>
- <script
location="component://order/groovyScripts/entry/catalog/KeywordSearch.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/KeywordSearch.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -471,7 +471,7 @@ under the License.
<set field="titleProperty" value="PageTitleTagResults"/>
<set field="parameters.VIEW_SIZE"
from-field="parameters.VIEW_SIZE" default-value="10"/>
- <script
location="component://order/groovyScripts/entry/catalog/KeywordSearch.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/KeywordSearch.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -496,7 +496,7 @@ under the License.
<set field="titleProperty" value="PageTitleAdvancedSearch"/>
<set field="headerItem" value="Advanced Search"/>
- <script
location="component://order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/AdvancedSearchOptions.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -576,7 +576,7 @@ under the License.
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
- <script
location="component://order/groovyScripts/entry/catalog/Category.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/Category.groovy"/>
<set field="fromSetSessionLocale" value="${groovy: return
request.getAttribute('fromSetSessionLocale');}"/>
<set field="visualThemeId"
from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
<set field="visualTheme" value="${groovy:
org.apache.ofbiz.widget.model.ThemeFactory.getVisualThemeFromId(visualThemeId)}"/>
@@ -647,7 +647,7 @@ under the License.
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
- <script
location="component://order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductUomDropDownOnly.groovy"/>
<!-- This screen is used to update uom dropdown using ajax
request. Setting the last saved view in the last view to avoid
ajax request's view to be used in subsequent request with
response type last view.-->
<set field="nothing" value="${groovy:
session.setAttribute('_LAST_VIEW_NAME_',
session.getAttribute('_SAVED_VIEW_NAME_'))}"/>
diff --git a/ecommerce/widget/CommonScreens.xml
b/ecommerce/widget/CommonScreens.xml
index 78d50ad08..721e0c9d1 100644
--- a/ecommerce/widget/CommonScreens.xml
+++ b/ecommerce/widget/CommonScreens.xml
@@ -36,7 +36,7 @@ under the License.
<set field="MainColumnStyle" value="nocolumns" global="true"/>
<script
location="component://ecommerce/groovyScripts/EcommerceSetup.groovy"/>
<set field="visualThemeId"
from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
- <script
location="component://common/groovyScripts/InitTheme.groovy"/>
+ <script
location="component://common/src/main/groovy/org/apache/ofbiz/common/InitTheme.groovy"/>
<!-- The default (main) java scripts -->
<!-- NOTE: this should be included on each screen that uses it
to avoid including it in all screens: -->
@@ -287,7 +287,7 @@ under the License.
<!-- Get the store VisualTheme -->
<set field="visualThemeId"
from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
- <script
location="component://common/groovyScripts/InitTheme.groovy"/>
+ <script
location="component://common/src/main/groovy/org/apache/ofbiz/common/InitTheme.groovy"/>
</actions>
<widgets>
@@ -322,7 +322,7 @@ under the License.
<set field="randomSurveyGroup" value="testSurveyGroup"/>
<script
location="component://ecommerce/groovyScripts/Main.groovy"/>
- <script
location="component://order/groovyScripts/entry/catalog/Category.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/Category.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/ecommerce/widget/OrderScreens.xml
b/ecommerce/widget/OrderScreens.xml
index dc59726b5..1ac5ff8f3 100644
--- a/ecommerce/widget/OrderScreens.xml
+++ b/ecommerce/widget/OrderScreens.xml
@@ -164,7 +164,7 @@ under the License.
<set field="titleProperty"
value="PageTitleBillingInformation"/>
<script
location="component://ecommerce/groovyScripts/order/PaymentOptions.groovy"/>
- <script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/StorePaymentOptions.groovy"/>
</actions>
<widgets>
<decorator-screen name="anonymousCheckoutDecorator">
@@ -187,7 +187,7 @@ under the License.
<set field="titleProperty"
value="PageTitleBillingInformation"/>
<script
location="component://ecommerce/groovyScripts/order/PaymentInformation.groovy"/>
- <script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/StorePaymentOptions.groovy"/>
</actions>
<widgets>
<decorator-screen name="anonymousCheckoutDecorator">
@@ -227,7 +227,7 @@ under the License.
<set field="titleProperty"
value="PageTitleBillingInformation"/>
<set field="anonymoustrailScreen"
value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
<script
location="component://ecommerce/groovyScripts/order/BillSettings.groovy"/>
- <script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/StorePaymentOptions.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -247,9 +247,9 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script
location="component://order/groovyScripts/entry/CheckoutPayment.groovy"/>
- <script
location="component://order/groovyScripts/entry/CheckoutOptions.groovy"/>
- <script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/CheckoutPayment.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/CheckoutOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/StorePaymentOptions.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -267,7 +267,7 @@ under the License.
<set field="MainColumnStyle" value="rightonly"/>
<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script
location="component://order/groovyScripts/entry/CheckoutShippingAddress.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/CheckoutShippingAddress.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -307,7 +307,7 @@ under the License.
<section>
<actions>
<set field="titleProperty"
value="PageTitleSplitItemsForShipping"/>
- <script
location="component://order/groovyScripts/entry/SplitShip.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/SplitShip.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -507,7 +507,7 @@ under the License.
<actions>
<set field="titleProperty"
value="PageTitleBillingInformation"/>
<script
location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/>
- <script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/StorePaymentOptions.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true"
location="component://ecommerce/template/order/QuickAnonPaymentInformation.ftl"/></html></platform-specific>
@@ -657,8 +657,8 @@ under the License.
<set field="MainColumnStyle" value="rightonly"/>
<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script
location="component://order/groovyScripts/entry/CheckoutPayment.groovy"/>
- <script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/CheckoutPayment.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/StorePaymentOptions.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -679,7 +679,7 @@ under the License.
<set field="titleProperty" value="ProductCompareProducts"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="title"
from-field="uiLabelMap.ProductCompareProducts"/>
- <script
location="component://order/groovyScripts/entry/catalog/CompareProducts.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/CompareProducts.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPopUpDecorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/lucene/widget/LuceneScreens.xml b/lucene/widget/LuceneScreens.xml
index 8f83d1325..cc95176c7 100644
--- a/lucene/widget/LuceneScreens.xml
+++ b/lucene/widget/LuceneScreens.xml
@@ -60,7 +60,7 @@ under the License.
<screen name="AdminSearch">
<section>
<actions>
- <script
location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
+ <script
location="component://content/src/main/groovy/org/apache/ofbiz/content/cms/GetMenuContext.groovy"/>
<script
location="component://lucene/groovyScripts/content/AdvancedSearchPrep.groovy"/>
<script
location="component://lucene/groovyScripts/content/Search.groovy"/>
<set field="titleProperty" value="ContentCMSSearchPage"/>
@@ -85,7 +85,7 @@ under the License.
<screen name="ProductSearch">
<section>
<actions>
- <script
location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
+ <script
location="component://content/src/main/groovy/org/apache/ofbiz/content/cms/GetMenuContext.groovy"/>
<script
location="component://lucene/groovyScripts/content/SearchProducts.groovy"/>
<set field="titleProperty" value="ContentCMSSearchPage"/>
<set field="currentCMSMenuItemName" value="productSearch"
to-scope="user"/>
@@ -107,7 +107,7 @@ under the License.
<screen name="AdminIndex">
<section>
<actions>
- <script
location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
+ <script
location="component://content/src/main/groovy/org/apache/ofbiz/content/cms/GetMenuContext.groovy"/>
<set field="titleProperty" value="ContentCMSSearchPage"/>
<set field="currentCMSMenuItemName" value="index"
to-scope="user"/>
</actions>
diff --git a/myportal/widget/CommonScreens.xml
b/myportal/widget/CommonScreens.xml
index 332cd13df..a275e4aff 100644
--- a/myportal/widget/CommonScreens.xml
+++ b/myportal/widget/CommonScreens.xml
@@ -41,7 +41,7 @@ under the License.
<set field="applicationMenuLocation"
value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_my_portal_plugin"/>
<set field="parameters.parentPortalPageId"
from-field="parameters.parentPortalPageId" default-value="MYPORTAL"
global="true"/>
- <script
location="component://common/groovyScripts/GetParentPortalPageId.groovy"/>
+ <script
location="component://common/src/main/groovy/org/apache/ofbiz/common/GetParentPortalPageId.groovy"/>
<set field="applicationTitle"
from-field="uiLabelMap.PageTitleMyPortalForNoLogin"/>
<set field="my" value="My" global="true"/>
</actions>
@@ -72,7 +72,7 @@ under the License.
<set field="applicationMenuLocation"
value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
<!--
<set field="parameters.parentPortalPageId"
from-field="parameters.parentPortalPageId" default-value="MYPORTAL"
global="true"/>
- <script
location="component://common/groovyScripts/GetParentPortalPageId.groovy"/>
+ <script
location="component://common/src/main/groovy/org/apache/ofbiz/common/GetParentPortalPageId.groovy"/>
<set field="applicationTitle"
value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
<set field="my" value="My" global="true"/>
-->
diff --git a/projectmgr/widget/ProjectScreens.xml
b/projectmgr/widget/ProjectScreens.xml
index 6c43a941b..e22bfd6fc 100644
--- a/projectmgr/widget/ProjectScreens.xml
+++ b/projectmgr/widget/ProjectScreens.xml
@@ -707,8 +707,8 @@ under the License.
<set field="labelTitleProperty"
value="PageTitleEditContactMech"/>
- <script
location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
- <script
location="component://party/groovyScripts/party/EditContactMech.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/HasPartyPermissions.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/party/EditContactMech.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -763,7 +763,7 @@ under the License.
<entity-one entity-name="Party" use-cache="true"
value-field="party"/>
<entity-one entity-name="Person" use-cache="true"
value-field="lookupPerson"/>
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
- <script
location="component://party/groovyScripts/communication/FindCommEventContactMechs.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/FindCommEventContactMechs.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -841,7 +841,7 @@ under the License.
<set field="headerItem" value="visits"/>
<set field="tabButtonItem" value="showvisits"/>
- <script
location="component://party/groovyScripts/visit/ShowVisits.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/visit/ShowVisits.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -872,7 +872,7 @@ under the License.
<set field="headerItem" value="visits"/>
<set field="tabButtonItem" value="visitdetail"/>
- <script
location="component://party/groovyScripts/visit/VisitDetails.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/visit/VisitDetails.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/projectmgr/widget/ResourceScreens.xml
b/projectmgr/widget/ResourceScreens.xml
index 821108649..98d55afbd 100644
--- a/projectmgr/widget/ResourceScreens.xml
+++ b/projectmgr/widget/ResourceScreens.xml
@@ -80,8 +80,8 @@ under the License.
<set field="headerItem" value="find"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
<set field="layoutSettings.javaScripts[]"
value="/partymgr/static/PartyProfileContent.js" global="true"/>
- <script
location="component://party/groovyScripts/party/ViewProfile.groovy"/>
- <script
location="component://party/groovyScripts/party/GetUserLoginPrimaryEmail.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/party/ViewProfile.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/party/GetUserLoginPrimaryEmail.groovy"/>
<entity-condition entity-name="RoleTypeAndParty"
list="partyRoles">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="equals"
value="${parameters.partyId}"/>
diff --git a/projectmgr/widget/SurveyScreens.xml
b/projectmgr/widget/SurveyScreens.xml
index 9148f700e..fe3af38a7 100644
--- a/projectmgr/widget/SurveyScreens.xml
+++ b/projectmgr/widget/SurveyScreens.xml
@@ -45,7 +45,7 @@ under the License.
<set field="surveyId" from-field="parameters.surveyId"/>
<set field="workEffortId"
from-field="parameters.workEffortId"/>
<entity-one entity-name="Survey" value-field ="survey"/>
- <script
location="component://content/groovyScripts/survey/ViewSurveyResponses.groovy"/>
+ <script
location="component://content/src/main/groovy/org/apache/ofbiz/content/survey/ViewSurveyResponses.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/scrum/widget/ResourceScreens.xml b/scrum/widget/ResourceScreens.xml
index 535f89dae..9c4b661fd 100644
--- a/scrum/widget/ResourceScreens.xml
+++ b/scrum/widget/ResourceScreens.xml
@@ -96,7 +96,7 @@ under the License.
<set field="layoutSettings.javaScripts[]"
value="/images/prototypejs/control.progress_bar.js" global="true"/>
<set field="layoutSettings.styleSheets[]"
value="/images/prototypejs/progress_bar.css" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/partymgr/static/PartyProfileContent.js" global="true"/>
- <script
location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+ <script
location="component://party/src/main/groovy/org/apache/ofbiz/party/party/ViewProfile.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
diff --git a/webpos/widget/CatalogScreens.xml b/webpos/widget/CatalogScreens.xml
index 0cd724327..56bade73c 100644
--- a/webpos/widget/CatalogScreens.xml
+++ b/webpos/widget/CatalogScreens.xml
@@ -64,7 +64,7 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleCategoryPage"/>
<script
location="component://webpos/groovyScripts/catalog/Category.groovy"/>
- <script
location="component://order/groovyScripts/entry/catalog/CategoryDetail.groovy"/>
+ <script
location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/CategoryDetail.groovy"/>
</actions>
<widgets>
<container>
