You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/12/25 22:59:09 UTC
(commons-email) branch master updated: Reuse Core constants
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-email.git
The following commit(s) were added to refs/heads/master by this push:
new a227d93 Reuse Core constants
a227d93 is described below
commit a227d93d03fbcb121e665e6a7174f78ab021ce60
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Dec 25 17:59:04 2023 -0500
Reuse Core constants
---
.../org/apache/commons/mail2/jakarta/Email.java | 1 +
.../commons/mail2/jakarta/EmailConstants.java | 211 ---------------------
.../apache/commons/mail2/jakarta/HtmlEmail.java | 1 +
.../apache/commons/mail2/jakarta/SimpleEmail.java | 1 +
.../apache/commons/mail2/jakarta/EmailTest.java | 1 +
.../commons/mail2/jakarta/HtmlEmailTest.java | 1 +
.../commons/mail2/jakarta/MultiPartEmailTest.java | 1 +
.../mail2/jakarta/SendWithAttachmentsTest.java | 1 +
.../commons/mail2/jakarta/SimpleEmailTest.java | 1 +
.../mail2/jakarta/settings/EmailConfiguration.java | 2 +-
.../java/org/apache/commons/mail2/javax/Email.java | 1 +
.../apache/commons/mail2/javax/EmailConstants.java | 211 ---------------------
.../org/apache/commons/mail2/javax/HtmlEmail.java | 1 +
.../apache/commons/mail2/javax/SimpleEmail.java | 1 +
.../org/apache/commons/mail2/javax/EmailTest.java | 1 +
.../apache/commons/mail2/javax/HtmlEmailTest.java | 1 +
.../commons/mail2/javax/MultiPartEmailTest.java | 1 +
.../mail2/javax/SendWithAttachmentsTest.java | 1 +
.../commons/mail2/javax/SimpleEmailTest.java | 1 +
.../mail2/javax/settings/EmailConfiguration.java | 2 +-
20 files changed, 18 insertions(+), 424 deletions(-)
diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/Email.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/Email.java
index 29ef113..a83b452 100644
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/Email.java
+++ b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/Email.java
@@ -32,6 +32,7 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.jakarta.util.IDNEmailAddressConverter;
diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/EmailConstants.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/EmailConstants.java
deleted file mode 100644
index e2f95f9..0000000
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/EmailConstants.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.mail2.jakarta;
-
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-
-/**
- * Constants used by Email classes.
- *
- * A description of the mail session parameter you find at <a href="http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-summary.html">
- * http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-summary.html</a>.
- *
- * @since 1.3
- */
-public final class EmailConstants {
-
- /** Charset constant for koi8-r */
- public static final String KOI8_R = "koi8-r";
-
- /** Charset constant for iso-8859-1 */
- public static final String ISO_8859_1 = StandardCharsets.ISO_8859_1.name();
-
- /** Charset constant for us-ascii */
- public static final String US_ASCII = StandardCharsets.US_ASCII.name();
-
- /** Charset constant for utf-8 */
- public static final String UTF_8 = StandardCharsets.UTF_8.name();
-
- /** The debug mode to be used. */
- public static final String MAIL_DEBUG = "mail.debug";
-
- /** The host name of the mail server. */
- public static final String MAIL_HOST = "mail.smtp.host";
-
- /** The port number of the mail server. */
- public static final String MAIL_PORT = "mail.smtp.port";
-
- /** The email address to use for SMTP MAIL command. */
- public static final String MAIL_SMTP_FROM = "mail.smtp.from";
-
- /** If set to true, tries to authenticate the user using the AUTH command. */
- public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
-
- /** The SMTP user name. */
- public static final String MAIL_SMTP_USER = "mail.smtp.user";
-
- /** The SMTP password. */
- public static final String MAIL_SMTP_PASSWORD = "mail.smtp.password";
-
- /** Specifies the default transport protocol */
- public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";
-
- /** The value to use SMTP as transport protocol */
- public static final String SMTP = "smtp";
-
- /** Defines the text/html content type */
- public static final String TEXT_HTML = "text/html";
-
- /** Defines the html subtype */
- public static final String TEXT_SUBTYPE_HTML = "html";
-
- /** Defines the text/plain content type */
- public static final String TEXT_PLAIN = "text/plain";
-
- /////////////////////////////////////////////////////////////////////////
- // since 1.1
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * Indicates if the STARTTLS command shall be used to initiate a TLS-secured connection.
- *
- * @since 1.1
- */
- public static final String MAIL_TRANSPORT_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
-
- /**
- * Whether to use {@link java.net.Socket} as a fallback if the initial connection fails or not.
- *
- * @since 1.1
- */
- public static final String MAIL_SMTP_SOCKET_FACTORY_FALLBACK = "mail.smtp.socketFactory.fallback";
-
- /**
- * Specifies the {@link javax.net.SocketFactory} class to create smtp sockets.
- *
- * @since 1.1
- */
- public static final String MAIL_SMTP_SOCKET_FACTORY_CLASS = "mail.smtp.socketFactory.class";
-
- /**
- * Specifies the port to connect to when using a socket factory.
- *
- * @since 1.1
- */
- public static final String MAIL_SMTP_SOCKET_FACTORY_PORT = "mail.smtp.socketFactory.port";
-
- /**
- * Socket connection timeout value in milliseconds. Default is infinite timeout.
- *
- * @since 1.2
- */
- public static final String MAIL_SMTP_CONNECTIONTIMEOUT = "mail.smtp.connectiontimeout";
-
- /**
- * Socket I/O timeout value in milliseconds. Default is infinite timeout.
- *
- * @since 1.2
- */
- public static final String MAIL_SMTP_TIMEOUT = "mail.smtp.timeout";
-
- /**
- * Default socket timeout.
- *
- * @since 1.6.0
- */
- public static final Duration SOCKET_TIMEOUT = Duration.ofMinutes(1);
-
- /**
- * If true, requires the use of the STARTTLS command. If the server doesn't support the STARTTLS command, the connection will fail.
- *
- * @since 1.3
- */
- public static final String MAIL_TRANSPORT_STARTTLS_REQUIRED = "mail.smtp.starttls.required";
-
- /**
- * If set to true, use SSL to connect and use the SSL port by default.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
-
- /**
- * If set to true, check the server identity as specified in RFC 2595.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_CHECKSERVERIDENTITY = "mail.smtp.ssl.checkserveridentity";
-
- /**
- * Specifies the {@link javax.net.ssl.SSLSocketFactory} class to use to create SMTP SSL sockets.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_SOCKET_FACTORY_CLASS = "mail.smtp.ssl.socketFactory.class";
-
- /**
- * Specifies the port to connect to when using the SMTP SSL socket factory.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_SOCKET_FACTORY_PORT = "mail.smtp.ssl.socketFactory.port";
-
- /////////////////////////////////////////////////////////////////////////
- // since 1.3.2
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * If set to true, and a message has some valid and some invalid addresses, send the message anyway, reporting the partial failure with a
- * SendFailedException. If set to false (the default), the message is not sent to any of the recipients if there is an invalid recipient address.
- *
- * @since 1.3.2
- */
- public static final String MAIL_SMTP_SEND_PARTIAL = "mail.smtp.sendpartial";
-
- /**
- * If set to true, and a message has some valid and some invalid addresses, send the message anyway, reporting the partial failure with a
- * SendFailedException. If set to false (the default), the message is not sent to any of the recipients if there is an invalid recipient address.
- *
- * @since 1.3.2
- */
- public static final String MAIL_SMTPS_SEND_PARTIAL = "mail.smtps.sendpartial";
-
- /**
- * Defines the default mime charset to use when none has been specified for the message.
- *
- * @since 1.3.2
- */
- public static final String MAIL_MIME_CHARSET = "mail.mime.charset";
-
- /////////////////////////////////////////////////////////////////////////
- // since 1.4
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * The from email address.
- *
- * @since 1.4
- */
- public static final String MAIL_FROM = "mail.from";
-
- /** Hide constructor. */
- private EmailConstants() {
- // do nothing
- }
-
-}
diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/HtmlEmail.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/HtmlEmail.java
index 00b4294..9656f85 100644
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/HtmlEmail.java
+++ b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/HtmlEmail.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/SimpleEmail.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/SimpleEmail.java
index 28090ce..659f032 100644
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/SimpleEmail.java
+++ b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/SimpleEmail.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.mail2.jakarta;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
/**
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/EmailTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/EmailTest.java
index 185c189..eddf8bd 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/EmailTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/EmailTest.java
@@ -38,6 +38,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.jakarta.mocks.MockEmailConcrete;
import org.junit.jupiter.api.BeforeEach;
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/HtmlEmailTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/HtmlEmailTest.java
index b796736..034cf28 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/HtmlEmailTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/HtmlEmailTest.java
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.net.URL;
import java.util.List;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.jakarta.mocks.MockHtmlEmailConcrete;
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/MultiPartEmailTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/MultiPartEmailTest.java
index aad3b3d..4adcbfd 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/MultiPartEmailTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/MultiPartEmailTest.java
@@ -28,6 +28,7 @@ import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.jakarta.mocks.MockMultiPartEmailConcrete;
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SendWithAttachmentsTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SendWithAttachmentsTest.java
index c8e56e2..c56dbf6 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SendWithAttachmentsTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SendWithAttachmentsTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.jakarta.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail2.jakarta.settings.EmailConfiguration;
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SimpleEmailTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SimpleEmailTest.java
index e168293..819ad2b 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SimpleEmailTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/SimpleEmailTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.jakarta.mocks.MockSimpleEmail;
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/settings/EmailConfiguration.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/settings/EmailConfiguration.java
index 4240f44..d51c6c2 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/settings/EmailConfiguration.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/settings/EmailConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.mail2.jakarta.settings;
-import org.apache.commons.mail2.jakarta.EmailConstants;
+import org.apache.commons.mail2.core.EmailConstants;
/**
* This class contains hard-coded configuration settings for the JUnit tests.
diff --git a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/Email.java b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/Email.java
index 834ed45..b036223 100644
--- a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/Email.java
+++ b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/Email.java
@@ -43,6 +43,7 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.javax.util.IDNEmailAddressConverter;
diff --git a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java
deleted file mode 100644
index 290856b..0000000
--- a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.mail2.javax;
-
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-
-/**
- * Constants used by Email classes.
- *
- * A description of the mail session parameter you find at <a href="http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-summary.html">
- * http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-summary.html</a>.
- *
- * @since 1.3
- */
-public final class EmailConstants {
-
- /** Charset constant for koi8-r */
- public static final String KOI8_R = "koi8-r";
-
- /** Charset constant for iso-8859-1 */
- public static final String ISO_8859_1 = StandardCharsets.ISO_8859_1.name();
-
- /** Charset constant for us-ascii */
- public static final String US_ASCII = StandardCharsets.US_ASCII.name();
-
- /** Charset constant for utf-8 */
- public static final String UTF_8 = StandardCharsets.UTF_8.name();
-
- /** The debug mode to be used. */
- public static final String MAIL_DEBUG = "mail.debug";
-
- /** The host name of the mail server. */
- public static final String MAIL_HOST = "mail.smtp.host";
-
- /** The port number of the mail server. */
- public static final String MAIL_PORT = "mail.smtp.port";
-
- /** The email address to use for SMTP MAIL command. */
- public static final String MAIL_SMTP_FROM = "mail.smtp.from";
-
- /** If set to true, tries to authenticate the user using the AUTH command. */
- public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
-
- /** The SMTP user name. */
- public static final String MAIL_SMTP_USER = "mail.smtp.user";
-
- /** The SMTP password. */
- public static final String MAIL_SMTP_PASSWORD = "mail.smtp.password";
-
- /** Specifies the default transport protocol */
- public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";
-
- /** The value to use SMTP as transport protocol */
- public static final String SMTP = "smtp";
-
- /** Defines the text/html content type */
- public static final String TEXT_HTML = "text/html";
-
- /** Defines the html subtype */
- public static final String TEXT_SUBTYPE_HTML = "html";
-
- /** Defines the text/plain content type */
- public static final String TEXT_PLAIN = "text/plain";
-
- /////////////////////////////////////////////////////////////////////////
- // since 1.1
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * Indicates if the STARTTLS command shall be used to initiate a TLS-secured connection.
- *
- * @since 1.1
- */
- public static final String MAIL_TRANSPORT_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
-
- /**
- * Whether to use {@link java.net.Socket} as a fallback if the initial connection fails or not.
- *
- * @since 1.1
- */
- public static final String MAIL_SMTP_SOCKET_FACTORY_FALLBACK = "mail.smtp.socketFactory.fallback";
-
- /**
- * Specifies the {@link javax.net.SocketFactory} class to create smtp sockets.
- *
- * @since 1.1
- */
- public static final String MAIL_SMTP_SOCKET_FACTORY_CLASS = "mail.smtp.socketFactory.class";
-
- /**
- * Specifies the port to connect to when using a socket factory.
- *
- * @since 1.1
- */
- public static final String MAIL_SMTP_SOCKET_FACTORY_PORT = "mail.smtp.socketFactory.port";
-
- /**
- * Socket connection timeout value in milliseconds. Default is infinite timeout.
- *
- * @since 1.2
- */
- public static final String MAIL_SMTP_CONNECTIONTIMEOUT = "mail.smtp.connectiontimeout";
-
- /**
- * Socket I/O timeout value in milliseconds. Default is infinite timeout.
- *
- * @since 1.2
- */
- public static final String MAIL_SMTP_TIMEOUT = "mail.smtp.timeout";
-
- /**
- * Default socket timeout.
- *
- * @since 1.6.0
- */
- public static final Duration SOCKET_TIMEOUT = Duration.ofMinutes(1);
-
- /**
- * If true, requires the use of the STARTTLS command. If the server doesn't support the STARTTLS command, the connection will fail.
- *
- * @since 1.3
- */
- public static final String MAIL_TRANSPORT_STARTTLS_REQUIRED = "mail.smtp.starttls.required";
-
- /**
- * If set to true, use SSL to connect and use the SSL port by default.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
-
- /**
- * If set to true, check the server identity as specified in RFC 2595.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_CHECKSERVERIDENTITY = "mail.smtp.ssl.checkserveridentity";
-
- /**
- * Specifies the {@link javax.net.ssl.SSLSocketFactory} class to use to create SMTP SSL sockets.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_SOCKET_FACTORY_CLASS = "mail.smtp.ssl.socketFactory.class";
-
- /**
- * Specifies the port to connect to when using the SMTP SSL socket factory.
- *
- * @since 1.3
- */
- public static final String MAIL_SMTP_SSL_SOCKET_FACTORY_PORT = "mail.smtp.ssl.socketFactory.port";
-
- /////////////////////////////////////////////////////////////////////////
- // since 1.3.2
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * If set to true, and a message has some valid and some invalid addresses, send the message anyway, reporting the partial failure with a
- * SendFailedException. If set to false (the default), the message is not sent to any of the recipients if there is an invalid recipient address.
- *
- * @since 1.3.2
- */
- public static final String MAIL_SMTP_SEND_PARTIAL = "mail.smtp.sendpartial";
-
- /**
- * If set to true, and a message has some valid and some invalid addresses, send the message anyway, reporting the partial failure with a
- * SendFailedException. If set to false (the default), the message is not sent to any of the recipients if there is an invalid recipient address.
- *
- * @since 1.3.2
- */
- public static final String MAIL_SMTPS_SEND_PARTIAL = "mail.smtps.sendpartial";
-
- /**
- * Defines the default mime charset to use when none has been specified for the message.
- *
- * @since 1.3.2
- */
- public static final String MAIL_MIME_CHARSET = "mail.mime.charset";
-
- /////////////////////////////////////////////////////////////////////////
- // since 1.4
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * The from email address.
- *
- * @since 1.4
- */
- public static final String MAIL_FROM = "mail.from";
-
- /** Hide constructor. */
- private EmailConstants() {
- // do nothing
- }
-
-}
diff --git a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java
index 130f358..f558d24 100644
--- a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java
+++ b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java
@@ -34,6 +34,7 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
diff --git a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/SimpleEmail.java b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/SimpleEmail.java
index e0e76ad..dd50988 100644
--- a/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/SimpleEmail.java
+++ b/commons-email2-javax/src/main/java/org/apache/commons/mail2/javax/SimpleEmail.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.mail2.javax;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
/**
diff --git a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java
index 590dfb0..2e86308 100644
--- a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java
+++ b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java
@@ -45,6 +45,7 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.javax.mocks.MockEmailConcrete;
import org.junit.jupiter.api.BeforeEach;
diff --git a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java
index d90c458..8240f84 100644
--- a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java
+++ b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java
@@ -32,6 +32,7 @@ import javax.activation.DataSource;
import javax.activation.FileDataSource;
import javax.mail.internet.MimeMessage;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.javax.mocks.MockHtmlEmailConcrete;
diff --git a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java
index a908de9..5c012bc 100644
--- a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java
+++ b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java
@@ -32,6 +32,7 @@ import javax.activation.FileDataSource;
import javax.activation.URLDataSource;
import javax.mail.internet.MimeMultipart;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.javax.mocks.MockMultiPartEmailConcrete;
diff --git a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java
index ee6da91..0c0fd63 100644
--- a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java
+++ b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java
@@ -22,6 +22,7 @@ import java.net.URL;
import javax.mail.internet.MimeUtility;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.javax.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail2.javax.settings.EmailConfiguration;
diff --git a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java
index dfef357..31819c7 100644
--- a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java
+++ b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import org.apache.commons.mail2.core.EmailConstants;
import org.apache.commons.mail2.core.EmailException;
import org.apache.commons.mail2.core.EmailUtils;
import org.apache.commons.mail2.javax.mocks.MockSimpleEmail;
diff --git a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/settings/EmailConfiguration.java b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/settings/EmailConfiguration.java
index 83e812e..4c66ec9 100644
--- a/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/settings/EmailConfiguration.java
+++ b/commons-email2-javax/src/test/java/org/apache/commons/mail2/javax/settings/EmailConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.mail2.javax.settings;
-import org.apache.commons.mail2.javax.EmailConstants;
+import org.apache.commons.mail2.core.EmailConstants;
/**
* This class contains hard-coded configuration settings for the JUnit tests.