You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/13 11:55:58 UTC
[tomcat] 06/18: Rename "javax.mail.*" to "jakarta.mail.*"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8cd528df42c420f1859c5075664218d6a2618166
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 28 13:44:50 2019 +0000
Rename "javax.mail.*" to "jakarta.mail.*"
---
java/{javax => jakarta}/mail/Authenticator.java | 2 +-
java/{javax => jakarta}/mail/PasswordAuthentication.java | 2 +-
java/{javax => jakarta}/mail/Session.java | 2 +-
java/{javax => jakarta}/mail/internet/InternetAddress.java | 2 +-
java/{javax => jakarta}/mail/internet/MimeMessage.java | 4 ++--
java/{javax => jakarta}/mail/internet/MimePart.java | 2 +-
.../mail/internet/MimePartDataSource.java | 2 +-
java/org/apache/catalina/startup/WebAnnotationSet.java | 2 +-
java/org/apache/naming/factory/MailSessionFactory.java | 11 ++++++-----
java/org/apache/naming/factory/ResourceFactory.java | 4 ++--
java/org/apache/naming/factory/SendMailFactory.java | 13 +++++++------
res/checkstyle/jakarta-import-control.xml | 3 +++
res/checkstyle/javax-import-control.xml | 3 ---
res/checkstyle/org-import-control.xml | 2 +-
webapps/docs/config/systemprops.xml | 4 ++--
webapps/docs/jndi-resources-howto.xml | 12 ++++++------
16 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/java/javax/mail/Authenticator.java b/java/jakarta/mail/Authenticator.java
similarity index 97%
rename from java/javax/mail/Authenticator.java
rename to java/jakarta/mail/Authenticator.java
index 78df841..6586675 100644
--- a/java/javax/mail/Authenticator.java
+++ b/java/jakarta/mail/Authenticator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail;
+package jakarta.mail;
public class Authenticator {
protected PasswordAuthentication getPasswordAuthentication() {
diff --git a/java/javax/mail/PasswordAuthentication.java b/java/jakarta/mail/PasswordAuthentication.java
similarity index 97%
rename from java/javax/mail/PasswordAuthentication.java
rename to java/jakarta/mail/PasswordAuthentication.java
index d5d9411..7be7b29 100644
--- a/java/javax/mail/PasswordAuthentication.java
+++ b/java/jakarta/mail/PasswordAuthentication.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail;
+package jakarta.mail;
@SuppressWarnings("unused") // Dummy implementation
public class PasswordAuthentication {
diff --git a/java/javax/mail/Session.java b/java/jakarta/mail/Session.java
similarity index 98%
rename from java/javax/mail/Session.java
rename to java/jakarta/mail/Session.java
index a95a11b..d638f81 100644
--- a/java/javax/mail/Session.java
+++ b/java/jakarta/mail/Session.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail;
+package jakarta.mail;
import java.util.Properties;
diff --git a/java/javax/mail/internet/InternetAddress.java b/java/jakarta/mail/internet/InternetAddress.java
similarity index 96%
rename from java/javax/mail/internet/InternetAddress.java
rename to java/jakarta/mail/internet/InternetAddress.java
index 4daa35d..aa1ce38 100644
--- a/java/javax/mail/internet/InternetAddress.java
+++ b/java/jakarta/mail/internet/InternetAddress.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail.internet;
+package jakarta.mail.internet;
@SuppressWarnings("unused") // Dummy implementation
public class InternetAddress {
diff --git a/java/javax/mail/internet/MimeMessage.java b/java/jakarta/mail/internet/MimeMessage.java
similarity index 95%
rename from java/javax/mail/internet/MimeMessage.java
rename to java/jakarta/mail/internet/MimeMessage.java
index 2587730..08cdb80 100644
--- a/java/javax/mail/internet/MimeMessage.java
+++ b/java/jakarta/mail/internet/MimeMessage.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail.internet;
+package jakarta.mail.internet;
-import javax.mail.Session;
+import jakarta.mail.Session;
@SuppressWarnings("unused") // Dummy implementation
public class MimeMessage implements MimePart {
diff --git a/java/javax/mail/internet/MimePart.java b/java/jakarta/mail/internet/MimePart.java
similarity index 96%
rename from java/javax/mail/internet/MimePart.java
rename to java/jakarta/mail/internet/MimePart.java
index 4b57b20..7591634 100644
--- a/java/javax/mail/internet/MimePart.java
+++ b/java/jakarta/mail/internet/MimePart.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail.internet;
+package jakarta.mail.internet;
public interface MimePart {
// Dummy implementation
diff --git a/java/javax/mail/internet/MimePartDataSource.java b/java/jakarta/mail/internet/MimePartDataSource.java
similarity index 96%
rename from java/javax/mail/internet/MimePartDataSource.java
rename to java/jakarta/mail/internet/MimePartDataSource.java
index 28a3f39..a86bae5 100644
--- a/java/javax/mail/internet/MimePartDataSource.java
+++ b/java/jakarta/mail/internet/MimePartDataSource.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.mail.internet;
+package jakarta.mail.internet;
@SuppressWarnings("unused") // Dummy implementation
public class MimePartDataSource {
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java b/java/org/apache/catalina/startup/WebAnnotationSet.java
index 6921023..bbca47d 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -360,7 +360,7 @@ public class WebAnnotationSet {
type.equals("javax.jms.ConnectionFactory") ||
type.equals("javax.jms.QueueConnectionFactory") ||
type.equals("javax.jms.TopicConnectionFactory") ||
- type.equals("javax.mail.Session") ||
+ type.equals("jakarta.mail.Session") ||
type.equals("java.net.URL") ||
type.equals("javax.resource.cci.ConnectionFactory") ||
type.equals("org.omg.CORBA_2_3.ORB") ||
diff --git a/java/org/apache/naming/factory/MailSessionFactory.java b/java/org/apache/naming/factory/MailSessionFactory.java
index fc87930..9259d6d 100644
--- a/java/org/apache/naming/factory/MailSessionFactory.java
+++ b/java/org/apache/naming/factory/MailSessionFactory.java
@@ -23,15 +23,16 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
-import javax.mail.Authenticator;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.RefAddr;
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
+import jakarta.mail.Authenticator;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
+
/**
* <p>Factory class that creates a JNDI named JavaMail Session factory,
* which can be used for managing inbound and outbound electronic mail
@@ -49,7 +50,7 @@ import javax.naming.spi.ObjectFactory;
* configuration file. An example of factory configuration is:</p>
* <pre>
* <Resource name="mail/smtp" auth="CONTAINER"
- * type="javax.mail.Session"/>
+ * type="jakarta.mail.Session"/>
* <ResourceParams name="mail/smtp">
* <parameter>
* <name>factory</name>
@@ -70,7 +71,7 @@ public class MailSessionFactory implements ObjectFactory {
/**
* The Java type for which this factory knows how to create objects.
*/
- protected static final String factoryType = "javax.mail.Session";
+ protected static final String factoryType = "jakarta.mail.Session";
/**
diff --git a/java/org/apache/naming/factory/ResourceFactory.java b/java/org/apache/naming/factory/ResourceFactory.java
index a458315..00c3b8b 100644
--- a/java/org/apache/naming/factory/ResourceFactory.java
+++ b/java/org/apache/naming/factory/ResourceFactory.java
@@ -54,9 +54,9 @@ public class ResourceFactory extends FactoryBase {
ex.initCause(e);
throw ex;
}
- } else if (ref.getClassName().equals("javax.mail.Session")) {
+ } else if (ref.getClassName().equals("jakarta.mail.Session")) {
String javaxMailSessionFactoryClassName =
- System.getProperty("javax.mail.Session.Factory",
+ System.getProperty("jakarta.mail.Session.Factory",
"org.apache.naming.factory.MailSessionFactory");
try {
factory = (ObjectFactory) Class.forName(
diff --git a/java/org/apache/naming/factory/SendMailFactory.java b/java/org/apache/naming/factory/SendMailFactory.java
index 882cc4f..7395d44 100644
--- a/java/org/apache/naming/factory/SendMailFactory.java
+++ b/java/org/apache/naming/factory/SendMailFactory.java
@@ -23,16 +23,17 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimePartDataSource;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.RefAddr;
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
+import jakarta.mail.Session;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimePartDataSource;
+
/**
* Factory class that creates a JNDI named javamail MimePartDataSource
* object which can be used for sending email using SMTP.
@@ -43,7 +44,7 @@ import javax.naming.spi.ObjectFactory;
* Example:
* <pre>
* <Resource name="mail/send" auth="CONTAINER"
- * type="javax.mail.internet.MimePartDataSource"/>
+ * type="jakarta.mail.internet.MimePartDataSource"/>
* <ResourceParams name="mail/send">
* <parameter><name>factory</name>
* <value>org.apache.naming.factory.SendMailFactory</value>
@@ -76,7 +77,7 @@ public class SendMailFactory implements ObjectFactory
{
// The class name for the javamail MimeMessageDataSource
protected static final String DataSourceClassName =
- "javax.mail.internet.MimePartDataSource";
+ "jakarta.mail.internet.MimePartDataSource";
@Override
public Object getObjectInstance(Object refObj, Name name, Context ctx,
diff --git a/res/checkstyle/jakarta-import-control.xml b/res/checkstyle/jakarta-import-control.xml
index 0acf63d..cc86b88 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -30,4 +30,7 @@
<subpackage name="el">
<allow pkg="jakarta.el"/>
</subpackage>
+ <subpackage name="mail">
+ <allow pkg="jakarta.mail"/>
+ </subpackage>
</import-control>
\ No newline at end of file
diff --git a/res/checkstyle/javax-import-control.xml b/res/checkstyle/javax-import-control.xml
index b843edd..b7906af 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -21,9 +21,6 @@
<import-control pkg="javax">
<allow pkg="java"/>
- <subpackage name="mail">
- <allow pkg="javax.mail"/>
- </subpackage>
<subpackage name="persistence">
<allow pkg="javax.persistence"/>
</subpackage>
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index df2f563..a76bb1c 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -118,7 +118,7 @@
<allow pkg="org.apache.juli"/>
</subpackage>
<subpackage name="naming">
- <allow pkg="javax.mail"/>
+ <allow pkg="jakarta.mail"/>
<allow pkg="javax.wsdl"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.naming"/>
diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml
index ff25981..9294817 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -580,9 +580,9 @@
<a href="https://commons.apache.org/dbcp">Apache Commons DBCP 2</a>.</p>
</property>
- <property name="javax.mail.Session.Factory">
+ <property name="jakarta.mail.Session.Factory">
<p>The class name of the factory to use to create resources of type
- <code>javax.mail.Session</code>. If not specified the default of
+ <code>jakarta.mail.Session</code>. If not specified the default of
<code>org.apache.naming.factory.MailSessionFactory</code> is used.</p>
</property>
diff --git a/webapps/docs/jndi-resources-howto.xml b/webapps/docs/jndi-resources-howto.xml
index fc5c0aa..91c03cb 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -508,7 +508,7 @@ public class MyBean2 {
(including the name of the SMTP host to be used for message sending).</p>
<p>Tomcat includes a standard resource factory that will create
- <code>javax.mail.Session</code> session instances for you, already
+ <code>jakarta.mail.Session</code> session instances for you, already
configured to connect to an SMTP server.
In this way, the application is totally insulated from changes in the
email server configuration environment - it simply asks for, and receives,
@@ -527,7 +527,7 @@ public class MyBean2 {
might look like this:</p>
<source><![CDATA[<resource-ref>
<description>
- Resource reference to a factory for javax.mail.Session
+ Resource reference to a factory for jakarta.mail.Session
instances that may be used for sending electronic mail
messages, preconfigured to connect to the appropriate
SMTP server.
@@ -536,7 +536,7 @@ public class MyBean2 {
mail/Session
</res-ref-name>
<res-type>
- javax.mail.Session
+ jakarta.mail.Session
</res-type>
<res-auth>
Container
@@ -580,7 +580,7 @@ Transport.send(message);]]></source>
<source><![CDATA[<Context ...>
...
<Resource name="mail/Session" auth="Container"
- type="javax.mail.Session"
+ type="jakarta.mail.Session"
mail.smtp.host="localhost"/>
...
</Context>]]></source>
@@ -592,7 +592,7 @@ Transport.send(message);]]></source>
<p>Additional resource attributes and values will be converted to properties
and values and passed to
- <code>javax.mail.Session.getInstance(java.util.Properties)</code> as part of
+ <code>jakarta.mail.Session.getInstance(java.util.Properties)</code> as part of
the <code>java.util.Properties</code> collection. In addition to the
properties defined in Annex A of the JavaMail specification, individual
providers may also support additional properties.
@@ -601,7 +601,7 @@ Transport.send(message);]]></source>
<p>If the resource is configured with a <code>password</code> attribute and
either a <code>mail.smtp.user</code> or <code>mail.user</code> attribute
then Tomcat's resource factory will configure and add a
- <code>javax.mail.Authenticator</code> to the mail session.</p>
+ <code>jakarta.mail.Authenticator</code> to the mail session.</p>
<h5>4. Install the JavaMail libraries</h5>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org