Merge pull request #26025 from arjantijms/9.0

Merge master into 9.0

Author: arjantijms

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/AppUtil.java

@@ -192,7 +192,7 @@ static public String getAppScopedResType(String resName, String type){
         appResTypesEdit.add("full/externalResourceEdit.jsf?name=");
         appResTypesEdit.add("full/customResourceEdit.jsf?name=");
         appResTypesEdit.add("jca/adminObjectEdit.jsf?name=");
-        appResTypesEdit.add("full/mailResourceEdit.jsf?name=");
+        appResTypesEdit.add("jmail/mailResourceEdit.jsf?name=");
         appResTypesEdit.add("jdbc/jdbcConnectionPoolEdit.jsf?name=");
         appResTypesEdit.add("jca/connectorConnectionPoolEdit.jsf?name=");
         appResTypesEdit.add("jca/resourceAdapterConfigEdit.jsf?name=");

appserver/admingui/common/src/main/resources/resourceNode/targetResourceTable.inc

@@ -49,7 +49,7 @@
                         });
                 setPageSessionAttribute(key="editResUrls" value={
                         "/jdbc/jdbcResourceEdit.jsf",
-                        "/full/mailResourceEdit.jsf",
+                        "/jmail/mailResourceEdit.jsf",
                         "/full/customResourceEdit.jsf",
                         "/full/externalResourceEdit.jsf",
                         "/jca/connectorResourceEdit.jsf",

appserver/admingui/core/src/main/resources/org/glassfish/admingui/core/Strings.properties

@@ -64,8 +64,8 @@ tree.connectionFactories=Connection Factories
 tree.connectionFactories.tooltip=Connection Factories
 tree.destinationResources=Destination Resources
 tree.destinationResources.tooltip=Destination Resources
-tree.javaMailSessions=JavaMail Sessions
-tree.javaMailSessions.tooltip=JavaMail Sessions
+tree.javaMailSessions=Jakarta Mail Sessions
+tree.javaMailSessions.tooltip=Jakarta Mail Sessions
 tree.jndi=JNDI
 tree.jndi.tooltip=JNDI
 tree.customResources=Custom Resources

appserver/admingui/core/src/main/resources/templates/menu.inc

@@ -74,7 +74,7 @@
 	<sc:menuItem value="JDBC Connection Pools" url="#{request.contextPath}/jdbc/jdbcConnectionPools.jsf" />
 	<sc:menuItem value="JMS Connection Factories" url="#{request.contextPath}/layouttest.jsf?page=JMS+Connection+Factories" />
 	<sc:menuItem value="JMS Destination Resources" url="#{request.contextPath}/layouttest.jsf?page=JMS+Destination+Resources" />
-	<sc:menuItem value="JavaMail Sessions" url="#{request.contextPath}/layouttest.jsf?page=JavaMail+Sessions" />
+	<sc:menuItem value="Jakarta Mail Sessions" url="#{request.contextPath}/layouttest.jsf?page=Jakarta+Mail+Sessions" />
 	<sc:menuItem value="JNDI Custom Resources" url="#{request.contextPath}/layouttest.jsf?page=JNDI+Custom+Resources" />
 	<sc:menuItem value="JNDI External Resources" url="#{request.contextPath}/layouttest.jsf?page=JNDI+External+Resources" />
 	<sc:subMenu value="Connectors">

appserver/admingui/full/src/main/help/en/help/idx-1.html

@@ -51,17 +51,6 @@
 <dd>Java Naming and Directory Interface, <i>See </i>JNDI</dd>
 </dl>
 <dl>
-<dd>JavaMail sessions<dl>
-<dd>creating (reference), <a href="ref-javamailsessioncreate.html#indexterm-22">New JavaMail Session</a></dd>
-<dd>creating (task), <a href="task-javamailsessioncreate.html#indexterm-1">To Create a JavaMail Session</a></dd>
-<dd>deleting, <a href="task-javamailsessionsdelete.html#indexterm-3">To Delete a JavaMail Session</a></dd>
-<dd>editing (reference), <a href="ref-javamailsessionsedit.html#indexterm-23">Edit JavaMail Session</a></dd>
-<dd>editing (task), <a href="task-javamailsessionsedit.html#indexterm-2">To Edit a JavaMail Session</a></dd>
-<dd>viewing and configuring, <a href="ref-javamailsessions.html#indexterm-21">JavaMail Sessions</a></dd>
-</dl>
-</dd>
-</dl>
-<dl>
 <dd>JNDI custom resources<dl>
 <dd>creating (reference), <a href="ref-jndicustomresourcenew.html#indexterm-28">New Custom Resource</a></dd>
 <dd>creating (task), <a href="task-jndicustomresourcenew.html#indexterm-6">To Create a Custom JNDI Resource</a></dd>

appserver/admingui/full/src/main/help/en/help/index.xml

@@ -39,14 +39,6 @@
     <indexitem text="editing (task)" target="task-jndiexternalresourceedit"></indexitem>
     <indexitem text="viewing and configuring" target="ref-jndiexternalresources"></indexitem>
   </indexitem>
-  <indexitem text="JavaMail sessions">
-    <indexitem text="creating (reference)" target="ref-javamailsessioncreate"></indexitem>
-    <indexitem text="creating (task)" target="task-javamailsessioncreate"></indexitem>
-    <indexitem text="deleting" target="task-javamailsessionsdelete"></indexitem>
-    <indexitem text="editing (reference)" target="ref-javamailsessionsedit"></indexitem>
-    <indexitem text="editing (task)" target="task-javamailsessionsedit"></indexitem>
-    <indexitem text="viewing and configuring" target="ref-javamailsessions"></indexitem>
-  </indexitem>
   <indexitem text="JNDI custom resources">
     <indexitem text="creating (reference)" target="ref-jndicustomresourcenew"></indexitem>
     <indexitem text="creating (task)" target="task-jndicustomresourcenew"></indexitem>

appserver/admingui/full/src/main/help/en/help/toc.xml

@@ -24,12 +24,6 @@
     <tocitem target="task-group-batchruntime" text="Configuring the Batch Runtime" expand="false">
       <tocitem target="task-configurebatchruntime" text="To Configure the Batch Runtime" expand="false"></tocitem>
     </tocitem>
-    <tocitem target="task-group-javamailresources" text="Configuring JavaMail Sessions" expand="false">
-      <tocitem target="task-javamailsessioncreate" text="To Create a JavaMail Session" expand="false"></tocitem>
-      <tocitem target="task-javamailsessionsedit" text="To Edit a JavaMail Session" expand="false"></tocitem>
-      <tocitem target="task-javamailtargets" text="To Manage JavaMail Session Targets" expand="false"></tocitem>
-      <tocitem target="task-javamailsessionsdelete" text="To Delete a JavaMail Session" expand="false"></tocitem>
-    </tocitem>
     <tocitem target="task-group-jndiresources" text="Configuring JNDI Resources" expand="false">
       <tocitem target="task-jndicustomresourcenew" text="To Create a Custom JNDI Resource" expand="false"></tocitem>
       <tocitem target="task-jndicustomresourceedit" text="To Edit a Custom JNDI Resource" expand="false"></tocitem>
@@ -49,11 +43,6 @@
       </tocitem>
     </tocitem>
     <tocitem target="ref-group-resources" text="Resources" expand="false">
-      <tocitem target="ref-group-javamailresources" text="JavaMail Sessions" expand="false">
-        <tocitem target="ref-javamailsessions" text="JavaMail Sessions" expand="false"></tocitem>
-        <tocitem target="ref-javamailsessioncreate" text="New JavaMail Session" expand="false"></tocitem>
-        <tocitem target="ref-javamailsessionsedit" text="Edit JavaMail Session" expand="false"></tocitem>
-      </tocitem>
       <tocitem target="ref-group-jndi" text="JNDI" expand="false">
         <tocitem target="ref-jndi" text="JNDI" expand="false"></tocitem>
         <tocitem target="ref-group-jndicustomresources" text="Custom Resources" expand="false">

appserver/admingui/full/src/main/java/org/glassfish/full/admingui/JndiConsoleProvider.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1997, 2018 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
+ * 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.full.admingui;
+
+import java.net.URL;
+
+import org.glassfish.api.admingui.ConsoleProvider;
+import org.jvnet.hk2.annotations.Service;
+
+/**
+ *  <p> This class serves as a marker to indicate this OSGi bundle provides GUI
+ *      content which is to be displayed in the GlassFish admin console.  The
+ *      {@link #getConfiguration()} method should either return
+ *      <code>(null)</code>, or a <code>URL</code> to the
+ *      <code>console-config.xml</code> file.</p>
+ *
+ *  @author Ken Paulsen (ken.paulsen@sun.com)
+ */
+@Service
+public class JndiConsoleProvider implements ConsoleProvider {
+
+    /**
+     * <p> Returns a <code>URL</code> to the <code>console-config.xml</code>
+     *     file, or <code>null</code>.  If <code>null</code> is returned, the
+     *     default ("META-INF/admingui/console-config.xml") will be used.</p>
+     */
+    public URL getConfiguration() {
+        return null;
+    }
+}

appserver/admingui/full/src/main/resources/META-INF/admingui/console-config.xml

@@ -18,14 +18,6 @@
 -->
 
 <console-config id="full">
-    <integration-point
-        id="full_jmailNodes"
-        type="org.glassfish.admingui:navNode"
-        priority="600"
-        parentId="resources"
-        content="jmailTreeNode.jsf"
-    />
-
     <integration-point
         id="full_jndiNodes"
         type="org.glassfish.admingui:navNode"
@@ -107,12 +99,6 @@
         content="ejb:full/apps/editEjb.jsf"
     />
     <!-- add dropdown option for the resource dropdown of cluster/standalone instance resource table. -->
-    <integration-point
-            id="jmailResourceDropDown"
-            type="org.glassfish.admingui:resourceTypeDropdown"
-            priority="500"
-            content="full/mailResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.javaMailSessions"
-    />
     <integration-point
             id="customResourceDropDown"
             type="org.glassfish.admingui:resourceTypeDropdown"
@@ -126,12 +112,6 @@
             content="full/externalResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.externalResources"
     />
 
-    <integration-point
-            id="jmailFilter"
-            type="org.glassfish.admingui:resFilterDropdown"
-            priority="500"
-            content="mail-resource|org.glassfish.admingui.core.Strings|tree.javaMailSessions"
-    />
     <integration-point
             id="customFilter"
             type="org.glassfish.admingui:resFilterDropdown"
@@ -145,7 +125,6 @@
             content="external-jndi-resource|org.glassfish.admingui.core.Strings|tree.externalResources"
     />
 
-
     <integration-point
             id="serverBatch"
             type="org.glassfish.admingui:serverInstTab"

appserver/admingui/full/src/main/resources/fullResourceLink.jsf

@@ -16,14 +16,6 @@
 
 -->
 
-<sun:property>
-    <sun:hyperlink 
-        toolTip="$resource{i18n.tree.javaMailSessions.tooltip}"
-        url="/full/mailResources.jsf" >
-        <sun:image url="/resource/images/javaMailSession.gif" />
-        <sun:staticText text="$resource{i18n.tree.javaMailSessions}" />
-    </sun:hyperlink>
-</sun:property>
 <sun:property>
     <sun:hyperlink
         toolTip="$resource{i18n.tree.jndi.tooltip}"