Merge pull request #7053 from Pandrex247/FISH-10090-Payara7-Sync

FISH-10090 Resync with Main 11/11/2024
payara · Nov 11, 2024 · b7b5a37 · b7b5a37
2 parents c954bcb + 2af2e2a
commit b7b5a37
Show file tree

Hide file tree

Showing 64 changed files with 1,527 additions and 344 deletions.
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/...bus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf b/...bus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
@@ -1,5 +1,5 @@
 <!--
-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
@@ -53,14 +53,11 @@ holder.
                 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"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -86,7 +83,6 @@ holder.
                         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}");
                         prepareSuccessfulMsg();
                         gf.updateEntity(endpoint="#{sessionScope.NOTIFICATION_CONFIG_URL}/set-eventbus-notifier-configuration" 
@@ -105,16 +101,16 @@ holder.
                           helpText="$resource{i18nebn.notifier.eventbus.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
-                          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}" 
                           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="topicNameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabel}"
                           helpText="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabelHelpText}">

diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright 2024 Payara Foundation and/or affiliates
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail-Sessions
@@ -58,11 +59,11 @@ javaMail.Session=Session:
 javaMail.storeProtocol=Speicherprotokoll:
 javaMail.storeProtocolHelp=Entweder IMAP oder POP3. IMAP ist der Standardwert
 javaMail.storeClass=Speicherprotokollklasse:
-javaMail.storeClassHelp=Der Standard lautet com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=Der Standard lautet org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=Transportprotokoll:
 javaMail.transportProtocolHelp=Der Standard lautet SMTP
 javaMail.transProtocolClass=Transportprotokollklasse:
-javaMail.transProtocolClassHelp=Der Standard lautet com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=Der Standard lautet org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=Debugging:
 javaMail.DebugHelp=Aktivieren Sie das Kontrollk\u00e4stchen "Debugging", um die zus\u00e4tzliche Debugging-Ausgabe f\u00fcr diese Mailsession zu aktivieren, einschlie\u00dflich eines Protokolltrace. 
 

diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_es.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_es.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=Sesiones JavaMail
@@ -58,11 +59,11 @@ javaMail.Session=Sesi\u00f3n:
 javaMail.storeProtocol=Protocolo de Almacenamiento:
 javaMail.storeProtocolHelp=IMAP o POP3; el valor por defecto es IMAP
 javaMail.storeClass=Clase de Protocolo de Almacenamiento:
-javaMail.storeClassHelp=El valor por defecto es com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=El valor por defecto es org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=Protocolo de Transporte:
 javaMail.transportProtocolHelp=El valor por defecto es SMTP
 javaMail.transProtocolClass=Clase de Protocolo de Transporte:
-javaMail.transProtocolClassHelp=El valor por defecto es com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=El valor por defecto es org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=Depurar:
 javaMail.DebugHelp=Active la casilla de control Depurar para activar una salida de depuraci\u00f3n adicional para esta sesi\u00f3n de correo, incluido un rastreo de protocolo. 
 

diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_fr.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_fr.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=Sessions JavaMail
@@ -58,11 +59,11 @@ javaMail.Session=Session :
 javaMail.storeProtocol=Protocole de stockage :
 javaMail.storeProtocolHelp=IMAP ou POP3 ; la valeur par d\u00e9faut est IMAP
 javaMail.storeClass=Classe de protocole de stockage :
-javaMail.storeClassHelp=La valeur par d\u00e9faut est com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=La valeur par d\u00e9faut est org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=Protocole de transport :
 javaMail.transportProtocolHelp=La valeur par d\u00e9faut est SMTP
 javaMail.transProtocolClass=Classe de protocole de transport :
-javaMail.transProtocolClassHelp=La valeur par d\u00e9faut est com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=La valeur par d\u00e9faut est org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=D\u00e9boguer :
 javaMail.DebugHelp=Cochez la case D\u00e9boguer afin d'activer une sortie de d\u00e9bogage suppl\u00e9mentaire pour cette session de messagerie, notamment une trace de protocole. 
 

diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_it.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_it.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=Sessioni JavaMail
@@ -58,11 +59,11 @@ javaMail.Session=Sessione:
 javaMail.storeProtocol=Protocollo di memorizzazione:
 javaMail.storeProtocolHelp=IMAP o POP3 (predefinito IMAP)
 javaMail.storeClass=Classe protocollo di memorizzazione:
-javaMail.storeClassHelp=Valore predefinito: com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=Valore predefinito: org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=Protocollo di trasporto:
 javaMail.transportProtocolHelp=Predefinito: SMTP
 javaMail.transProtocolClass=Classe protocollo di trasporto:
-javaMail.transProtocolClassHelp=Valore predefinito: com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=Valore predefinito: org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=Debug:
 javaMail.DebugHelp=Selezionare la casella di controllo Debug per abilitare dell'output di debug aggiuntivo per la sessione di posta, incluso un trace del protocollo. 
 

diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ja.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ja.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail\u30bb\u30c3\u30b7\u30e7\u30f3
@@ -58,11 +59,11 @@ javaMail.Session=\u30bb\u30c3\u30b7\u30e7\u30f3:
 javaMail.storeProtocol=\u30b9\u30c8\u30a2\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb:
 javaMail.storeProtocolHelp=IMAP\u307e\u305f\u306fPOP3; \u30c7\u30d5\u30a9\u30eb\u30c8\u306fIMAP\u3067\u3059
 javaMail.storeClass=\u30b9\u30c8\u30a2\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb\u30fb\u30af\u30e9\u30b9:
-javaMail.storeClassHelp=\u30c7\u30d5\u30a9\u30eb\u30c8\u306fcom.sun.mail.imap.IMAPStore\u3067\u3059
+javaMail.storeClassHelp=\u30c7\u30d5\u30a9\u30eb\u30c8\u306forg.eclipse.angus.mail.imap.IMAPStore\u3067\u3059
 javaMail.transportProtocol=\u8ee2\u9001\u30d7\u30ed\u30c8\u30b3\u30eb:
 javaMail.transportProtocolHelp=\u30c7\u30d5\u30a9\u30eb\u30c8\u306fSMTP\u3067\u3059
 javaMail.transProtocolClass=\u8ee2\u9001\u30d7\u30ed\u30c8\u30b3\u30eb\u30fb\u30af\u30e9\u30b9:
-javaMail.transProtocolClassHelp=\u30c7\u30d5\u30a9\u30eb\u30c8\u306fcom.sun.mail.smtp.SMTPTransport\u3067\u3059
+javaMail.transProtocolClassHelp=\u30c7\u30d5\u30a9\u30eb\u30c8\u306forg.eclipse.angus.mail.smtp.SMTPTransport\u3067\u3059
 javaMail.Debug=\u30c7\u30d0\u30c3\u30b0:
 javaMail.DebugHelp=\u3053\u306e\u30e1\u30fc\u30eb\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306b\u5bfe\u3057\u3066\u3001\u30d7\u30ed\u30c8\u30b3\u30eb\u30fb\u30c8\u30ec\u30fc\u30b9\u306a\u3069\u306e\u8ffd\u52a0\u306e\u30c7\u30d0\u30c3\u30b0\u51fa\u529b\u3092\u6709\u52b9\u306b\u3059\u308b\u5834\u5408\u306f\u300c\u30c7\u30d0\u30c3\u30b0\u300d\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u9078\u629e\u3057\u307e\u3059\u3002
 

diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ko.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ko.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail \uc138\uc158
@@ -58,11 +59,11 @@ javaMail.Session=\uc138\uc158:
 javaMail.storeProtocol=\uc800\uc7a5\uc18c \ud504\ub85c\ud1a0\ucf5c:
 javaMail.storeProtocolHelp=IMAP \ub610\ub294 POP3\uc785\ub2c8\ub2e4. \uae30\ubcf8\uac12\uc740 IMAP\uc785\ub2c8\ub2e4.
 javaMail.storeClass=\uc800\uc7a5\uc18c \ud504\ub85c\ud1a0\ucf5c \ud074\ub798\uc2a4:
-javaMail.storeClassHelp=\uae30\ubcf8\uac12\uc740 com.sun.mail.imap.IMAPStore\uc785\ub2c8\ub2e4.
+javaMail.storeClassHelp=\uae30\ubcf8\uac12\uc740 org.eclipse.angus.mail.imap.IMAPStore\uc785\ub2c8\ub2e4.
 javaMail.transportProtocol=\uc804\uc1a1 \ud504\ub85c\ud1a0\ucf5c:
 javaMail.transportProtocolHelp=\uae30\ubcf8\uac12\uc740 SMTP\uc785\ub2c8\ub2e4.
 javaMail.transProtocolClass=\uc804\uc1a1 \ud504\ub85c\ud1a0\ucf5c \ud074\ub798\uc2a4:
-javaMail.transProtocolClassHelp=\uae30\ubcf8\uac12\uc740 com.sun.mail.smtp.SMTPTransport\uc785\ub2c8\ub2e4.
+javaMail.transProtocolClassHelp=\uae30\ubcf8\uac12\uc740 org.eclipse.angus.mail.smtp.SMTPTransport\uc785\ub2c8\ub2e4.
 javaMail.Debug=\ub514\ubc84\uadf8:
 javaMail.DebugHelp=\uc774 \uba54\uc77c \uc138\uc158\uc5d0 \ub300\ud574 \ud504\ub85c\ud1a0\ucf5c \ucd94\uc801\uc744 \ube44\ub86f\ud55c \ucd94\uac00 \ub514\ubc84\uae45 \ucd9c\ub825\uc744 \uc0ac\uc6a9\uc73c\ub85c \uc124\uc815\ud558\ub824\uba74 [\ub514\ubc84\uadf8] \uccb4\ud06c \ubc15\uc2a4\ub97c \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624. 
 

