Change project name to Jakarta Mail - fix #377

Also changes short name, repo name, etc. from "javamail" to "mail".
jakartaee · Jul 3, 2019 · 372931d · 372931d
1 parent ac77368
commit 372931d
Show file tree

Hide file tree

Showing 130 changed files with 571 additions and 569 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,28 +1,28 @@
-# Contributing to Eclipse Project for JavaMail
+# Contributing to Eclipse Project for Jakarta Mail
 
 Thanks for your interest in this project.
 
 ## Project description
 
-The JavaMail API provides a platform-independent and protocol-independent
-framework to build mail and messaging applications. The JavaMail API is
+The Jakarta Mail API provides a platform-independent and protocol-independent
+framework to build mail and messaging applications. The Jakarta Mail API is
 available as an optional package for use with the Java SE platform and is also
 included in the Java EE platform.
 
-* [https://projects.eclipse.org/projects/ee4j.javamail](https://projects.eclipse.org/projects/ee4j.javamail)
+* [https://projects.eclipse.org/projects/ee4j.mail](https://projects.eclipse.org/projects/ee4j.mail)
 
 ## Developer resources
 
 Information regarding source code management, builds, coding standards, and
 more.
 
-* [https://eclipse-ee4j.github.io/javamail/Contributions](https://eclipse-ee4j.github.io/javamail/Contributions)
-* [https://projects.eclipse.org/projects/ee4j.javamail/developer](https://projects.eclipse.org/projects/ee4j.javamail/developer)
+* [https://eclipse-ee4j.github.io/mail/Contributions](https://eclipse-ee4j.github.io/mail/Contributions)
+* [https://projects.eclipse.org/projects/ee4j.mail/developer](https://projects.eclipse.org/projects/ee4j.mail/developer)
 
 The project maintains the following source code repositories
 
-* [https://github.com/eclipse-ee4j/javamail](https://github.com/eclipse-ee4j/javamail)
-* [https://github.com/eclipse-ee4j/javamail-tck](https://github.com/eclipse-ee4j/javamail-tck)
+* [https://github.com/eclipse-ee4j/mail](https://github.com/eclipse-ee4j/mail)
+* [https://github.com/eclipse-ee4j/mail-tck](https://github.com/eclipse-ee4j/mail-tck)
 
 ## Eclipse Contributor Agreement
 
@@ -44,4 +44,4 @@ For more information, please see the Eclipse Committer Handbook:
 
 Contact the project developers via the project's "dev" list.
 
-* [https://accounts.eclipse.org/mailing-list/javamail-dev](https://accounts.eclipse.org/mailing-list/javamail-dev)
+* [https://accounts.eclipse.org/mailing-list/mail-dev](https://accounts.eclipse.org/mailing-list/mail-dev)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-env.label = "javamail-tck-ci-pod-${UUID.randomUUID().toString()}"
+env.label = "mail-tck-ci-pod-${UUID.randomUUID().toString()}"
 pipeline {
   options {
     buildDiscarder(logRotator(numToKeepStr: '5'))
@@ -18,7 +18,7 @@ spec:
     - "localhost.localdomain"
     - "james.local"
   containers:
-  - name: javamail-ci
+  - name: mail-ci
     image: jakartaee/cts-javamail-base:0.1
     command:
     - cat
@@ -60,26 +60,26 @@ spec:
     MAIL_USER="user01@james.local"
   }
   stages {
-    stage('javamail-build') {
+    stage('mail-build') {
       steps {
-        container('javamail-ci') {
+        container('mail-ci') {
           sh """
-            bash -x ${WORKSPACE}/docker/build_javamail.sh
+            bash -x ${WORKSPACE}/docker/build_jakartamail.sh
           """
           archiveArtifacts artifacts: 'mail/target/*.jar'
-          stash includes: 'mail/target/*.jar', name: 'javamail-bundles'
+          stash includes: 'mail/target/*.jar', name: 'mail-bundles'
         }
       }
     }
 
-    stage('javamail-tck-run') {
+    stage('mail-tck-run') {
       steps {
-        container('javamail-ci') {
-	  unstash name: 'javamail-bundles'
+        container('mail-ci') {
+	  unstash name: 'mail-bundles'
           sh """
-            bash -x ${WORKSPACE}/docker/run_javamailtck.sh
+            bash -x ${WORKSPACE}/docker/run_jakartamailtck.sh
           """
-          archiveArtifacts artifacts: "javamailtck-results.tar.gz"
+          archiveArtifacts artifacts: "mailtck-results.tar.gz"
           junit testResults: 'results/junitreports/*.xml', allowEmptyResults: true
         }
       }

diff --git a/NOTICE.md b/NOTICE.md
@@ -1,13 +1,12 @@
-# Notices for Eclipse Project for JavaMail
+# Notices for Jakarta Mail
 
-This content is produced and maintained by the Eclipse Project for JavaMail
-project.
+This content is produced and maintained by the Jakarta Mail project.
 
-* Project home: https://projects.eclipse.org/projects/ee4j.javamail
+* Project home: https://projects.eclipse.org/projects/ee4j.mail
 
 ## Trademarks
 
-Eclipse Project for JavaMail is a trademark of the Eclipse Foundation.
+Jakarta Mail is a trademark of the Eclipse Foundation.
 
 ## Copyright
 
@@ -31,7 +30,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 The project maintains the following source code repositories:
 
-* https://github.com/eclipse-ee4j/javamail
+* https://github.com/eclipse-ee4j/mail
 
 ## Third-party Content
 

diff --git a/README.md b/README.md
@@ -1 +1 @@
-See the [JavaMail web site](https://eclipse-ee4j.github.io/javamail).
+See the [Jakarta Mail web site](https://eclipse-ee4j.github.io/mail).
diff --git a/android/activation/pom.xml b/android/activation/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -28,12 +28,12 @@
 
     <!--
 	This is a fork of the JavaBeans Activation Framework (JAF) that
-	is sufficient for use by JavaMail when running on Android.
+	is sufficient for use by Jakarta Mail when running on Android.
 	Android is not Java Compatible, and is missing the java.awt.datatransfer
 	classes.  This fork of JAF breaks the dependency on the
 	java.awt.datatransfer classes and thus isn't compatible with
 	the JAF specification.  It should not be used by anything other
-	than this Android-specific version of JavaMail.
+	than this Android-specific version of Jakarta Mail.
     -->
 
     <properties>

diff --git a/android/activation/src/main/java/javax/activation/package.html b/android/activation/src/main/java/javax/activation/package.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
 <BODY BGCOLOR="white">
 
 <P>
-The JavaBeans(TM) Activation Framework is used by the JavaMail(TM)
+The JavaBeans(TM) Activation Framework is used by the Jakarta Mail
 API to manage MIME data.
 </P>
 

diff --git a/android/mail/pom.xml b/android/mail/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,7 +18,7 @@
 -->
 
 <!--
-    This project builds the JavaMail Android jar file.
+    This project builds the Jakarta Mail Android jar file.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -34,14 +34,14 @@
     <groupId>com.sun.mail</groupId>
     <artifactId>android-mail</artifactId>
     <packaging>jar</packaging>
-    <name>JavaMail API for Android</name>
+    <name>Jakarta Mail API for Android</name>
 
     <properties>
 	<mail.extensionName>
 	    jakarta.mail.android
 	</mail.extensionName>
 	<mail.specificationTitle>
-	    JavaMail(TM) API Design Specification
+	    Jakarta Mail API Design Specification
 	</mail.specificationTitle>
 	<mail.implementationTitle>
 	    javax.mail.android

diff --git a/android/pom.xml b/android/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,7 +30,7 @@
     <groupId>com.sun.mail</groupId>
     <artifactId>android</artifactId>
     <packaging>pom</packaging>
-    <name>Android support for JavaMail</name>
+    <name>Android support for Jakarta Mail</name>
 
     <modules>
 	<module>activation</module>

diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,14 +23,14 @@
 
 <!--
 
-    NOTE: JavaMail is now built using Maven:
-    https://java.net/projects/javamail/pages/BuildInstructions
+    NOTE: Jakarta Mail is now built using Maven:
+    https://eclipse-ee4j.github.io/jakartamail/Build-Instructions
 
     This ant build file is obsolete and may not work.
 
 -->
 
-<project name="JavaMail" default="all" basedir=".">
+<project name="Jakarta Mail" default="all" basedir=".">
 
 <!-- ========== Initialize Properties =================================== -->
 
@@ -66,7 +66,7 @@
 
     <!-- compile -->
     <target name="compile" depends="init"
-            description="Compile JavaMail sources">
+            description="Compile Jakarta Mail sources">
 
         <copy file="${resources.dir}/javax/mail/Version.java"
 		toFile="${src.dir}/javax/mail/Version.java">
@@ -318,14 +318,14 @@
         </delete>
     </target>
 
-    <!-- JavaMail bundle build targets -->
+    <!-- Jakarta Mail bundle build targets -->
 
     <target name="release" depends="init, jars, democompile, docs">
 	<!-- XXX - need to replace "." with "_" in release.version -->
-        <property name="rel" value="javamail-${release.version}"/>
+        <property name="rel" value="jakartamail-${release.version}"/>
         <property name="zipname" value="${rel}.zip"/>
         <delete file="${basedir}/target/${zipname}"/>
-        <echo message="Creating JavaMail bundle ${basedir}/target/${zipname}"/>
+        <echo message="Creating Jakarta Mail bundle ${basedir}/target/${zipname}"/>
         <zip destfile="${basedir}/target/${zipname}">
 	    <zipfileset dir="${release.dir}" prefix="${rel}"/>
             <zipfileset dir="${src.demo.dir}" prefix="${rel}/demo"
@@ -550,9 +550,9 @@
             version="false"
             use="true"
             overview="${release.dir}/javadoc/overview.html"
-            windowtitle="JavaMail API documentation"
-            doctitle="JavaMail API documentation">
-            <group title="JavaMail API Packages" packages="javax.*"/>
+            windowtitle="Jakarta Mail API documentation"
+            doctitle="Jakarta Mail API documentation">
+            <group title="Jakarta Mail API Packages" packages="javax.*"/>
             <group title="Sun-specific Packages" packages="com.sun.*"/>
 	    <bottom>
 <![CDATA[Copyright &#169; 1996-2013,

diff --git a/client/pom.xml b/client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,7 +30,7 @@
     <groupId>com.sun.mail</groupId>
     <artifactId>client</artifactId>
     <packaging>jar</packaging>
-    <name>JavaMail API demo client</name>
+    <name>Jakarta Mail API demo client</name>
 
     <build>
         <plugins>

diff --git a/client/src/main/java/SimpleClient.java b/client/src/main/java/SimpleClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -68,7 +68,7 @@ public static void main(String argv[]) {
 	    CommandMap.setDefaultCommandMap( new MailcapCommandMap(
 		new FileInputStream(capfile)));
 
-	    JFrame frame = new JFrame("Simple JavaMail Client");
+	    JFrame frame = new JFrame("Simple Jakarta Mail Client");
 	    frame.addWindowListener(new WindowAdapter() {
 		public void windowClosing(WindowEvent e) {System.exit(0);}});
 	    //frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,7 +30,7 @@
     <groupId>com.sun.mail</groupId>
     <artifactId>demo</artifactId>
     <packaging>jar</packaging>
-    <name>JavaMail API demos</name>
+    <name>Jakarta Mail API demos</name>
 
     <build>
         <plugins>

diff --git a/demo/src/main/java/README.txt b/demo/src/main/java/README.txt
@@ -1,13 +1,13 @@
 	README for the demo programs in this directory
 	==============================================
 
-These demo programs illustrate how to use the JavaMail API to
+These demo programs illustrate how to use the Jakarta Mail API to
 perform a number of common email functions.  Note these these
 programs are not intended to be examples of good user interfaces,
 or good command line interfaces.  No one is expected to actually
 *use* these programs for anything real.  Rather, their value is
 in the source code.  Don't look at their command line arguments
-or user interface to figure out what JavaMail can do, look at
+or user interface to figure out what Jakarta Mail can do, look at
 their source code.  We strongly recommend that you read the
 source code and understand what these programs are doing before
 running them.
@@ -277,7 +277,7 @@ but if in doubt, read the source code.
 
 - registry.java
 
-	Demonstrates how to query the JavaMail "registry" for providers,
+	Demonstrates how to query the Jakarta Mail "registry" for providers,
 	set default providers, etc.
 
    Usage:

diff --git a/demo/src/main/java/copier.java b/demo/src/main/java/copier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
 
 /**
  * copier will copy a specified number of messages from one folder
- * to another folder. it demonstrates how to use the JavaMail APIs
+ * to another folder. it demonstrates how to use the Jakarta Mail APIs
  * to copy messages.<p>
  *
  * Usage for copier: copier <i>store urlname</i> 

diff --git a/demo/src/main/java/msgmultisendsample.java b/demo/src/main/java/msgmultisendsample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -55,7 +55,7 @@ public static void main(String[] args) {
 	    msg.setFrom(new InternetAddress(from));
 	    InternetAddress[] address = {new InternetAddress(to)};
 	    msg.setRecipients(Message.RecipientType.TO, address);
-	    msg.setSubject("JavaMail APIs Multipart Test");
+	    msg.setSubject("Jakarta Mail APIs Multipart Test");
 	    msg.setSentDate(new Date());
 
 	    // create and fill the first message part