diff --git a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties
index ec9ac0b603d..2c55db4af53 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties
+++ b/appserver/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_es.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_es.properties
index 901e385fdb5..00805c3bd32 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_es.properties
+++ b/appserver/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_fr.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_fr.properties
index 78e5772d1f8..39f9f3cf560 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_fr.properties
+++ b/appserver/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_it.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_it.properties
index 1efe7d6bb71..e267e4c832b 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_it.properties
+++ b/appserver/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ja.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ja.properties
index 8a96a2cd6d0..503bd5eed53 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ja.properties
+++ b/appserver/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ko.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ko.properties
index ffe2ab86292..9e901f76a4f 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_ko.properties
+++ b/appserver/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_pt_BR.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_pt_BR.properties
index 003a5d7c200..70d43d49961 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_pt_BR.properties
+++ b/appserver/admingui/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_CN.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_CN.properties
index 654ecb6ec61..4c0e64fac60 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_CN.properties
+++ b/appserver/admingui/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/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_TW.properties b/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_TW.properties
index 1d81775354b..20489892508 100644
--- a/appserver/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_zh_TW.properties
+++ b/appserver/admingui/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
diff --git a/appserver/admingui/full/src/main/help/en/help/ref-javamailsessioncreate.html b/appserver/admingui/full/src/main/help/en/help/ref-javamailsessioncreate.html
index ab37de09575..c5d7a3fa0dd 100644
--- a/appserver/admingui/full/src/main/help/en/help/ref-javamailsessioncreate.html
+++ b/appserver/admingui/full/src/main/help/en/help/ref-javamailsessioncreate.html
@@ -1,7 +1,7 @@
-
@@ -58,19 +57,19 @@ New JavaMail Session
The service provider implementation class for storage. Allowed values are:
-
-
com.sun.mail.imap.IMAPStore
+ org.eclipse.angus.mail.imap.IMAPStore
-
-
com.sun.mail.pop3.POP3Store
+ org.eclipse.angus.mail.pop3.POP3Store
-
-
com.sun.mail.imap.IMAPSSLStore
+ org.eclipse.angus.mail.imap.IMAPSSLStore
-
-
com.sun.mail.pop3.POP3SSLStore
+ org.eclipse.angus.mail.pop3.POP3SSLStore
-The default value is com.sun.mail.imap.IMAPStore.
+ The default value is org.eclipse.angus.mail.imap.IMAPStore.
Transport Protocol
@@ -81,13 +80,13 @@ New JavaMail Session
The service provider implementation class for transport. Allowed values are:
-
-
com.sun.mail.smtp.SMTPTransport
+ org.eclipse.angus.mail.smtp.SMTPTransport
-
-
com.sun.mail.smtp.SMTPSSLTransport
+ org.eclipse.angus.mail.smtp.SMTPSSLTransport
-The default value is com.sun.mail.smtp.SMTPTransport.
+ The default value is org.eclipse.angus.mail.smtp.SMTPTransport.
Debug
diff --git a/appserver/admingui/full/src/main/help/en/help/ref-javamailsessionsedit.html b/appserver/admingui/full/src/main/help/en/help/ref-javamailsessionsedit.html
index bd283be320a..3becf8d0020 100644
--- a/appserver/admingui/full/src/main/help/en/help/ref-javamailsessionsedit.html
+++ b/appserver/admingui/full/src/main/help/en/help/ref-javamailsessionsedit.html
@@ -1,7 +1,7 @@
-
@@ -68,19 +67,19 @@ Edit JavaMail Session
The service provider implementation class for storage. Allowed values are:
-
-
com.sun.mail.imap.IMAPStore
+ org.eclipse.angus.mail.imap.IMAPStore
-
-
com.sun.mail.pop3.POP3Store
+ org.eclipse.angus.mail.pop3.POP3Store
-
-
com.sun.mail.imap.IMAPSSLStore
+ org.eclipse.angus.mail.imap.IMAPSSLStore
-
-
com.sun.mail.pop3.POP3SSLStore
+ org.eclipse.angus.mail.pop3.POP3SSLStore
-The default value is com.sun.mail.imap.IMAPStore.
+ The default value is org.eclipse.angus.mail.imap.IMAPStore.
Transport Protocol
@@ -91,13 +90,13 @@ Edit JavaMail Session
The service provider implementation class for transport. Allowed values are:
-
-
com.sun.mail.smtp.SMTPTransport
+ org.eclipse.angus.mail.smtp.SMTPTransport
-
-
com.sun.mail.smtp.SMTPSSLTransport
+ org.eclipse.angus.mail.smtp.SMTPSSLTransport
-The default value is com.sun.mail.smtp.SMTPTransport.
+ The default value is org.eclipse.angus.mail.smtp.SMTPTransport.
Debug
diff --git a/appserver/admingui/full/src/main/help/en/help/task-javamailsessioncreate.html b/appserver/admingui/full/src/main/help/en/help/task-javamailsessioncreate.html
index d9b7b88c740..f4d5f78a53c 100644
--- a/appserver/admingui/full/src/main/help/en/help/task-javamailsessioncreate.html
+++ b/appserver/admingui/full/src/main/help/en/help/task-javamailsessioncreate.html
@@ -1,7 +1,7 @@
-
+
@@ -171,7 +171,7 @@ create-javamail-resource
--storeprotocolclass
The mail server store protocol class name. The default is
-com.sun.mail.imap.IMAPStore. Change this value only if you have
+ org.eclipse.angus.mail.imap.IMAPStore. Change this value only if you have
reconfigured the \{product---name}'s mail provider to use a nondefault
store protocol.
@@ -184,7 +184,7 @@ create-javamail-resource
--transprotocolclass
The mail server transport protocol class name. The default is
-com.sun.mail.smtp.SMTPTransport. Change this value only if you have
+ org.eclipse.angus.mail.smtp.SMTPTransport. Change this value only if you have
reconfigured the \{product---name}'s mail provider to use a nondefault
transport protocol.
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
index 4b1fddffa6c..de747fef4a2 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright [2019-2020] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2019-2024] [Payara Foundation and/or its affiliates]
package org.glassfish.appclient.client.jws.boot;
import java.io.File;
@@ -208,8 +208,8 @@ public URL[] locateDownloadedJars() throws
"com.sun.enterprise.deployment.client.DeploymentClientUtils," /* appserv-deployment-client */ +
"jakarta.ejb.EJB," /* jakarta ee */ +
"jakarta.security.auth.message.module.ServerAuthModule," /* jaspic-api */ +
- "com.sun.appserv.management.ext.logging.LogAnalyzer," /* appserv-ext */ +
- "com.sun.mail.iap.Argument," /* mail */ +
+ "com.sun.appserv.management.ext.logging.LogAnalyzer," /* appserv-ext */ +
+ "org.eclipse.angus.mail.iap.Argument," /* mail */ +
"com.sun.activation.viewers.ImageViewer," /* activation */ +
"com.sun.xml.ws.api.server.WSEndpoint," /* webservices-rt */ +
"com.sun.tools.ws.wsdl.parser.W3CAddressingExtensionHandler," /* webservices-tools */ +
diff --git a/appserver/connectors/admin/src/main/manpages/org/glassfish/connectors/admin/cli/create-javamail-resource.1 b/appserver/connectors/admin/src/main/manpages/org/glassfish/connectors/admin/cli/create-javamail-resource.1
index 7dc888d3ab3..b1212f6727e 100644
--- a/appserver/connectors/admin/src/main/manpages/org/glassfish/connectors/admin/cli/create-javamail-resource.1
+++ b/appserver/connectors/admin/src/main/manpages/org/glassfish/connectors/admin/cli/create-javamail-resource.1
@@ -60,7 +60,7 @@ OPTIONS
--storeprotocolclass
The mail server store protocol class name. The default is
- com.sun.mail.imap.IMAPStore. Change this value only if you have
+ org.eclipse.angus.mail.imap.IMAPStore. Change this value only if you have
reconfigured the GlassFish Server's mail provider to use a
nondefault store protocol.
@@ -71,7 +71,7 @@ OPTIONS
--transprotocolclass
The mail server transport protocol class name. The default is
- com.sun.mail.smtp.SMTPTransport. Change this value only if you have
+ org.eclipse.angus.mail.smtp.SMTPTransport. Change this value only if you have
reconfigured the GlassFish Server's mail provider to use a
nondefault transport protocol.
diff --git a/appserver/connectors/descriptors/src/main/resources/glassfish/lib/dtds/payara-resources_1_8.dtd b/appserver/connectors/descriptors/src/main/resources/glassfish/lib/dtds/payara-resources_1_8.dtd
new file mode 100644
index 00000000000..17e351f4fac
--- /dev/null
+++ b/appserver/connectors/descriptors/src/main/resources/glassfish/lib/dtds/payara-resources_1_8.dtd
@@ -0,0 +1,1095 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/appserver/registration/glassfish-registration/src/main/java/com/sun/enterprise/registration/glassfish/ModuleMap.java b/appserver/registration/glassfish-registration/src/main/java/com/sun/enterprise/registration/glassfish/ModuleMap.java
index f9f753a7701..898269ed028 100644
--- a/appserver/registration/glassfish-registration/src/main/java/com/sun/enterprise/registration/glassfish/ModuleMap.java
+++ b/appserver/registration/glassfish-registration/src/main/java/com/sun/enterprise/registration/glassfish/ModuleMap.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates]
package com.sun.enterprise.registration.glassfish;
@@ -89,7 +89,7 @@ public class ModuleMap {
put("com.sun.jersey.jersey-grizzly", 30);
put("com.sun.jersey.jersey-json", 31);
put("org.glassfish.jsftemplating", 32);
- put("com.sun.mail.jakarta.mail", 33);
+ put("org.eclipse.angus.mail.jakarta.mail", 33);
put("com.sun.pkg.client", 34);
put("com.sun.xml.bind.jaxb-osgi", 35);
put("commonj.sdo", 36);
diff --git a/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResource.java b/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResource.java
index 13513e43bef..7b63181c09c 100644
--- a/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResource.java
+++ b/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResource.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*
- * Portions Copyright [2017-2021] Payara Foundation and/or its affiliates
+ * Portions Copyright [2017-2024] Payara Foundation and/or its affiliates
*/
package org.glassfish.resources.javamail.admin.cli;
@@ -105,13 +105,13 @@ public class CreateJavaMailResource implements AdminCommand {
@Param(name="storeprotocol", optional=true, defaultValue="imap", alias="storeProtocol")
private String storeProtocol;
- @Param(name="storeprotocolclass", optional=true, defaultValue="com.sun.mail.imap.IMAPStore", alias="storeProtocolClass")
+ @Param(name = "storeprotocolclass", optional = true, defaultValue = "org.eclipse.angus.mail.imap.IMAPStore", alias = "storeProtocolClass")
private String storeProtocolClass;
@Param(name="transprotocol", optional=true, defaultValue="smtp", alias="transportProtocol")
private String transportProtocol;
- @Param(name="transprotocolclass", optional=true, defaultValue="com.sun.mail.smtp.SMTPTransport", alias="transportProtocolClass")
+ @Param(name = "transprotocolclass", optional = true, defaultValue = "org.eclipse.angus.mail.smtp.SMTPTransport", alias = "transportProtocolClass")
private String transportProtocolClass;
@Param(optional=true, defaultValue="true")
diff --git a/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/config/MailResource.java b/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/config/MailResource.java
index 93e8a6af3d9..21d7e99b2c3 100644
--- a/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/config/MailResource.java
+++ b/appserver/resources/javamail/javamail-connector/src/main/java/org/glassfish/resources/javamail/config/MailResource.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*
- * Portions Copyright [2017-2021] Payara Foundation and/or affiliates
+ * Portions Copyright [2017-2024] Payara Foundation and/or affiliates
*/
package org.glassfish.resources.javamail.config;
@@ -109,7 +109,7 @@ public interface MailResource extends ConfigBeanProxy, Resource, PropertyBag, Bi
* @return possible object is
* {@link String }
*/
- @Attribute (defaultValue="com.sun.mail.imap.IMAPStore")
+ @Attribute(defaultValue = "org.eclipse.angus.mail.imap.IMAPStore")
@JavaClassName
public String getStoreProtocolClass();
@@ -146,7 +146,7 @@ public interface MailResource extends ConfigBeanProxy, Resource, PropertyBag, Bi
* @return possible object is
* {@link String }
*/
- @Attribute (defaultValue="com.sun.mail.smtp.SMTPTransport")
+ @Attribute(defaultValue = "org.eclipse.angus.mail.smtp.SMTPTransport")
@JavaClassName
public String getTransportProtocolClass();
diff --git a/appserver/resources/javamail/javamail-connector/src/test/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResourceTest.java b/appserver/resources/javamail/javamail-connector/src/test/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResourceTest.java
index 106efbec215..4377d2b2545 100644
--- a/appserver/resources/javamail/javamail-connector/src/test/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResourceTest.java
+++ b/appserver/resources/javamail/javamail-connector/src/test/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResourceTest.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*
- * Portions Copyright [2017-2019] [Payara Foundation and/or its affiliates]
+ * Portions Copyright [2017-2024] [Payara Foundation and/or its affiliates]
*/
package org.glassfish.resources.javamail.admin.cli;
@@ -154,9 +154,9 @@ public void testExecuteSuccess() {
assertEquals("true", r.getEnabled());
assertEquals("false", r.getDebug());
assertEquals("imap", r.getStoreProtocol());
- assertEquals("com.sun.mail.imap.IMAPStore", r.getStoreProtocolClass());
+ assertEquals("org.eclipse.angus.mail.imap.IMAPStore", r.getStoreProtocolClass());
assertEquals("smtp", r.getTransportProtocol());
- assertEquals("com.sun.mail.smtp.SMTPTransport", r.getTransportProtocolClass());
+ assertEquals("org.eclipse.angus.mail.smtp.SMTPTransport", r.getTransportProtocolClass());
isCreated = true;
logger.fine("MailResource config bean mail/MyMailSession is created.");
break;
@@ -232,9 +232,9 @@ public void testExecuteFailDuplicateResource() {
* asadmin create-javamail-resource --mailuser=test --mailhost=localhost
* --fromaddress=test@sun.com --enabled=false --debug=true
* --storeprotocol=pop
- * --storeprotocolclass=com.sun.mail.pop.POPStore
- * --transprotocol=lmtp
- * --transprotocolclass=com.sun.mail.lmtop.LMTPTransport
+ * --storeprotocolclass=org.eclipse.angus.mail.pop.POP3Store
+ * --transprotocol=smtp
+ * --transprotocolclass=org.eclipse.angus.mail.smtp.SMTPTransport
* mail/MyMailSession
*/
@Test
@@ -245,9 +245,9 @@ public void testExecuteWithOptionalValuesSet() {
parameters.set("enabled", "false");
parameters.set("debug", "true");
parameters.set("storeprotocol", "pop");
- parameters.set("storeprotocolclass", "com.sun.mail.pop.POPStore");
- parameters.set("transprotocol", "lmtp");
- parameters.set("transprotocolclass", "com.sun.mail.lmtp.LMTPTransport");
+ parameters.set("storeprotocolclass", "org.eclipse.angus.mail.pop.POP3Store");
+ parameters.set("transprotocol", "smtp");
+ parameters.set("transprotocolclass", "org.eclipse.angus.mail.smtp.SMTPTransport");
parameters.set("jndi_name", "mail/MyMailSession");
org.glassfish.resources.javamail.admin.cli.CreateJavaMailResource command = habitat.getService(org.glassfish.resources.javamail.admin.cli.CreateJavaMailResource.class);
assertTrue(command != null);
@@ -263,9 +263,9 @@ public void testExecuteWithOptionalValuesSet() {
assertEquals("true", r.getEnabled());
assertEquals("true", r.getDebug());
assertEquals("pop", r.getStoreProtocol());
- assertEquals("com.sun.mail.pop.POPStore", r.getStoreProtocolClass());
- assertEquals("lmtp", r.getTransportProtocol());
- assertEquals("com.sun.mail.lmtp.LMTPTransport", r.getTransportProtocolClass());
+ assertEquals("org.eclipse.angus.mail.pop.POP3Store", r.getStoreProtocolClass());
+ assertEquals("smtp", r.getTransportProtocol());
+ assertEquals("org.eclipse.angus.mail.smtp.SMTPTransport", r.getTransportProtocolClass());
assertEquals("false", r.getAuth());
isCreated = true;
break;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java
index 325a1a7e63f..c8e23648c16 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright [2017-2022] [Payara Foundation and/or its affiliates]
+// Portions Copyright 2017-2024 [Payara Foundation and/or its affiliates]
package org.glassfish.resources.admin.cli;
@@ -146,6 +146,7 @@ public class ResourcesXMLParser implements EntityResolver
private static final String publicID_ges31 = "GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions";
private static final String publicId_py4 = "Payara.fish//DTD Payara Server 4 Resource Definitions";
+ private static final String DTD_1_8 = "payara-resources_1_8.dtd";
private static final String DTD_1_7 = "payara-resources_1_7.dtd";
private static final String DTD_1_6 = "payara-resources_1_6.dtd";
private static final String DTD_1_5 = "glassfish-resources_1_5.dtd";
@@ -157,6 +158,7 @@ public class ResourcesXMLParser implements EntityResolver
private static final List systemIDs = Collections.unmodifiableList(
Arrays.asList(
+ DTD_1_8,
DTD_1_7,
DTD_1_6,
DTD_1_5,
@@ -1870,7 +1872,7 @@ public InputSource resolveEntity(String publicId, String systemId)
}else if(publicId.contains(publicID_ges31)){
dtdFileName = DTD_1_5;
} else if (publicId.contains(publicId_py4)) {
- dtdFileName = DTD_1_7;
+ dtdFileName = DTD_1_8;
}
}
diff --git a/appserver/tests/payara-samples/asadmin/src/test/java/fish/payara/samples/asadmin/CreateJavaMailResourceTest.java b/appserver/tests/payara-samples/asadmin/src/test/java/fish/payara/samples/asadmin/CreateJavaMailResourceTest.java
index d2372c26021..f347f7cc382 100644
--- a/appserver/tests/payara-samples/asadmin/src/test/java/fish/payara/samples/asadmin/CreateJavaMailResourceTest.java
+++ b/appserver/tests/payara-samples/asadmin/src/test/java/fish/payara/samples/asadmin/CreateJavaMailResourceTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020-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
@@ -59,9 +59,9 @@ public void testJavaMailDeploymentGroupRef() {
"--auth=false",
"--transportProtocol=smtp",
"--host=localhost",
- "--storeProtocolClass=com.sun.mail.imap.IMAPStore",
+ "--storeProtocolClass=org.eclipse.angus.mail.imap.IMAPStore",
"--from=ratatosk@payara.fish",
- "--transportProtocolClass=com.sun.mail.smtp.SMTPTransport",
+ "--transportProtocolClass=org.eclipse.angus.mail.smtp.SMTPTransport",
"--enabled=true",
"--target=domain",
"--mailhost=localhost",
diff --git a/core/pom.xml b/core/pom.xml
index dbbeba811e6..eed98b138d8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -140,8 +140,8 @@
1.0
3.30.2-GA
- 2.1.0
- 1.1.0
+ 2.1.3
+ 2.0.3
3.1.13
6.10.0