Fix creation of JavaMail session via Admin Console and REST Admin interface

appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MailITest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.main.admin.test.rest;
+
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.glassfish.main.itest.tools.RandomGenerator.generateRandomString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
+public class MailITest extends RestTestBase {
+
+    private static final String URL_CREATE_MAIL_RESOURCE = "/domain/resources/create-mail-resource";
+
+    private static final String URL_DELETE_MAIL_RESOURCE = "/domain/resources/delete-mail-resource";
+
+    private static final String URL_LIST_MAIL_RESOURCES = "/domain/resources/list-mail-resources";
+
+    @Test
+    public void testCreateAndDeleteMailSession() {
+        String sessionId = "MailSession" + generateRandomString();
+
+        // Create mail session
+        Map<String, String> newResource = Map.of(
+            "id", sessionId,
+            "host", "mail.example.org",
+            "from", "test@example.org",
+            "user", "testUser"
+        );
+        Response response = managementClient.post(URL_CREATE_MAIL_RESOURCE, newResource);
+        assertThat(response.getStatus(), equalTo(200));
+
+        response = managementClient.get(URL_LIST_MAIL_RESOURCES);
+        assertThat(response.getStatus(), equalTo(200));
+
+        List<String> mailSessions = getCommandResults(response);
+        // Exactly one item
+        assertThat(mailSessions, contains(sessionId));
+
+        // Delete mail session
+        response = managementClient.delete(URL_DELETE_MAIL_RESOURCE, Map.of("id", sessionId));
+        assertThat(response.getStatus(), equalTo(200));
+    }
+}

appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,9 +38,9 @@ public class JavaMailResourceTest extends AdminBaseDevTest {
     private static final String LIST_RESOURCE_REF = "list-resource-refs";
     private static final String LIST_JNDI_ENTRIES = "list-jndi-entries";
 
-    private static final String DELETE_MAIL_RESOURCE = "delete-javamail-resource";
-    private static final String CREATE_MAIL_RESOURCE = "create-javamail-resource";
-    private static final String LIST_MAIL_RESOURCES = "list-javamail-resources";
+    private static final String DELETE_MAIL_RESOURCE = "delete-mail-resource";
+    private static final String CREATE_MAIL_RESOURCE = "create-mail-resource";
+    private static final String LIST_MAIL_RESOURCES = "list-mail-resources";
     private static final String TARGET_OPTION = "--target";
 
     private static final String FROM_ADDRESS_OPTION = "--fromaddress";

docs/administration-guide/src/main/asciidoc/asadmin-subcommands.adoc

@@ -17,7 +17,7 @@ this release of the {productName} 7 software.
 * <<Connectivity Subcommands>>
 * <<Domain Subcommands>>
 * <<Internet Connectivity Subcommands>>
-* <<JavaMail Subcommands>>
+* <<Jakarta Mail Subcommands>>
 * <<JMS Subcommands>>
 * <<JNDI Subcommands>>
 * <<JVM Subcommands>>
@@ -502,22 +502,22 @@ xref:reference-manual.adoc#list-virtual-servers[`list-virtual-servers`]::
   procedural information in this guide, see xref:http_https.adoc#to-list-virtual-servers[To
   List Virtual Servers].
 
-[[javamail-subcommands]]
+[[jakarta-mail-subcommands]]
 
-=== JavaMail Subcommands
+=== Jakarta Mail Subcommands
 
-xref:reference-manual.adoc#create-javamail-resource[`create-javamail-resource`]::
-  Creates a JavaMail session resource. Supported in remote mode only.
+xref:reference-manual.adoc#create-mail-resource[`create-mail-resource`]::
+  Creates a Jakarta Mail session resource. Supported in remote mode only.
   For procedural information in this guide, see
-  xref:javamail.adoc#to-create-a-javamail-resource[To Create a JavaMail Resource].
-xref:reference-manual.adoc#delete-javamail-resource[`delete-javamail-resource`]::
-  Deletes a JavaMail session resource. Supported in remote mode only.
+  xref:jakarta-mail.adoc#to-create-a-jakarta-mail-resource[To Create a Jakarta Mail Resource].
+xref:reference-manual.adoc#delete-mail-resource[`delete-mail-resource`]::
+  Deletes a Jakarta Mail session resource. Supported in remote mode only.
   For procedural information in this guide, see
-  xref:javamail.adoc#to-delete-a-javamail-resource[To Delete a JavaMail Resource].
-xref:reference-manual.adoc#list-javamail-resources[`list-javamail-resources`]::
-  Creates JavaMail session resources. Supported in remote mode only. For
-  procedural information in this guide, see xref:javamail.adoc#to-list-javamail-resources[To
-  List JavaMail Resources].
+  xref:jakarta-mail.adoc#to-delete-a-jakarta-mail-resource[To Delete a Jakarta Mail Resource].
+xref:reference-manual.adoc#list-mail-resources[`list-mail-resources`]::
+  Creates Jakarta Mail session resources. Supported in remote mode only. For
+  procedural information in this guide, see xref:jakarta-mail.adoc#to-list-mail-resources[To
+  List Jakarta Mail Resources].
 
 [[jms-subcommands]]
 

docs/administration-guide/src/main/asciidoc/general-administration.adoc

@@ -775,7 +775,7 @@ resources, such as JDBC, is contained in other chapters.
 
 Use the `add-resources` subcommand in remote mode to create the
 resources named in the specified XML file. The following resources are
-supported: JDBC connection pool and resource, JMS, JNDI, and JavaMail
+supported: JDBC connection pool and resource, JMS, JNDI, and Jakarta Mail
 resources, custom resource, connector resource and work security map,
 admin object, and resource adapter configuration.