diff --git a/...dmingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_pt_BR.properties b/...dmingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_pt_BR.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=Sess\u00f5es JavaMail
@@ -58,11 +59,11 @@ javaMail.Session=Sess\u00e3o:
 javaMail.storeProtocol=Protocolo de Armazenamento:
 javaMail.storeProtocolHelp=IMAP ou POP3; o default \u00e9 IMAP
 javaMail.storeClass=Classe do Protocolo de Armazenamento:
-javaMail.storeClassHelp=O default \u00e9 com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=O default \u00e9 org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=Protocolo de Transporte:
 javaMail.transportProtocolHelp=O default \u00e9 SMTP
 javaMail.transProtocolClass=Classe do Protocolo de Transporte:
-javaMail.transProtocolClassHelp=O default \u00e9 com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=O default \u00e9 org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=Depurar:
 javaMail.DebugHelp=Marque a caixa de sele\u00e7\u00e3o Depurar para ativar a sa\u00edda de depura\u00e7\u00e3o extra desta sess\u00e3o de correio, incluindo rastreamento de protocolo. 
 

diff --git a/...dmingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_CN.properties b/...dmingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_CN.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail \u4f1a\u8bdd
@@ -58,11 +59,11 @@ javaMail.Session=\u4f1a\u8bdd:
 javaMail.storeProtocol=\u5b58\u50a8\u534f\u8bae:
 javaMail.storeProtocolHelp=IMAP \u6216 POP3; \u9ed8\u8ba4\u4e3a IMAP
 javaMail.storeClass=\u5b58\u50a8\u534f\u8bae\u7c7b:
-javaMail.storeClassHelp=\u9ed8\u8ba4\u503c\u4e3a com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=\u9ed8\u8ba4\u503c\u4e3a org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=\u4f20\u8f93\u534f\u8bae:
 javaMail.transportProtocolHelp=\u9ed8\u8ba4\u4e3a SMTP
 javaMail.transProtocolClass=\u4f20\u8f93\u534f\u8bae\u7c7b:
-javaMail.transProtocolClassHelp=\u9ed8\u8ba4\u503c\u4e3a com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=\u9ed8\u8ba4\u503c\u4e3a org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=\u8c03\u8bd5:
 javaMail.DebugHelp=\u9009\u4e2d\u201c\u8c03\u8bd5\u201d\u590d\u9009\u6846, \u4e3a\u6b64\u90ae\u4ef6\u4f1a\u8bdd\u542f\u7528\u9644\u52a0\u8c03\u8bd5\u8f93\u51fa (\u5305\u542b\u534f\u8bae\u8ddf\u8e2a)\u3002
 

diff --git a/...dmingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_TW.properties b/...dmingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_TW.properties
@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright [2024] [Payara Foundation and/or affiliates]
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail \u968e\u6bb5\u4f5c\u696d
@@ -58,11 +59,11 @@ javaMail.Session=\u968e\u6bb5\u4f5c\u696d\uff1a
 javaMail.storeProtocol=\u5132\u5b58\u5354\u5b9a\uff1a
 javaMail.storeProtocolHelp=IMAP \u6216 POP3\uff1b\u9810\u8a2d\u70ba IMAP
 javaMail.storeClass=\u5132\u5b58\u5354\u5b9a\u985e\u5225\uff1a
-javaMail.storeClassHelp=\u9810\u8a2d\u70ba com.sun.mail.imap.IMAPStore
+javaMail.storeClassHelp=\u9810\u8a2d\u70ba org.eclipse.angus.mail.imap.IMAPStore
 javaMail.transportProtocol=\u50b3\u8f38\u5354\u5b9a\uff1a
 javaMail.transportProtocolHelp=\u9810\u8a2d\u70ba SMTP
 javaMail.transProtocolClass=\u50b3\u8f38\u5354\u5b9a\u985e\u5225\uff1a
-javaMail.transProtocolClassHelp=\u9810\u8a2d\u70ba com.sun.mail.smtp.SMTPTransport
+javaMail.transProtocolClassHelp=\u9810\u8a2d\u70ba org.eclipse.angus.mail.smtp.SMTPTransport
 javaMail.Debug=\u9664\u932f\uff1a
 javaMail.DebugHelp=\u9078\u53d6\u300c\u9664\u932f\u300d\u6838\u53d6\u65b9\u584a\u53ef\u70ba\u6b64\u90f5\u4ef6\u968e\u6bb5\u4f5c\u696d\u555f\u7528\u984d\u5916\u7684\u9664\u932f\u8f38\u51fa\u529f\u80fd\uff0c\u5305\u62ec\u5354\u5b9a\u8ffd\u8e64\u3002