Merge branch 'main' into FISH-9165-update-jakarta-xml-binding-api-4.0…

….2-p6 # Conflicts: # core/pom.xml
payara · Nov 20, 2024 · 40ecd66 · 40ecd66
2 parents 9728340 + f7ac7d4
commit 40ecd66
Show file tree

Hide file tree

Showing 718 changed files with 999 additions and 934 deletions.
diff --git a/api/payara-api/pom.xml b/api/payara-api/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.core</groupId>
         <artifactId>core-parent</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.22.0-SNAPSHOT</version>
         <relativePath>../../core/core-parent</relativePath>
     </parent>
     <groupId>fish.payara.api</groupId>

diff --git a/api/payara-bom/pom.xml b/api/payara-bom/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>fish.payara.api</groupId>
         <artifactId>api-parent</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>payara-bom</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
@@ -43,7 +43,7 @@
     <parent>
         <groupId>fish.payara.server</groupId>
         <artifactId>payara-aggregator</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <groupId>fish.payara.api</groupId>

diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.core</groupId>
         <artifactId>core-parent</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.22.0-SNAPSHOT</version>
         <relativePath>../../../core/core-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/appserver/admin/backup-l10n/pom.xml b/appserver/admin/backup-l10n/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backup-l10n</artifactId>

diff --git a/appserver/admin/backup/pom.xml b/appserver/admin/backup/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backup</artifactId>

diff --git a/appserver/admin/cli-optional-l10n/pom.xml b/appserver/admin/cli-optional-l10n/pom.xml
@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>cli-optional-l10n</artifactId>
 

diff --git a/appserver/admin/cli-optional/pom.xml b/appserver/admin/cli-optional/pom.xml
@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>cli-optional</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admin/cli/pom.xml b/appserver/admin/cli/pom.xml
@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>appserver-cli</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admin/gf_template/pom.xml b/appserver/admin/gf_template/pom.xml
@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>appserver-domain</artifactId>

diff --git a/appserver/admin/gf_template_web/pom.xml b/appserver/admin/gf_template_web/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>appserver-domain-web</artifactId>

diff --git a/appserver/admin/pom.xml b/appserver/admin/pom.xml
@@ -48,7 +48,7 @@
     <parent>
         <groupId>fish.payara.server</groupId>
         <artifactId>payara-parent</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <groupId>fish.payara.server.internal.admin</groupId>
     <artifactId>admin</artifactId>

diff --git a/appserver/admin/production_domain_template/pom.xml b/appserver/admin/production_domain_template/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>production-domain</artifactId>

diff --git a/appserver/admin/production_domain_template_web/pom.xml b/appserver/admin/production_domain_template_web/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>production-domain-web</artifactId>

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin-l10n/pom.xml b/appserver/admingui/cdieventbus-notifier-console-plugin-l10n/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>cdieventbus-notifier-console-plugin-l10n</artifactId>

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin/pom.xml b/appserver/admingui/cdieventbus-notifier-console-plugin/pom.xml
@@ -43,7 +43,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>cdieventbus-notifier-console-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/...tifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf b/...tifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
@@ -1,7 +1,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
   The contents of this file are subject to the terms of either the GNU
   General Public License Version 2 only ("GPL") or the Common Development
@@ -55,7 +55,7 @@
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic", "loopback"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic", "loopback"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
@@ -66,9 +66,6 @@
         if (#{pageSession.valueMap['hazelcastEnabled']}=true) {
             setPageSessionAttribute(key="hazelcastEnabled", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -83,7 +80,6 @@
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-                        mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         mapPut(map="#{pageSession.valueMap}" key="loopBack" value="#{pageSession.loopBackSelected}");
                         mapPut(map="#{pageSession.valueMap}" key="hazelcastEnabled" value="#{pageSession.hazelcastEnabled}");
@@ -105,18 +101,17 @@
                           helpText="$resource{i18ncebn.notifier.cdieventbus.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
-                          rendered="#{pageSession.hazelcastEnabled == true}"
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
                           label="$resource{i18nn.notification.configuration.dynamic}"
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
+            </sun:property>
             <sun:property id="loopBackProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
                           label="$resource{i18ncebn.notifier.cdieventbus.configuration.loopBackEnabledLabel}"

diff --git a/appserver/admingui/cluster-l10n/pom.xml b/appserver/admingui/cluster-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-cluster-plugin-l10n</artifactId>
 

diff --git a/appserver/admingui/cluster/pom.xml b/appserver/admingui/cluster/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-cluster-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admingui/common-l10n/pom.xml b/appserver/admingui/common-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>console-common-l10n</artifactId>

diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml
@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.core</groupId>
         <artifactId>core-parent</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.22.0-SNAPSHOT</version>
         <relativePath>../../../core/core-parent</relativePath>
     </parent>
     <groupId>fish.payara.server.core.admingui</groupId>

diff --git a/appserver/admingui/concurrent-l10n/pom.xml b/appserver/admingui/concurrent-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-concurrent-plugin-l10n</artifactId>
 

diff --git a/appserver/admingui/concurrent/pom.xml b/appserver/admingui/concurrent/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-concurrent-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admingui/corba-l10n/pom.xml b/appserver/admingui/corba-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-corba-plugin-l10n</artifactId>
 

diff --git a/appserver/admingui/corba/pom.xml b/appserver/admingui/corba/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-corba-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admingui/core-l10n/pom.xml b/appserver/admingui/core-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-core-l10n</artifactId>
 

diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-core</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.core</groupId>
         <artifactId>core-parent</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.22.0-SNAPSHOT</version>
         <relativePath>../../../core/core-parent</relativePath>
     </parent>
     <groupId>fish.payara.server.core.admingui</groupId>

diff --git a/appserver/admingui/devtests/pom.xml b/appserver/admingui/devtests/pom.xml
@@ -49,7 +49,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>console-devtests</artifactId>

diff --git a/appserver/admingui/dist-fragment/pom.xml b/appserver/admingui/dist-fragment/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>dist-fragment</artifactId>

diff --git a/appserver/admingui/ejb-l10n/pom.xml b/appserver/admingui/ejb-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-ejb-plugin-l10n</artifactId>
 

diff --git a/appserver/admingui/ejb-lite-l10n/pom.xml b/appserver/admingui/ejb-lite-l10n/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-ejb-lite-plugin-l10n</artifactId>
 

diff --git a/appserver/admingui/ejb-lite/pom.xml b/appserver/admingui/ejb-lite/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-ejb-lite-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admingui/ejb/pom.xml b/appserver/admingui/ejb/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>console-ejb-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

diff --git a/appserver/admingui/eventbus-notifier-console-plugin-l10n/pom.xml b/appserver/admingui/eventbus-notifier-console-plugin-l10n/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>eventbus-notifier-console-plugin-l10n</artifactId>

diff --git a/appserver/admingui/eventbus-notifier-console-plugin/pom.xml b/appserver/admingui/eventbus-notifier-console-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2024.11-SNAPSHOT</version>
+        <version>6.2024.12-SNAPSHOT</version>
     </parent>
     <artifactId>eventbus-notifier-console-plugin</artifactId>
     <packaging>glassfish-jar</packaging>