This is an automated email from the ASF dual-hosted git repository. jleroux 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 a40e38ab2 Improved: Plugins - add mainMenuLocation to web.xml (OFBIZ-12948) (#93) a40e38ab2 is described below commit a40e38ab2b696bc1ac31f78b480845144accd225 Author: Pierre Smits <pierre.sm...@somonar.com> AuthorDate: Tue Mar 19 18:08:30 2024 +0100 Improved: Plugins - add mainMenuLocation to web.xml (OFBIZ-12948) (#93) Add the mainMenuLocation to the web.xml file of various plugins modified: - assetmaint/web.xml - ismgr/web.xml - bi/web/web.xml - birt/web.xml - ebay/web.xml - ebaystore/web.xml - example/web.xml - exampleext/web.xml - firstpaymentgateway/web.xml - lucene/web.xml - msggateway/web.xml - pricat/web.xml - pricatdemo/web.xml - projectmgr/web.xml - scrum/web.xml - solr/web.xml - webpos/web.xml --- assetmaint/webapp/assetmaint/WEB-INF/web.xml | 5 +++++ assetmaint/webapp/ismgr/WEB-INF/web.xml | 5 +++++ bi/webapp/bi/WEB-INF/web.xml | 5 +++++ birt/webapp/birt/WEB-INF/web.xml | 5 +++++ ebay/webapp/ebay/WEB-INF/web.xml | 5 +++++ ebaystore/webapp/ebaystore/WEB-INF/web.xml | 5 +++++ example/webapp/example/WEB-INF/web.xml | 5 +++++ exampleext/webapp/exampleext/WEB-INF/web.xml | 5 +++++ firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml | 5 +++++ lucene/webapp/content/WEB-INF/web.xml | 5 +++++ msggateway/webapp/msggateway/WEB-INF/web.xml | 5 +++++ myportal/webapp/myportal/WEB-INF/web.xml | 5 +++++ pricat/webapp/pricat/WEB-INF/web.xml | 5 +++++ pricat/webapp/pricatdemo/WEB-INF/web.xml | 5 +++++ projectmgr/webapp/projectmgr/WEB-INF/web.xml | 5 +++++ scrum/webapp/scrum/WEB-INF/web.xml | 5 +++++ solr/webapp/solr/WEB-INF/web.xml | 5 +++++ webpos/webapp/webpos/WEB-INF/web.xml | 5 +++++ 18 files changed, 90 insertions(+) diff --git a/assetmaint/webapp/assetmaint/WEB-INF/web.xml b/assetmaint/webapp/assetmaint/WEB-INF/web.xml index c54ffe483..f230b8a00 100644 --- a/assetmaint/webapp/assetmaint/WEB-INF/web.xml +++ b/assetmaint/webapp/assetmaint/WEB-INF/web.xml @@ -58,6 +58,11 @@ <param-name>partyDecoratorLocation</param-name> <param-value>component://accounting/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://assetmaint/widget/AssetMaintMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/assetmaint/webapp/ismgr/WEB-INF/web.xml b/assetmaint/webapp/ismgr/WEB-INF/web.xml index 6eae43dc4..0141e5952 100644 --- a/assetmaint/webapp/ismgr/WEB-INF/web.xml +++ b/assetmaint/webapp/ismgr/WEB-INF/web.xml @@ -53,6 +53,11 @@ <param-name>fixedAssetMaintDecoratorLocation</param-name> <param-value>component://assetmaint/widget/ismgr/AssetmaintScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://assetmaint/widget/ismgr/Menus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/bi/webapp/bi/WEB-INF/web.xml b/bi/webapp/bi/WEB-INF/web.xml index 71ca0ca83..7e46eeb99 100644 --- a/bi/webapp/bi/WEB-INF/web.xml +++ b/bi/webapp/bi/WEB-INF/web.xml @@ -38,6 +38,11 @@ <param-name>mainDecoratorLocation</param-name> <param-value>component://bi/widget/BiScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://bi/widget/BiMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/birt/webapp/birt/WEB-INF/web.xml b/birt/webapp/birt/WEB-INF/web.xml index 36848e95c..a057fa238 100644 --- a/birt/webapp/birt/WEB-INF/web.xml +++ b/birt/webapp/birt/WEB-INF/web.xml @@ -35,6 +35,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://birt/widget/birt/BirtScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://birt/widget/birt/BirtMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/ebay/webapp/ebay/WEB-INF/web.xml b/ebay/webapp/ebay/WEB-INF/web.xml index 850f34571..a4ded6b17 100644 --- a/ebay/webapp/ebay/WEB-INF/web.xml +++ b/ebay/webapp/ebay/WEB-INF/web.xml @@ -43,6 +43,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://ebay/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://ebay/widget/EbayMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/ebaystore/webapp/ebaystore/WEB-INF/web.xml b/ebaystore/webapp/ebaystore/WEB-INF/web.xml index 683abc2ac..bf79c14a9 100644 --- a/ebaystore/webapp/ebaystore/WEB-INF/web.xml +++ b/ebaystore/webapp/ebaystore/WEB-INF/web.xml @@ -43,6 +43,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://ebaystore/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://ebaystore/widget/EbayStoreMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/example/webapp/example/WEB-INF/web.xml b/example/webapp/example/WEB-INF/web.xml index c5ebc4801..ee18ab186 100644 --- a/example/webapp/example/WEB-INF/web.xml +++ b/example/webapp/example/WEB-INF/web.xml @@ -36,6 +36,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://example/widget/example/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://example/widget/example/ExampleMenus.xml</param-value> + </context-param> <context-param> <description>Remove unnecessary whitespace from HTML output.</description> <param-name>compressHTML</param-name> diff --git a/exampleext/webapp/exampleext/WEB-INF/web.xml b/exampleext/webapp/exampleext/WEB-INF/web.xml index 4d8558d06..28f882a1e 100644 --- a/exampleext/webapp/exampleext/WEB-INF/web.xml +++ b/exampleext/webapp/exampleext/WEB-INF/web.xml @@ -36,6 +36,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://exampleext/widget/example/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://exampleext/widget/example/ExampleMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml b/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml index db50d5687..46c99e976 100644 --- a/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml +++ b/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml @@ -40,6 +40,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://firstdatapaymentgateway/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://firstdatapaymentgateway/widget/FirstDataMenus.xml</param-value> + </context-param> <context-param> <description>Remove unnecessary whitespace from HTML output.</description> <param-name>compressHTML</param-name> diff --git a/lucene/webapp/content/WEB-INF/web.xml b/lucene/webapp/content/WEB-INF/web.xml index a0ce57de3..82e5ccd6e 100644 --- a/lucene/webapp/content/WEB-INF/web.xml +++ b/lucene/webapp/content/WEB-INF/web.xml @@ -46,6 +46,11 @@ under the License. <param-name>cmsDecoratorLocation</param-name> <param-value>component://lucene/widget/LuceneScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://lucene/widget/LuceneMenus.xml</param-value> + </context-param> <context-param> <description>Remove unnecessary whitespace from HTML output.</description> <param-name>compressHTML</param-name> diff --git a/msggateway/webapp/msggateway/WEB-INF/web.xml b/msggateway/webapp/msggateway/WEB-INF/web.xml index f2bb225a7..d96ea6c93 100644 --- a/msggateway/webapp/msggateway/WEB-INF/web.xml +++ b/msggateway/webapp/msggateway/WEB-INF/web.xml @@ -40,6 +40,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://msggateway/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://msggateway/widget/MsgGatewayMenus.xml</param-value> + </context-param> <context-param> <description>Remove unnecessary whitespace from HTML output.</description> <param-name>compressHTML</param-name> diff --git a/myportal/webapp/myportal/WEB-INF/web.xml b/myportal/webapp/myportal/WEB-INF/web.xml index 1ac2fbfee..4e909363a 100644 --- a/myportal/webapp/myportal/WEB-INF/web.xml +++ b/myportal/webapp/myportal/WEB-INF/web.xml @@ -38,6 +38,11 @@ <param-name>mainDecoratorLocation</param-name> <param-value>component://myportal/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://myportal/widget/MyPortalMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/pricat/webapp/pricat/WEB-INF/web.xml b/pricat/webapp/pricat/WEB-INF/web.xml index 7eed7140f..ee43a5f1c 100644 --- a/pricat/webapp/pricat/WEB-INF/web.xml +++ b/pricat/webapp/pricat/WEB-INF/web.xml @@ -36,6 +36,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://pricat/widget/SampleScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://pricat/widget/PriCatMenus.xml</param-value> + </context-param> <context-param> <description>Remove unnecessary whitespace from HTML output.</description> <param-name>compressHTML</param-name> diff --git a/pricat/webapp/pricatdemo/WEB-INF/web.xml b/pricat/webapp/pricatdemo/WEB-INF/web.xml index 23851530c..a56919899 100644 --- a/pricat/webapp/pricatdemo/WEB-INF/web.xml +++ b/pricat/webapp/pricatdemo/WEB-INF/web.xml @@ -36,6 +36,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://pricat/widget/SampleScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://pricat/widget/PriCatDemoMenus.xml</param-value> + </context-param> <context-param> <description>Remove unnecessary whitespace from HTML output.</description> <param-name>compressHTML</param-name> diff --git a/projectmgr/webapp/projectmgr/WEB-INF/web.xml b/projectmgr/webapp/projectmgr/WEB-INF/web.xml index fe92d9791..274afc9fd 100644 --- a/projectmgr/webapp/projectmgr/WEB-INF/web.xml +++ b/projectmgr/webapp/projectmgr/WEB-INF/web.xml @@ -37,6 +37,11 @@ <param-name>mainDecoratorLocation</param-name> <param-value>component://projectmgr/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://projectmgr/widget/ProjectMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/scrum/webapp/scrum/WEB-INF/web.xml b/scrum/webapp/scrum/WEB-INF/web.xml index eb8282539..09384e9f8 100644 --- a/scrum/webapp/scrum/WEB-INF/web.xml +++ b/scrum/webapp/scrum/WEB-INF/web.xml @@ -34,6 +34,11 @@ under the License. <param-name>mainDecoratorLocation</param-name> <param-value>component://scrum/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://scrum/widget/scrumMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name> diff --git a/solr/webapp/solr/WEB-INF/web.xml b/solr/webapp/solr/WEB-INF/web.xml index d911ceb38..9a0912f01 100644 --- a/solr/webapp/solr/WEB-INF/web.xml +++ b/solr/webapp/solr/WEB-INF/web.xml @@ -35,6 +35,11 @@ <param-value>component://solr/widget/CommonScreens.xml</param-value> <!-- The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. --> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://solr/widget/SolrMenus.xml</param-value> + </context-param> <context-param> <param-name>partyDecoratorLocation</param-name> <param-value>component://content/widget/CommonScreens.xml</param-value> diff --git a/webpos/webapp/webpos/WEB-INF/web.xml b/webpos/webapp/webpos/WEB-INF/web.xml index 9bceec6b3..6878882fb 100644 --- a/webpos/webapp/webpos/WEB-INF/web.xml +++ b/webpos/webapp/webpos/WEB-INF/web.xml @@ -42,6 +42,11 @@ <param-name>mainDecoratorLocation</param-name> <param-value>component://webpos/widget/CommonScreens.xml</param-value> </context-param> + <context-param> + <description>The location of the menus file to be used in this webapp; referred to as a context variable in screen def XML files.</description> + <param-name>mainMenuLocation</param-name> + <param-value>component://webpos/widget/WebPosMenus.xml</param-value> + </context-param> <filter> <display-name>ControlFilter</display-name>