Merge pull request #275997 from josefree/main

Improve links in topics of Jakarta EE in azure-docs-pr

Author: Stacyrch140

articles/aks/howto-deploy-java-liberty-app.md

@@ -33,10 +33,11 @@ If you prefer manual step-by-step guidance for running Liberty on AKS, see [Manu
 
 This article is intended to help you quickly get to deployment. Before you go to production, you should explore the [IBM documentation about tuning Liberty](https://www.ibm.com/docs/was-liberty/base?topic=tuning-liberty).
 
-[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
+If you're interested in providing feedback or working closely on your migration scenarios with the engineering team developing WebSphere on Azure solutions, fill out this short [survey on WebSphere migration](https://aka.ms/websphere-on-azure-survey) and include your contact information. The team of program managers, architects, and engineers will promptly get in touch with you to initiate close collaboration.
 
 ## Prerequisites
 
+* An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
 * Install the [Azure CLI](/cli/azure/install-azure-cli). If you're running on Windows or macOS, consider running Azure CLI in a Docker container. For more information, see [How to run the Azure CLI in a Docker container](/cli/azure/run-azure-cli-docker).
 * Sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command. To finish the authentication process, follow the steps displayed in your terminal. For other sign-in options, see [Sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
 * When you're prompted, install the Azure CLI extension on first use. For more information about extensions, see [Use extensions with the Azure CLI](/cli/azure/azure-cli-extensions-overview).
@@ -526,3 +527,5 @@ You can learn more from the following references:
 * [Open Liberty](https://openliberty.io/)
 * [Open Liberty Operator](https://github.com/OpenLiberty/open-liberty-operator)
 * [Open Liberty server configuration](https://openliberty.io/docs/ref/config/)
+
+For more information about deploying the IBM WebSphere family on Azure, see [What are solutions to run the WebSphere family of products on Azure?](/azure/developer/java/ee/websphere-family)

articles/aks/howto-deploy-java-wls-app.md

@@ -14,9 +14,11 @@ This article shows you how to quickly stand up JBoss Enterprise Application Plat
 
 This article uses the Azure Marketplace offer for JBoss EAP to accelerate your journey to ARO. The offer automatically provisions resources including an ARO cluster with a built-in OpenShift Container Registry (OCR), the JBoss EAP Operator, and optionally a container image including JBoss EAP and your application using Source-to-Image (S2I). To see the offer, visit the [Azure portal](https://aka.ms/eap-aro-portal). If you prefer manual step-by-step guidance for running JBoss EAP on ARO that doesn't utilize the automation enabled by the offer, see [Deploy a Java application with Red Hat JBoss Enterprise Application Platform (JBoss EAP) on an Azure Red Hat OpenShift 4 cluster](/azure/developer/java/ee/jboss-eap-on-aro).
 
+If you're interested in providing feedback or working closely on your migration scenarios with the engineering team developing JBoss EAP on Azure solutions, fill out this short [survey on JBoss EAP migration](https://aka.ms/jboss-on-azure-survey) and include your contact information. The team of program managers, architects, and engineers will promptly get in touch with you to initiate close collaboration.
+
 ## Prerequisites
 
-- [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
+- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
 
 - A Red Hat account with complete profile. If you don't have one, you can sign up for a free developer subscription through the [Red Hat Developer Subscription for Individuals](https://developers.redhat.com/register).
 
@@ -517,7 +519,4 @@ If you're not going to continue to use the OpenShift cluster, navigate back to y
 
 ## Next steps
 
-Learn more about deploying JBoss EAP on Azure by following these links:
-
-> [!div class="nextstepaction"]
-> [Red Hat JBoss EAP on Azure](/azure/developer/java/ee/jboss-on-azure?toc=/azure/openshift/toc.json&bc=/azure/openshift/breadcrumb/toc.json)
+For more information about deploying JBoss EAP on Azure, see [Red Hat JBoss EAP on Azure](/azure/developer/java/ee/jboss-on-azure).

articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-app.md

@@ -16,12 +16,15 @@ This article uses the Azure Marketplace offer for Open/WebSphere Liberty to acce
 
 This article is intended to help you quickly get to deployment. Before going to production, you should explore [Tuning Liberty](https://www.ibm.com/docs/was-liberty/base?topic=tuning-liberty).
 
+If you're interested in providing feedback or working closely on your migration scenarios with the engineering team developing WebSphere on Azure solutions, fill out this short [survey on WebSphere migration](https://aka.ms/websphere-on-azure-survey) and include your contact information. The team of program managers, architects, and engineers will promptly get in touch with you to initiate close collaboration.
+
 [!INCLUDE [aro-support](includes/aro-support.md)]
 
 [!INCLUDE [aro-quota](includes/aro-quota.md)]
 
 ## Prerequisites
 
+- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
 - A local machine with a Unix-like operating system installed (for example, Ubuntu, macOS, or Windows Subsystem for Linux).
 - The [Azure CLI](/cli/azure/install-azure-cli). If you're running on Windows or macOS, consider running Azure CLI in a Docker container. For more information, see [How to run the Azure CLI in a Docker container](/cli/azure/run-azure-cli-docker).
 * Sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command. To finish the authentication process, follow the steps displayed in your terminal. For other sign-in options, see [Sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
@@ -414,7 +417,4 @@ az group delete --name $DB_RESOURCE_GROUP_NAME --yes --no-wait
 
 ## Next steps
 
-Learn more about deploying IBM WebSphere family on Azure by following these links:
-
-> [!div class="nextstepaction"]
-> [What are solutions to run the IBM WebSphere family of products on Azure?](/azure/developer/java/ee/websphere-family?toc=/azure/openshift/toc.json&bc=/azure/openshift/breadcrumb/toc.json)
+For more information about deploying the IBM WebSphere family on Azure, see [What are solutions to run the WebSphere family of products on Azure?](/azure/developer/java/ee/websphere-family)

articles/openshift/howto-deploy-java-liberty-app.md

@@ -13,46 +13,57 @@ ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-wls, devx-track
 
 **Applies to:** :heavy_check_mark: Linux VMs 
 
-This page describes the solutions for running Oracle WebLogic Server (WLS) on Azure virtual machines. These solutions are jointly developed and supported by Oracle and Microsoft.
+This page describes the solutions for running Oracle WebLogic Server (WLS) on Azure Virtual Machines. These solutions are jointly developed and supported by Oracle and Microsoft.
 
-You can also run WLS on the Azure Kubernetes Service. The solutions to do so are described in [this Microsoft article](./weblogic-aks.md).
+You can also run WebLogic Server on the Azure Kubernetes Service. The solutions to do so are described in the article [Running Oracle WebLogic Server on the Azure Kubernetes Service](/azure/virtual-machines/workloads/oracle/weblogic-aks?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json).
 
-WLS is a leading Java application server running some of the most mission-critical enterprise Java applications across the globe. WLS forms the middleware foundation for the Oracle software suite. Oracle and Microsoft are committed to empowering WLS customers with choice and flexibility to run workloads on Azure as a leading cloud platform.
+WebLogic Server is a leading Java application server running some of the most mission-critical enterprise Java applications across the globe. WebLogic Server forms the middleware foundation for the Oracle software suite. Oracle and Microsoft are committed to empowering WebLogic customers with choice and flexibility to run workloads on Azure as a leading cloud platform. 
 
-The Azure WLS solutions are aimed at making it as easy as possible to migrate your Java applications to Azure virtual machines. The solutions do so by generating deployed resources for most common cloud provisioning scenarios. The solutions automatically provision virtual network, storage, Java, WLS, and Linux resources. With minimal effort, WebLogic Server is provisioned. The solutions can set up security with a network security group, load balancing with Azure App Gateway or Oracle HTTP Server, and distributed caching with Oracle Coherence. You can also automatically connect to your existing database including Azure PostgreSQL, Azure MySQL, Azure SQL, and the Oracle Database on the Oracle Cloud or Azure.
+There are several offers that target use cases such as [single instance with Administration server enabled](#weblogic-server-single-instance-with-admin-console-on-azure-vm) and WebLogic cluster including both [static cluster](#weblogic-server-configured-cluster-on-azure-vms) and [dynamic clusters](#weblogic-server-dynamic-cluster-on-azure-vms). These offers are solution templates that aim to expedite your Java application deployment to Azure Virtual Machines. They automatically provision virtual network, storage, Java, WebLogic, and Linux resources required for most common cloud provisioning scenarios. After initial provisioning is done, you're completely free to customize deployments further.
 
 :::image type="content" source="media/oracle-weblogic/wls-on-azure.gif" alt-text="You can use the Azure portal to deploy WebLogic Server on Azure":::
 
-There are solution templates available to meet different scenarios such as [single instance with an admin server](https://portal.azure.com/#create/oracle.20191009-arm-oraclelinux-wls-admin20191009-arm-oraclelinux-wls-admin), and [cluster](https://portal.azure.com/#create/oracle.20191007-arm-oraclelinux-wls-cluster20191007-arm-oraclelinux-wls-cluster). The solutions are available free of charge. These solutions are described and linked below. You can find detailed documentation on the solutions [here](https://wls-eng.github.io/arm-oraclelinux-wls/).
+ _The offers are Bring-Your-Own-License_. They assume you have already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure.
 
-_These offers are Bring-Your-Own-License_. They assume you have already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure.
+The solution templates support a range of operating system, Java, and WebLogic Server versions through base images (such as WebLogic Server 14 and Java 11 on Red Hat Enterprise Linux 8). These [base images](#weblogic-server-on-azure-vm-base-images) are also available on Azure Marketplace on their own. The base images are suitable for customers that require complex, customized Azure deployments.
 
-The solution templates support a range of operating system, Java, and WLS versions through base images (such as WebLogic Server 14 and Java 11 on Red Hat Enterprise Linux 8). These base images are also available on Azure Marketplace on their own. The base images are suitable for customers that require complex, customized Azure deployments.
+If you're interested in providing feedback or working closely on your migration scenarios with the engineering team developing WeLogic on Azure solutions, fill out this short [survey on WebLogic migration](https://aka.ms/wls-on-azure-survey) and include your contact information. The team of program managers, architects, and engineers will promptly get in touch with you to initiate close collaboration.
 
-If you prefer step-by-step guidance for going from zero to a WLS cluster without any solution templates or base images, see [Install Oracle WebLogic Server on Azure Virtual Machines manually](/azure/developer/java/migration/migrate-weblogic-to-azure-vm-manually?toc=/azure/virtual-machines/workloads/oracle/toc.json&bc=/azure/virtual-machines/workloads/oracle/breadcrumb/toc.json).
+## WebLogic Server single instance with admin console on Azure VM
 
-_If you're interested in working closely on your migration scenarios with the engineering team developing these offers, select the [CONTACT ME](https://azuremarketplace.microsoft.com/marketplace/apps/oracle.oraclelinux-wls-cluster?tab=Overview) button_ on the [marketplace offer overview page](https://azuremarketplace.microsoft.com/marketplace/apps/oracle.oraclelinux-wls-cluster?tab=Overview). Program managers, architects, and engineers will reach back out to you shortly and start close collaboration.
+The solution template [WebLogic Server single instance with admin console on Azure VM](https://aka.ms/wls-vm-admin) provisions a single virtual machine and installs WebLogic Server on it. It creates a domain and starts up an administration server. After the solution template performs most boilerplate resource provisioning and configuration, you can manage the domain and get started with Java application deployments right away. 
 
-## Oracle WebLogic Server with Admin Server
+For the getting started guidance, see [Quickstart: Deploy WebLogic Server on Azure Virtual Machine using the Azure portal](./weblogic-server-azure-virtual-machine.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json). For deployment guidance, see [Using Oracle WebLogic Server on Microsoft Azure IaaS](https://wls-eng.github.io/arm-oraclelinux-wls/).
 
-[This solution template](https://portal.azure.com/#create/oracle.20191009-arm-oraclelinux-wls-admin20191009-arm-oraclelinux-wls-admin) provisions a single virtual machine and installs WLS on it. It creates a domain and starts up the administration server. You can manage the domain and get started with application deployments right away.
 
-## Oracle WebLogic Server Cluster
+## WebLogic Server configured cluster on Azure VMs
 
-[This solution template](https://portal.azure.com/#create/oracle.20191007-arm-oraclelinux-wls-cluster20191007-arm-oraclelinux-wls-cluster) creates a highly available cluster of WLS virtual machines. The administration server and all managed servers are started by default. You can manage the cluster and get started with highly available applications right away.
+The solution template [WebLogic Server configured cluster on Azure VMs](https://aka.ms/wls-vm-cluster) creates a highly available configured cluster of WebLogic Server on Azure Virtual Machines. The administration server and all managed servers are started by default. After the solution template performs most boilerplate resource provisioning and configuration, you can manage the cluster and get started with highly available applications right away. For deployment guidance, see [Using Oracle WebLogic Server on Microsoft Azure IaaS](https://wls-eng.github.io/arm-oraclelinux-wls/).
 
-The solutions enable a wide range of production-ready deployment architectures with relative ease. You can meet most migration cases in the most productive way possible by allowing a focus on business application development.
+The solution enables a wide range of production-ready deployment architectures with relative ease. You can meet most migration cases in the most productive way possible by allowing a focus on business application development.
 
 :::image type="content" source="media/oracle-weblogic/weblogic-architecture-vms.png" alt-text="Complex WebLogic Server deployments are enabled on Azure":::
 
-After resources are automatically provisioned by the solutions, you have complete flexibility to customize your deployments further. It's likely on top of deploying applications you'll integrate further Azure resources with your deployments. You're encouraged to [connect with the development team](https://azuremarketplace.microsoft.com/marketplace/apps/oracle.oraclelinux-wls-cluster?tab=Overview) and provide feedback on further improving the solutions.
+After resources are automatically provisioned by the solutions, you have complete flexibility to customize your deployments further. It's likely that, on top of deploying applications, you'll integrate further Azure resources with your deployments. You're encouraged to [connect with the development team](https://aka.ms/wls-on-azure-survey) and provide feedback on further improving WebLogic on Azure solutions.
+
+If you prefer step-by-step guidance for going from zero to a WebLogic Server cluster without any solution templates or base images, see [Install Oracle WebLogic Server on Azure Virtual Machines manually](/azure/developer/java/migration/migrate-weblogic-to-azure-vm-manually?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json).
+
+## WebLogic Server dynamic cluster on Azure VMs
+
+The solution template [WebLogic Server dynamic cluster on Azure VMs](https://aka.ms/wls-vm-dynamic-cluster) creates a dynamic cluster of WebLogic Server on Azure Virtual Machines. Administration Server is on one of the Azure Virtual Machines. For deployment guidance, see [Using Oracle WebLogic Server on Microsoft Azure IaaS](https://wls-eng.github.io/arm-oraclelinux-wls/).
+
+## WebLogic Server on Azure VM Base Images
+
+The solution templates introduced above support a range of operating system, Java, and WebLogic Server versions through base images - such as WebLogic Server 14 and Java 11 on Red Hat Enterprise Linux 8. These base images are also available on Azure Marketplace on their own. The base images are suitable for customers that require complex, customized Azure deployments. You can use the keywords *oracle weblogic base image* to search for the current set of [base images of WebLogic Server on Azure VM](https://aka.ms/wls-vm-base-images) available in Azure Marketplace.
 
 ## Next steps
 
-Explore the offers on Azure.
+The following articles provide more information on getting started with these technologies.
+
+* [Quickstart: Deploy WebLogic Server on Azure Virtual Machine using the Azure portal](./weblogic-server-azure-virtual-machine.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
+* [Manually install Oracle WebLogic Server on Azure Virtual Machines](/azure/developer/java/migration/migrate-weblogic-to-azure-vm-manually?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
+* [What are solutions for running Oracle WebLogic Server on the Azure Kubernetes Service?](./weblogic-aks.md)
 
-> [!div class="nextstepaction"]
-> [Oracle WebLogic Server with Admin Server](https://portal.azure.com/#create/oracle.20191009-arm-oraclelinux-wls-admin20191009-arm-oraclelinux-wls-admin)
+For more information about the Oracle WebLogic offers at Azure Marketplace, see [Oracle WebLogic Server on Azure](https://aka.ms/wls-contact-me). These offers are all _Bring-Your-Own-License_. They assume that you already have the appropriate licenses with Oracle and are properly licensed to run offers in Azure.
 
-> [!div class="nextstepaction"]
-> [Oracle WebLogic Server Cluster](https://portal.azure.com/#create/oracle.20191007-arm-oraclelinux-wls-cluster20191007-arm-oraclelinux-wls-cluster)
+You're encouraged to [connect with the development team](https://aka.ms/wls-on-azure-survey) and provide feedback on further improving WebLogic on Azure solutions.